diff --git a/mod/mould/casting_from_3D_positive_mould/README.md b/mod/mould/mod/casting_from_3D_positive_mould/README.md
similarity index 100%
rename from mod/mould/casting_from_3D_positive_mould/README.md
rename to mod/mould/mod/casting_from_3D_positive_mould/README.md
diff --git a/mod/mould/casting_from_3D_positive_mould/bom.csv b/mod/mould/mod/casting_from_3D_positive_mould/bom.csv
similarity index 100%
rename from mod/mould/casting_from_3D_positive_mould/bom.csv
rename to mod/mould/mod/casting_from_3D_positive_mould/bom.csv
diff --git a/mod/mould/casting_from_3D_positive_mould/res/README.md b/mod/mould/mod/casting_from_3D_positive_mould/res/README.md
similarity index 100%
rename from mod/mould/casting_from_3D_positive_mould/res/README.md
rename to mod/mould/mod/casting_from_3D_positive_mould/res/README.md
diff --git a/mod/mould/casting_from_3D_positive_mould/res/assets/README.md b/mod/mould/mod/casting_from_3D_positive_mould/res/assets/README.md
similarity index 100%
rename from mod/mould/casting_from_3D_positive_mould/res/assets/README.md
rename to mod/mould/mod/casting_from_3D_positive_mould/res/assets/README.md
diff --git a/mod/mould/casting_from_3D_positive_mould/res/assets/media/README.md b/mod/mould/mod/casting_from_3D_positive_mould/res/assets/media/README.md
similarity index 100%
rename from mod/mould/casting_from_3D_positive_mould/res/assets/media/README.md
rename to mod/mould/mod/casting_from_3D_positive_mould/res/assets/media/README.md
diff --git a/mod/mould/casting_from_3D_positive_mould/res/assets/media/img/README.md b/mod/mould/mod/casting_from_3D_positive_mould/res/assets/media/img/README.md
similarity index 100%
rename from mod/mould/casting_from_3D_positive_mould/res/assets/media/img/README.md
rename to mod/mould/mod/casting_from_3D_positive_mould/res/assets/media/img/README.md
diff --git a/mod/mould/casting_from_3D_positive_mould/res/assets/media/img/mould_cast.webp b/mod/mould/mod/casting_from_3D_positive_mould/res/assets/media/img/mould_cast.webp
similarity index 100%
rename from mod/mould/casting_from_3D_positive_mould/res/assets/media/img/mould_cast.webp
rename to mod/mould/mod/casting_from_3D_positive_mould/res/assets/media/img/mould_cast.webp
diff --git a/mod/mould/casting_from_3D_positive_mould/res/assets/media/img/mould_cast_insert.webp b/mod/mould/mod/casting_from_3D_positive_mould/res/assets/media/img/mould_cast_insert.webp
similarity index 100%
rename from mod/mould/casting_from_3D_positive_mould/res/assets/media/img/mould_cast_insert.webp
rename to mod/mould/mod/casting_from_3D_positive_mould/res/assets/media/img/mould_cast_insert.webp
diff --git a/mod/mould/casting_from_3D_positive_mould/res/assets/media/img/mould_cast_negative.webp b/mod/mould/mod/casting_from_3D_positive_mould/res/assets/media/img/mould_cast_negative.webp
similarity index 100%
rename from mod/mould/casting_from_3D_positive_mould/res/assets/media/img/mould_cast_negative.webp
rename to mod/mould/mod/casting_from_3D_positive_mould/res/assets/media/img/mould_cast_negative.webp
diff --git a/mod/mould/casting_from_3D_positive_mould/res/assets/media/img/mould_cast_parts.webp b/mod/mould/mod/casting_from_3D_positive_mould/res/assets/media/img/mould_cast_parts.webp
similarity index 100%
rename from mod/mould/casting_from_3D_positive_mould/res/assets/media/img/mould_cast_parts.webp
rename to mod/mould/mod/casting_from_3D_positive_mould/res/assets/media/img/mould_cast_parts.webp
diff --git a/mod/mould/casting_from_3D_positive_mould/res/assets/media/img/mould_cast_pour.webp b/mod/mould/mod/casting_from_3D_positive_mould/res/assets/media/img/mould_cast_pour.webp
similarity index 100%
rename from mod/mould/casting_from_3D_positive_mould/res/assets/media/img/mould_cast_pour.webp
rename to mod/mould/mod/casting_from_3D_positive_mould/res/assets/media/img/mould_cast_pour.webp
diff --git a/mod/mould/casting_from_3D_positive_mould/res/assets/media/img/mould_cast_prep.webp b/mod/mould/mod/casting_from_3D_positive_mould/res/assets/media/img/mould_cast_prep.webp
similarity index 100%
rename from mod/mould/casting_from_3D_positive_mould/res/assets/media/img/mould_cast_prep.webp
rename to mod/mould/mod/casting_from_3D_positive_mould/res/assets/media/img/mould_cast_prep.webp
diff --git a/mod/mould/casting_from_3D_positive_mould/res/assets/media/img/mould_cast_prep_boxcut.webp b/mod/mould/mod/casting_from_3D_positive_mould/res/assets/media/img/mould_cast_prep_boxcut.webp
similarity index 100%
rename from mod/mould/casting_from_3D_positive_mould/res/assets/media/img/mould_cast_prep_boxcut.webp
rename to mod/mould/mod/casting_from_3D_positive_mould/res/assets/media/img/mould_cast_prep_boxcut.webp
diff --git a/mod/mould/casting_from_3D_positive_mould/res/assets/media/img/mould_cast_prep_clamp.webp b/mod/mould/mod/casting_from_3D_positive_mould/res/assets/media/img/mould_cast_prep_clamp.webp
similarity index 100%
rename from mod/mould/casting_from_3D_positive_mould/res/assets/media/img/mould_cast_prep_clamp.webp
rename to mod/mould/mod/casting_from_3D_positive_mould/res/assets/media/img/mould_cast_prep_clamp.webp
diff --git a/mod/mould/casting_from_3D_positive_mould/res/assets/media/img/mould_cast_prep_screws.webp b/mod/mould/mod/casting_from_3D_positive_mould/res/assets/media/img/mould_cast_prep_screws.webp
similarity index 100%
rename from mod/mould/casting_from_3D_positive_mould/res/assets/media/img/mould_cast_prep_screws.webp
rename to mod/mould/mod/casting_from_3D_positive_mould/res/assets/media/img/mould_cast_prep_screws.webp
diff --git a/mod/mould/casting_from_3D_positive_mould/res/assets/media/img/mould_cast_prep_stand.webp b/mod/mould/mod/casting_from_3D_positive_mould/res/assets/media/img/mould_cast_prep_stand.webp
similarity index 100%
rename from mod/mould/casting_from_3D_positive_mould/res/assets/media/img/mould_cast_prep_stand.webp
rename to mod/mould/mod/casting_from_3D_positive_mould/res/assets/media/img/mould_cast_prep_stand.webp
diff --git a/mod/mould/casting_from_3D_positive_mould/res/assets/media/img/mould_cast_set.webp b/mod/mould/mod/casting_from_3D_positive_mould/res/assets/media/img/mould_cast_set.webp
similarity index 100%
rename from mod/mould/casting_from_3D_positive_mould/res/assets/media/img/mould_cast_set.webp
rename to mod/mould/mod/casting_from_3D_positive_mould/res/assets/media/img/mould_cast_set.webp
diff --git a/mod/mould/casting_from_3D_positive_mould/res/conf/README.md b/mod/mould/mod/casting_from_3D_positive_mould/res/conf/README.md
similarity index 100%
rename from mod/mould/casting_from_3D_positive_mould/res/conf/README.md
rename to mod/mould/mod/casting_from_3D_positive_mould/res/conf/README.md
diff --git a/mod/mould/casting_from_3D_positive_mould/src/README.md b/mod/mould/mod/casting_from_3D_positive_mould/src/README.md
similarity index 100%
rename from mod/mould/casting_from_3D_positive_mould/src/README.md
rename to mod/mould/mod/casting_from_3D_positive_mould/src/README.md
diff --git a/mod/mould/casting_from_3D_positive_mould/src/mech/Positive-1-4-FC-5.4-Ultimaker.stl b/mod/mould/mod/casting_from_3D_positive_mould/src/mech/Positive-1-4-FC-5.4-Ultimaker.stl
similarity index 100%
rename from mod/mould/casting_from_3D_positive_mould/src/mech/Positive-1-4-FC-5.4-Ultimaker.stl
rename to mod/mould/mod/casting_from_3D_positive_mould/src/mech/Positive-1-4-FC-5.4-Ultimaker.stl
diff --git a/mod/mould/casting_from_3D_positive_mould/src/mech/Positive-2-4-FC-5.4-Ultimaker.stl b/mod/mould/mod/casting_from_3D_positive_mould/src/mech/Positive-2-4-FC-5.4-Ultimaker.stl
similarity index 100%
rename from mod/mould/casting_from_3D_positive_mould/src/mech/Positive-2-4-FC-5.4-Ultimaker.stl
rename to mod/mould/mod/casting_from_3D_positive_mould/src/mech/Positive-2-4-FC-5.4-Ultimaker.stl
diff --git a/mod/mould/casting_from_3D_positive_mould/src/mech/Positive-3-4-FC-5.4-Ultimaker.stl b/mod/mould/mod/casting_from_3D_positive_mould/src/mech/Positive-3-4-FC-5.4-Ultimaker.stl
similarity index 100%
rename from mod/mould/casting_from_3D_positive_mould/src/mech/Positive-3-4-FC-5.4-Ultimaker.stl
rename to mod/mould/mod/casting_from_3D_positive_mould/src/mech/Positive-3-4-FC-5.4-Ultimaker.stl
diff --git a/mod/mould/casting_from_3D_positive_mould/src/mech/Positive-4-4-FC-5.4-Ultimaker.stl b/mod/mould/mod/casting_from_3D_positive_mould/src/mech/Positive-4-4-FC-5.4-Ultimaker.stl
similarity index 100%
rename from mod/mould/casting_from_3D_positive_mould/src/mech/Positive-4-4-FC-5.4-Ultimaker.stl
rename to mod/mould/mod/casting_from_3D_positive_mould/src/mech/Positive-4-4-FC-5.4-Ultimaker.stl
diff --git a/mod/mould/casting_from_3D_positive_mould/src/mech/Positive-full-FC-5.4-BigRep.stl b/mod/mould/mod/casting_from_3D_positive_mould/src/mech/Positive-full-FC-5.4-BigRep.stl
similarity index 100%
rename from mod/mould/casting_from_3D_positive_mould/src/mech/Positive-full-FC-5.4-BigRep.stl
rename to mod/mould/mod/casting_from_3D_positive_mould/src/mech/Positive-full-FC-5.4-BigRep.stl
diff --git a/mod/mould/casting_from_3D_positive_mould/src/mech/README.md b/mod/mould/mod/casting_from_3D_positive_mould/src/mech/README.md
similarity index 100%
rename from mod/mould/casting_from_3D_positive_mould/src/mech/README.md
rename to mod/mould/mod/casting_from_3D_positive_mould/src/mech/README.md
diff --git a/mod/mould/direct_3D_negative_mould/README.md b/mod/mould/mod/direct_3D_negative_mould/README.md
similarity index 100%
rename from mod/mould/direct_3D_negative_mould/README.md
rename to mod/mould/mod/direct_3D_negative_mould/README.md
diff --git a/mod/mould/direct_3D_negative_mould/bom.csv b/mod/mould/mod/direct_3D_negative_mould/bom.csv
similarity index 100%
rename from mod/mould/direct_3D_negative_mould/bom.csv
rename to mod/mould/mod/direct_3D_negative_mould/bom.csv
diff --git a/mod/mould/direct_3D_negative_mould/res/README.md b/mod/mould/mod/direct_3D_negative_mould/res/README.md
similarity index 100%
rename from mod/mould/direct_3D_negative_mould/res/README.md
rename to mod/mould/mod/direct_3D_negative_mould/res/README.md
diff --git a/mod/mould/direct_3D_negative_mould/res/assets/README.md b/mod/mould/mod/direct_3D_negative_mould/res/assets/README.md
similarity index 100%
rename from mod/mould/direct_3D_negative_mould/res/assets/README.md
rename to mod/mould/mod/direct_3D_negative_mould/res/assets/README.md
diff --git a/mod/mould/direct_3D_negative_mould/res/assets/media/README.md b/mod/mould/mod/direct_3D_negative_mould/res/assets/media/README.md
similarity index 100%
rename from mod/mould/direct_3D_negative_mould/res/assets/media/README.md
rename to mod/mould/mod/direct_3D_negative_mould/res/assets/media/README.md
diff --git a/mod/mould/direct_3D_negative_mould/res/assets/media/img/README.md b/mod/mould/mod/direct_3D_negative_mould/res/assets/media/img/README.md
similarity index 100%
rename from mod/mould/direct_3D_negative_mould/res/assets/media/img/README.md
rename to mod/mould/mod/direct_3D_negative_mould/res/assets/media/img/README.md
diff --git a/mod/mould/direct_3D_negative_mould/res/assets/media/img/mould_3d_insert.webp b/mod/mould/mod/direct_3D_negative_mould/res/assets/media/img/mould_3d_insert.webp
similarity index 100%
rename from mod/mould/direct_3D_negative_mould/res/assets/media/img/mould_3d_insert.webp
rename to mod/mould/mod/direct_3D_negative_mould/res/assets/media/img/mould_3d_insert.webp
diff --git a/mod/mould/direct_3D_negative_mould/res/assets/media/img/mould_3d_negative.webp b/mod/mould/mod/direct_3D_negative_mould/res/assets/media/img/mould_3d_negative.webp
similarity index 100%
rename from mod/mould/direct_3D_negative_mould/res/assets/media/img/mould_3d_negative.webp
rename to mod/mould/mod/direct_3D_negative_mould/res/assets/media/img/mould_3d_negative.webp
diff --git a/mod/mould/direct_3D_negative_mould/res/assets/media/img/mould_3d_parts.webp b/mod/mould/mod/direct_3D_negative_mould/res/assets/media/img/mould_3d_parts.webp
similarity index 100%
rename from mod/mould/direct_3D_negative_mould/res/assets/media/img/mould_3d_parts.webp
rename to mod/mould/mod/direct_3D_negative_mould/res/assets/media/img/mould_3d_parts.webp
diff --git a/mod/mould/direct_3D_negative_mould/res/assets/media/img/mould_3d_prep_screws.webp b/mod/mould/mod/direct_3D_negative_mould/res/assets/media/img/mould_3d_prep_screws.webp
similarity index 100%
rename from mod/mould/direct_3D_negative_mould/res/assets/media/img/mould_3d_prep_screws.webp
rename to mod/mould/mod/direct_3D_negative_mould/res/assets/media/img/mould_3d_prep_screws.webp
diff --git a/mod/mould/direct_3D_negative_mould/res/assets/media/img/mould_3d_set.webp b/mod/mould/mod/direct_3D_negative_mould/res/assets/media/img/mould_3d_set.webp
similarity index 100%
rename from mod/mould/direct_3D_negative_mould/res/assets/media/img/mould_3d_set.webp
rename to mod/mould/mod/direct_3D_negative_mould/res/assets/media/img/mould_3d_set.webp
diff --git a/mod/mould/direct_3D_negative_mould/res/conf/README.md b/mod/mould/mod/direct_3D_negative_mould/res/conf/README.md
similarity index 100%
rename from mod/mould/direct_3D_negative_mould/res/conf/README.md
rename to mod/mould/mod/direct_3D_negative_mould/res/conf/README.md
diff --git a/mod/mould/direct_3D_negative_mould/src/README.md b/mod/mould/mod/direct_3D_negative_mould/src/README.md
similarity index 100%
rename from mod/mould/direct_3D_negative_mould/src/README.md
rename to mod/mould/mod/direct_3D_negative_mould/src/README.md
diff --git a/mod/mould/direct_3D_negative_mould/src/mech/Negative-1-4-FC-5.4-Ultimaker.stl b/mod/mould/mod/direct_3D_negative_mould/src/mech/Negative-1-4-FC-5.4-Ultimaker.stl
similarity index 100%
rename from mod/mould/direct_3D_negative_mould/src/mech/Negative-1-4-FC-5.4-Ultimaker.stl
rename to mod/mould/mod/direct_3D_negative_mould/src/mech/Negative-1-4-FC-5.4-Ultimaker.stl
diff --git a/mod/mould/direct_3D_negative_mould/src/mech/Negative-2-4-FC-5.4-Ultimaker.stl b/mod/mould/mod/direct_3D_negative_mould/src/mech/Negative-2-4-FC-5.4-Ultimaker.stl
similarity index 100%
rename from mod/mould/direct_3D_negative_mould/src/mech/Negative-2-4-FC-5.4-Ultimaker.stl
rename to mod/mould/mod/direct_3D_negative_mould/src/mech/Negative-2-4-FC-5.4-Ultimaker.stl
diff --git a/mod/mould/direct_3D_negative_mould/src/mech/Negative-3-4-FC-5.4-Ultimaker.stl b/mod/mould/mod/direct_3D_negative_mould/src/mech/Negative-3-4-FC-5.4-Ultimaker.stl
similarity index 100%
rename from mod/mould/direct_3D_negative_mould/src/mech/Negative-3-4-FC-5.4-Ultimaker.stl
rename to mod/mould/mod/direct_3D_negative_mould/src/mech/Negative-3-4-FC-5.4-Ultimaker.stl
diff --git a/mod/mould/direct_3D_negative_mould/src/mech/Negative-4-4-FC-5.4-Ultimaker.stl b/mod/mould/mod/direct_3D_negative_mould/src/mech/Negative-4-4-FC-5.4-Ultimaker.stl
similarity index 100%
rename from mod/mould/direct_3D_negative_mould/src/mech/Negative-4-4-FC-5.4-Ultimaker.stl
rename to mod/mould/mod/direct_3D_negative_mould/src/mech/Negative-4-4-FC-5.4-Ultimaker.stl
diff --git a/mod/mould/direct_3D_negative_mould/src/mech/Negative-full-FC-5.4-BigRep.stl b/mod/mould/mod/direct_3D_negative_mould/src/mech/Negative-full-FC-5.4-BigRep.stl
similarity index 100%
rename from mod/mould/direct_3D_negative_mould/src/mech/Negative-full-FC-5.4-BigRep.stl
rename to mod/mould/mod/direct_3D_negative_mould/src/mech/Negative-full-FC-5.4-BigRep.stl
diff --git a/mod/mould/direct_3D_negative_mould/src/mech/README.md b/mod/mould/mod/direct_3D_negative_mould/src/mech/README.md
similarity index 100%
rename from mod/mould/direct_3D_negative_mould/src/mech/README.md
rename to mod/mould/mod/direct_3D_negative_mould/src/mech/README.md