diff --git a/solidity/src/FlowBridgeFactory.sol b/solidity/src/FlowBridgeFactory.sol
index dee9ee75..93361415 100644
--- a/solidity/src/FlowBridgeFactory.sol
+++ b/solidity/src/FlowBridgeFactory.sol
@@ -4,9 +4,9 @@ pragma solidity ^0.8.17;
 import "@openzeppelin/contracts/access/Ownable.sol";
 import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import "@openzeppelin/contracts/utils/introspection/ERC165.sol";
-import "./FlowBridgedERC721.sol";
-import "./FlowBridgedERC20.sol";
-import "./IBridgePermissions.sol";
+import "./templates/FlowBridgedERC721.sol";
+import "./templates/FlowBridgedERC20.sol";
+import "./interfaces/IBridgePermissions.sol";
 
 contract FlowBridgeFactory is Ownable {
     mapping(string => address) public flowIdentifierToContract;
diff --git a/solidity/src/ExampleERC20.sol b/solidity/src/example-assets/ExampleERC20.sol
similarity index 100%
rename from solidity/src/ExampleERC20.sol
rename to solidity/src/example-assets/ExampleERC20.sol
diff --git a/solidity/src/ExampleERC721.sol b/solidity/src/example-assets/ExampleERC721.sol
similarity index 100%
rename from solidity/src/ExampleERC721.sol
rename to solidity/src/example-assets/ExampleERC721.sol
diff --git a/solidity/src/BridgePermissions.sol b/solidity/src/interfaces/BridgePermissions.sol
similarity index 100%
rename from solidity/src/BridgePermissions.sol
rename to solidity/src/interfaces/BridgePermissions.sol
diff --git a/solidity/src/IBridgePermissions.sol b/solidity/src/interfaces/IBridgePermissions.sol
similarity index 100%
rename from solidity/src/IBridgePermissions.sol
rename to solidity/src/interfaces/IBridgePermissions.sol
diff --git a/solidity/src/FlowBridgedERC20.sol b/solidity/src/templates/FlowBridgedERC20.sol
similarity index 100%
rename from solidity/src/FlowBridgedERC20.sol
rename to solidity/src/templates/FlowBridgedERC20.sol
diff --git a/solidity/src/FlowBridgedERC721.sol b/solidity/src/templates/FlowBridgedERC721.sol
similarity index 100%
rename from solidity/src/FlowBridgedERC721.sol
rename to solidity/src/templates/FlowBridgedERC721.sol
diff --git a/solidity/test/FlowBridgeFactory.t.sol b/solidity/test/FlowBridgeFactory.t.sol
index f826cc79..5b87090a 100644
--- a/solidity/test/FlowBridgeFactory.t.sol
+++ b/solidity/test/FlowBridgeFactory.t.sol
@@ -4,8 +4,8 @@ pragma solidity ^0.8.17;
 import {Test} from "forge-std/Test.sol";
 
 import {FlowBridgeFactory} from "../src/FlowBridgeFactory.sol";
-import {FlowBridgedERC721} from "../src/FlowBridgedERC721.sol";
-import {FlowBridgedERC20} from "../src/FlowBridgedERC20.sol";
+import {FlowBridgedERC721} from "../src/templates/FlowBridgedERC721.sol";
+import {FlowBridgedERC20} from "../src/templates/FlowBridgedERC20.sol";
 
 contract FlowBridgeFactoryTest is Test {
     FlowBridgeFactory internal factory;