diff --git a/Hardware/CYCLONE_2/Source_files/Cycl_X_frames.scad b/Hardware/CYCLONE_2/Source_files/Cycl_X_frames.scad
index 26f06ae..cc0c2ea 100644
--- a/Hardware/CYCLONE_2/Source_files/Cycl_X_frames.scad
+++ b/Hardware/CYCLONE_2/Source_files/Cycl_X_frames.scad
@@ -17,7 +17,7 @@ module Cyclone_X_rightFrame() {
 	scale([-1,1,1]) Cyclone_X_leftFrame(isLeft=false);
 }
 
-include <MCAD/stepper.scad>
+include <libs/MCAD/stepper.scad>
 module Cyclone_X_leftFrame(isLeft=true) {
 	
 	screwSize = 3; // M3, M4, etc (integers only)
diff --git a/Hardware/CYCLONE_2/Source_files/Cycl_Y_carriage.scad b/Hardware/CYCLONE_2/Source_files/Cycl_Y_carriage.scad
index 0ba58c9..478473e 100644
--- a/Hardware/CYCLONE_2/Source_files/Cycl_Y_carriage.scad
+++ b/Hardware/CYCLONE_2/Source_files/Cycl_Y_carriage.scad
@@ -4,7 +4,7 @@
 // License: CC BY-SA 4.0 (Attribution-ShareAlike 4.0 International, http://creativecommons.org/licenses/by-sa/4.0/)
 // Designed with http://www.openscad.org/
 
-include <MCAD/nuts_and_bolts.scad>
+include <libs/MCAD/nuts_and_bolts.scad>
 
 
 workbed_separation_from_Y_threaded_rod = axes_Y_smoothThreaded_verticalSeparation+workbed_separation_from_Y_smooth_rod+axes_Ysmooth_rodD/2;
diff --git a/Hardware/CYCLONE_2/Source_files/Cycl_Y_frames.scad b/Hardware/CYCLONE_2/Source_files/Cycl_Y_frames.scad
index 54faa30..e38b667 100644
--- a/Hardware/CYCLONE_2/Source_files/Cycl_Y_frames.scad
+++ b/Hardware/CYCLONE_2/Source_files/Cycl_Y_frames.scad
@@ -11,7 +11,7 @@ module mirrorOrNot(mirrorPart=false, axes=[-1,1,1]) {
 
 
 
-use <MCAD/bearing.scad>
+use <libs/MCAD/bearing.scad>
 
 
 
diff --git a/Hardware/CYCLONE_2/Source_files/Cycl_Z_carriage.scad b/Hardware/CYCLONE_2/Source_files/Cycl_Z_carriage.scad
index 9d9e776..e08076c 100644
--- a/Hardware/CYCLONE_2/Source_files/Cycl_Z_carriage.scad
+++ b/Hardware/CYCLONE_2/Source_files/Cycl_Z_carriage.scad
@@ -9,7 +9,7 @@
 module Cyclone_Z_carriage() {
 	color(color_stillPart)
 		translate([axes_Zsmooth_separation/2,0,0]) rotate([0,0,-90])
-			import("INHERITED/stl/Cycl_Zcarriage.stl");
+			import("Inherited_files/stl/Cycl_Zcarriage.stl");
 	
 	// Bearings
 	linearBearing_single(model="LM8UU", echoPart=true);
diff --git a/Hardware/CYCLONE_2/Source_files/Cyclone.scad b/Hardware/CYCLONE_2/Source_files/Cyclone.scad
index 687836d..2f8135d 100644
--- a/Hardware/CYCLONE_2/Source_files/Cyclone.scad
+++ b/Hardware/CYCLONE_2/Source_files/Cyclone.scad
@@ -8,11 +8,6 @@
 //   First of all, make sure you are using the latest version of OpenScad (>= 2014.05.31)
 //   Then, it is important to change a default setting. Go to: Edit --> Preferences --> Advanced
 //   And increase "Turn off rendering at 2000 elements" to a larger number like 20000
-//   
-//   If problems persist, you may need to install the MCAD (<http://reprap.org/wiki/MCAD>)
-//   and Obiscad (<https://github.com/Obijuan/obiscad>) libraries into the /libs directory.
-//   With Git, this can be achieved automatically by running the following command:
-//      git submodule update --init
 // -------------------------------------------------------------
 
 // ---------- GENERATING THE STL FILES  ------------------------
@@ -46,7 +41,7 @@ use <libs/obiscad/obiscad/vector.scad>
 use <libs/obiscad/obiscad/attach.scad>
 use <libs/obiscad/obiscad/bcube.scad>
 use <libs/standard_parts.scad>
-use <MCAD/materials.scad>
+use <libs/MCAD/materials.scad>
 
 // Functions for animations. Quick and dirty implementation, will need some cleanup
 animated_parts_number = 10;
@@ -139,11 +134,11 @@ render_bases_outline = false; // Toggle for rendering outline DXFs
 DXF_offset = 0.4; // Needed to adjust the tolerance of the laser cutter
 
 // Include Cyclone parts
-include <Cyclone_X_carriage.scad>
-include <Cyclone_Z_carriage.scad>
-include <Cyclone_X_frames.scad>
-include <Cyclone_Y_carriage.scad>
-include <Cyclone_Y_frames.scad>
+include <Cycl_X_carriage.scad>
+include <Cycl_Z_carriage.scad>
+include <Cycl_X_frames.scad>
+include <Cycl_Y_carriage.scad>
+include <Cycl_Y_frames.scad>
 
 
 // This small module is used to select if an object is rendered as a 2D plane or as a 3D object
diff --git a/Hardware/CYCLONE_2/Source_files/Inherited_files/Cyclone_Zcarriage.scad b/Hardware/CYCLONE_2/Source_files/Inherited_files/Cycl_Zcarriage.scad
similarity index 100%
rename from Hardware/CYCLONE_2/Source_files/Inherited_files/Cyclone_Zcarriage.scad
rename to Hardware/CYCLONE_2/Source_files/Inherited_files/Cycl_Zcarriage.scad