diff --git a/Bender.yml b/Bender.yml
index ff0fe717..90fd326f 100644
--- a/Bender.yml
+++ b/Bender.yml
@@ -87,7 +87,3 @@ sources:
       - tb/mock_uart_axi.sv
       - tb/pulp_cluster_tb.sv
 
-  - target: cluster_standalone
-    files:
-      - include/pulp_interfaces.sv
-
diff --git a/include/cluster_bus_defines.sv b/include/pulp_cluster/cluster_bus_defines.sv
similarity index 100%
rename from include/cluster_bus_defines.sv
rename to include/pulp_cluster/cluster_bus_defines.sv
diff --git a/include/periph_bus_defines.sv b/include/pulp_cluster/periph_bus_defines.sv
similarity index 100%
rename from include/periph_bus_defines.sv
rename to include/pulp_cluster/periph_bus_defines.sv
diff --git a/include/pulp_interfaces.sv b/include/pulp_cluster/pulp_interfaces.sv
similarity index 99%
rename from include/pulp_interfaces.sv
rename to include/pulp_cluster/pulp_interfaces.sv
index 1501c274..12229fc4 100644
--- a/include/pulp_interfaces.sv
+++ b/include/pulp_cluster/pulp_interfaces.sv
@@ -8,7 +8,7 @@
 // CONDITIONS OF ANY KIND, either express or implied. See the License for the
 // specific language governing permissions and limitations under the License.
 
-`include "pulp_soc_defines.sv"
+`include "pulp_cluster/pulp_soc_defines.sv"
 
 interface XBAR_TCDM_BUS;
 
diff --git a/include/pulp_soc_defines.sv b/include/pulp_cluster/pulp_soc_defines.sv
similarity index 100%
rename from include/pulp_soc_defines.sv
rename to include/pulp_cluster/pulp_soc_defines.sv
diff --git a/rtl/pulp_cluster.sv b/rtl/pulp_cluster.sv
index f20ff077..1b56e6ca 100644
--- a/rtl/pulp_cluster.sv
+++ b/rtl/pulp_cluster.sv
@@ -19,8 +19,8 @@
 
 `include "axi/typedef.svh"
 `include "axi/assign.svh"
-`include "cluster_bus_defines.sv"
-`include "pulp_interfaces.sv"
+`include "pulp_cluster/cluster_bus_defines.sv"
+`include "pulp_cluster/pulp_interfaces.sv"
 `include "register_interface/typedef.svh"
 
 module pulp_cluster