diff --git a/natspec-smells.config.js b/natspec-smells.config.js
index 8eff66d1..458623a3 100644
--- a/natspec-smells.config.js
+++ b/natspec-smells.config.js
@@ -4,5 +4,5 @@
 
 /** @type {import('@defi-wonderland/natspec-smells').Config} */
 module.exports = {
-  include: 'contracts'
+  include: 'src'
 };
diff --git a/remappings.txt b/remappings.txt
index cef2d983..78c458fd 100644
--- a/remappings.txt
+++ b/remappings.txt
@@ -1,3 +1,5 @@
 ds-test/=node_modules/ds-test/src
 forge-std/=node_modules/forge-std/src
 solmate/=node_modules/solmate/src
+
+contracts/=src/contracts
\ No newline at end of file
diff --git a/contracts/BColor.sol b/src/contracts/BColor.sol
similarity index 100%
rename from contracts/BColor.sol
rename to src/contracts/BColor.sol
diff --git a/contracts/BConst.sol b/src/contracts/BConst.sol
similarity index 100%
rename from contracts/BConst.sol
rename to src/contracts/BConst.sol
diff --git a/contracts/BFactory.sol b/src/contracts/BFactory.sol
similarity index 100%
rename from contracts/BFactory.sol
rename to src/contracts/BFactory.sol
diff --git a/contracts/BMath.sol b/src/contracts/BMath.sol
similarity index 100%
rename from contracts/BMath.sol
rename to src/contracts/BMath.sol
diff --git a/contracts/BNum.sol b/src/contracts/BNum.sol
similarity index 100%
rename from contracts/BNum.sol
rename to src/contracts/BNum.sol
diff --git a/contracts/BPool.sol b/src/contracts/BPool.sol
similarity index 100%
rename from contracts/BPool.sol
rename to src/contracts/BPool.sol
diff --git a/contracts/BToken.sol b/src/contracts/BToken.sol
similarity index 100%
rename from contracts/BToken.sol
rename to src/contracts/BToken.sol
diff --git a/contracts/Migrations.sol b/src/contracts/Migrations.sol
similarity index 100%
rename from contracts/Migrations.sol
rename to src/contracts/Migrations.sol
diff --git a/contracts/test/TMath.sol b/src/contracts/test/TMath.sol
similarity index 100%
rename from contracts/test/TMath.sol
rename to src/contracts/test/TMath.sol
diff --git a/contracts/test/TToken.sol b/src/contracts/test/TToken.sol
similarity index 100%
rename from contracts/test/TToken.sol
rename to src/contracts/test/TToken.sol
diff --git a/contracts/test/echidna/TBPoolJoinExitPool.sol b/src/contracts/test/echidna/TBPoolJoinExitPool.sol
similarity index 100%
rename from contracts/test/echidna/TBPoolJoinExitPool.sol
rename to src/contracts/test/echidna/TBPoolJoinExitPool.sol
diff --git a/contracts/test/echidna/TBPoolJoinExitPoolNoFee.sol b/src/contracts/test/echidna/TBPoolJoinExitPoolNoFee.sol
similarity index 100%
rename from contracts/test/echidna/TBPoolJoinExitPoolNoFee.sol
rename to src/contracts/test/echidna/TBPoolJoinExitPoolNoFee.sol
diff --git a/contracts/test/echidna/TBPoolJoinPool.sol b/src/contracts/test/echidna/TBPoolJoinPool.sol
similarity index 100%
rename from contracts/test/echidna/TBPoolJoinPool.sol
rename to src/contracts/test/echidna/TBPoolJoinPool.sol