diff --git a/.SimulinkProject/Root.type.Files/simscape_subsystems.type.File.xml b/.SimulinkProject/Root.type.Files/simscape_subsystems.type.File.xml
new file mode 100644
index 0000000..1c0844e
--- /dev/null
+++ b/.SimulinkProject/Root.type.Files/simscape_subsystems.type.File.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/.SimulinkProject/Root.type.Files/simscape_subsystems.type.File/1.type.DIR_SIGNIFIER.xml b/.SimulinkProject/Root.type.Files/simscape_subsystems.type.File/1.type.DIR_SIGNIFIER.xml
new file mode 100644
index 0000000..1c0844e
--- /dev/null
+++ b/.SimulinkProject/Root.type.Files/simscape_subsystems.type.File/1.type.DIR_SIGNIFIER.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/.SimulinkProject/Root.type.Files/simscape_subsystems_uniaxial.type.File.xml b/.SimulinkProject/Root.type.Files/simscape_subsystems_uniaxial.type.File.xml
new file mode 100644
index 0000000..1c0844e
--- /dev/null
+++ b/.SimulinkProject/Root.type.Files/simscape_subsystems_uniaxial.type.File.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/.SimulinkProject/Root.type.Files/simscape_subsystems_uniaxial.type.File/1.type.DIR_SIGNIFIER.xml b/.SimulinkProject/Root.type.Files/simscape_subsystems_uniaxial.type.File/1.type.DIR_SIGNIFIER.xml
new file mode 100644
index 0000000..1c0844e
--- /dev/null
+++ b/.SimulinkProject/Root.type.Files/simscape_subsystems_uniaxial.type.File/1.type.DIR_SIGNIFIER.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/.SimulinkProject/Root.type.Files/simscape_subsystems_uniaxial.type.File/nano_hexa_cedrat_1dof.slx.type.File.xml b/.SimulinkProject/Root.type.Files/simscape_subsystems_uniaxial.type.File/nano_hexa_cedrat_1dof.slx.type.File.xml
new file mode 100644
index 0000000..80b5b16
--- /dev/null
+++ b/.SimulinkProject/Root.type.Files/simscape_subsystems_uniaxial.type.File/nano_hexa_cedrat_1dof.slx.type.File.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.SimulinkProject/Root.type.ProjectPath/7380726a-8c53-4fd9-b49a-eabda89012ae.type.Reference.xml b/.SimulinkProject/Root.type.ProjectPath/7380726a-8c53-4fd9-b49a-eabda89012ae.type.Reference.xml
new file mode 100644
index 0000000..c725a1f
--- /dev/null
+++ b/.SimulinkProject/Root.type.ProjectPath/7380726a-8c53-4fd9-b49a-eabda89012ae.type.Reference.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/.SimulinkProject/Root.type.ProjectPath/75279f3d-31b7-450c-80ea-88fc4147a73a.type.Reference.xml b/.SimulinkProject/Root.type.ProjectPath/75279f3d-31b7-450c-80ea-88fc4147a73a.type.Reference.xml
new file mode 100644
index 0000000..abb90ee
--- /dev/null
+++ b/.SimulinkProject/Root.type.ProjectPath/75279f3d-31b7-450c-80ea-88fc4147a73a.type.Reference.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/.SimulinkProject/Root.type.ProjectPath/9a090d6d-18eb-46dd-9ba8-558eef0a4238.type.Reference.xml b/.SimulinkProject/Root.type.ProjectPath/9a090d6d-18eb-46dd-9ba8-558eef0a4238.type.Reference.xml
new file mode 100644
index 0000000..a6c441c
--- /dev/null
+++ b/.SimulinkProject/Root.type.ProjectPath/9a090d6d-18eb-46dd-9ba8-558eef0a4238.type.Reference.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/sim_nano_station_ctrl.slx b/sim_nano_station_ctrl.slx
deleted file mode 100644
index 87cb382..0000000
Binary files a/sim_nano_station_ctrl.slx and /dev/null differ
diff --git a/simscape/sim_micro_station_disturbances.slx b/simscape/sim_micro_station_disturbances.slx
index b0aa4a1..57fd9fa 100644
Binary files a/simscape/sim_micro_station_disturbances.slx and b/simscape/sim_micro_station_disturbances.slx differ
diff --git a/simscape/sim_micro_station_id.slx b/simscape/sim_micro_station_id.slx
index 643a1d3..cd46fe9 100644
Binary files a/simscape/sim_micro_station_id.slx and b/simscape/sim_micro_station_id.slx differ
diff --git a/simscape/sim_micro_station_id.slx.r2018a b/simscape/sim_micro_station_id.slx.r2018a
deleted file mode 100644
index e67fc7b..0000000
Binary files a/simscape/sim_micro_station_id.slx.r2018a and /dev/null differ
diff --git a/simscape/sim_micro_station_modal_analysis.slx b/simscape/sim_micro_station_modal_analysis.slx
index 1b2d585..d82c755 100644
Binary files a/simscape/sim_micro_station_modal_analysis.slx and b/simscape/sim_micro_station_modal_analysis.slx differ
diff --git a/simscape/sim_micro_station_modal_analysis_com.slx b/simscape/sim_micro_station_modal_analysis_com.slx
index 5a0166b..e9dae39 100644
Binary files a/simscape/sim_micro_station_modal_analysis_com.slx and b/simscape/sim_micro_station_modal_analysis_com.slx differ
diff --git a/simscape/sim_nano_station_ctrl.slx b/simscape/sim_nano_station_ctrl.slx
new file mode 100644
index 0000000..ea982b9
Binary files /dev/null and b/simscape/sim_nano_station_ctrl.slx differ
diff --git a/simscape/sim_nano_station_id.slx b/simscape/sim_nano_station_id.slx
index 1de857b..9ccea11 100644
Binary files a/simscape/sim_nano_station_id.slx and b/simscape/sim_nano_station_id.slx differ
diff --git a/simscape/sim_nano_station_uniaxial.slx b/simscape/sim_nano_station_uniaxial.slx
index 6bf84c9..baf68cb 100644
Binary files a/simscape/sim_nano_station_uniaxial.slx and b/simscape/sim_nano_station_uniaxial.slx differ
diff --git a/simscape/sim_nano_station_uniaxial_cedrat.slx b/simscape/sim_nano_station_uniaxial_cedrat.slx
index 95de9f7..e5e7af7 100644
Binary files a/simscape/sim_nano_station_uniaxial_cedrat.slx and b/simscape/sim_nano_station_uniaxial_cedrat.slx differ
diff --git a/simscape/sim_nano_station_uniaxial_cedrat_bis.slx b/simscape/sim_nano_station_uniaxial_cedrat_bis.slx
index 946e0ca..bf829f4 100644
Binary files a/simscape/sim_nano_station_uniaxial_cedrat_bis.slx and b/simscape/sim_nano_station_uniaxial_cedrat_bis.slx differ
diff --git a/nass_library/QuaternionToAngles.slx b/simscape_library/QuaternionToAngles.slx
similarity index 100%
rename from nass_library/QuaternionToAngles.slx
rename to simscape_library/QuaternionToAngles.slx
diff --git a/nass_library/RotationMatrixToAngle.slx b/simscape_library/RotationMatrixToAngle.slx
similarity index 100%
rename from nass_library/RotationMatrixToAngle.slx
rename to simscape_library/RotationMatrixToAngle.slx
diff --git a/nass_library/inputs.slx b/simscape_library/inputs.slx
similarity index 100%
rename from nass_library/inputs.slx
rename to simscape_library/inputs.slx
diff --git a/nass_library/nass_library.slx b/simscape_library/nass_library.slx
similarity index 100%
rename from nass_library/nass_library.slx
rename to simscape_library/nass_library.slx
diff --git a/nass_library/pos_error_wrt_nass_base.slx b/simscape_library/pos_error_wrt_nass_base.slx
similarity index 100%
rename from nass_library/pos_error_wrt_nass_base.slx
rename to simscape_library/pos_error_wrt_nass_base.slx
diff --git a/simscape_subsystems/axisc.slx b/simscape_subsystems/axisc.slx
new file mode 100644
index 0000000..946020d
Binary files /dev/null and b/simscape_subsystems/axisc.slx differ
diff --git a/simscape_subsystems/granite.slx b/simscape_subsystems/granite.slx
new file mode 100644
index 0000000..581302d
Binary files /dev/null and b/simscape_subsystems/granite.slx differ
diff --git a/simscape_subsystems/granite_1dof.slx b/simscape_subsystems/granite_1dof.slx
new file mode 100644
index 0000000..81a3a62
Binary files /dev/null and b/simscape_subsystems/granite_1dof.slx differ
diff --git a/simscape_subsystems/ground.slx b/simscape_subsystems/ground.slx
new file mode 100644
index 0000000..c3ba0d7
Binary files /dev/null and b/simscape_subsystems/ground.slx differ
diff --git a/simscape_subsystems/ground_1dof.slx b/simscape_subsystems/ground_1dof.slx
new file mode 100644
index 0000000..71f8104
Binary files /dev/null and b/simscape_subsystems/ground_1dof.slx differ
diff --git a/simscape_subsystems/metrology_6dof.slx b/simscape_subsystems/metrology_6dof.slx
new file mode 100644
index 0000000..175e94a
Binary files /dev/null and b/simscape_subsystems/metrology_6dof.slx differ
diff --git a/simscape_subsystems/micro_hexapod_1dof.slx b/simscape_subsystems/micro_hexapod_1dof.slx
new file mode 100644
index 0000000..478ce18
Binary files /dev/null and b/simscape_subsystems/micro_hexapod_1dof.slx differ
diff --git a/simscape_subsystems/micro_hexapod_F.slx b/simscape_subsystems/micro_hexapod_F.slx
new file mode 100644
index 0000000..19f88a4
Binary files /dev/null and b/simscape_subsystems/micro_hexapod_F.slx differ
diff --git a/simscape_subsystems/nano_hexapod_1dof.slx b/simscape_subsystems/nano_hexapod_1dof.slx
new file mode 100644
index 0000000..7b5bd60
Binary files /dev/null and b/simscape_subsystems/nano_hexapod_1dof.slx differ
diff --git a/simscape_subsystems/nano_hexapod_F.slx b/simscape_subsystems/nano_hexapod_F.slx
new file mode 100644
index 0000000..f37e092
Binary files /dev/null and b/simscape_subsystems/nano_hexapod_F.slx differ
diff --git a/simscape_subsystems/nano_hexapod_F_sensors.slx b/simscape_subsystems/nano_hexapod_F_sensors.slx
new file mode 100644
index 0000000..3942914
Binary files /dev/null and b/simscape_subsystems/nano_hexapod_F_sensors.slx differ
diff --git a/simscape_subsystems/nano_hexapod_cedrat_1dof.slx b/simscape_subsystems/nano_hexapod_cedrat_1dof.slx
new file mode 100644
index 0000000..bc5ef07
Binary files /dev/null and b/simscape_subsystems/nano_hexapod_cedrat_1dof.slx differ
diff --git a/simscape_subsystems/piezo_actuator_cedrat.slx b/simscape_subsystems/piezo_actuator_cedrat.slx
new file mode 100644
index 0000000..0c7513a
Binary files /dev/null and b/simscape_subsystems/piezo_actuator_cedrat.slx differ
diff --git a/simscape_subsystems/piezo_actuator_cedrat_simple.slx b/simscape_subsystems/piezo_actuator_cedrat_simple.slx
new file mode 100644
index 0000000..17a8b86
Binary files /dev/null and b/simscape_subsystems/piezo_actuator_cedrat_simple.slx differ
diff --git a/simscape_subsystems/reference_mirror.slx b/simscape_subsystems/reference_mirror.slx
new file mode 100644
index 0000000..43ac4af
Binary files /dev/null and b/simscape_subsystems/reference_mirror.slx differ
diff --git a/simscape_subsystems/sample_environment.slx b/simscape_subsystems/sample_environment.slx
new file mode 100644
index 0000000..09cc19f
Binary files /dev/null and b/simscape_subsystems/sample_environment.slx differ
diff --git a/simscape_subsystems/sample_environment_1dof.slx b/simscape_subsystems/sample_environment_1dof.slx
new file mode 100644
index 0000000..ee54be7
Binary files /dev/null and b/simscape_subsystems/sample_environment_1dof.slx differ
diff --git a/simscape_subsystems/spindle_1dof.slx b/simscape_subsystems/spindle_1dof.slx
new file mode 100644
index 0000000..a58a0d4
Binary files /dev/null and b/simscape_subsystems/spindle_1dof.slx differ
diff --git a/simscape_subsystems/spindle_D.slx b/simscape_subsystems/spindle_D.slx
new file mode 100644
index 0000000..548b982
Binary files /dev/null and b/simscape_subsystems/spindle_D.slx differ
diff --git a/simscape_subsystems/tilt_stage_1dof.slx b/simscape_subsystems/tilt_stage_1dof.slx
new file mode 100644
index 0000000..dc09f96
Binary files /dev/null and b/simscape_subsystems/tilt_stage_1dof.slx differ
diff --git a/simscape_subsystems/tilt_stage_D.slx b/simscape_subsystems/tilt_stage_D.slx
new file mode 100644
index 0000000..5988cfc
Binary files /dev/null and b/simscape_subsystems/tilt_stage_D.slx differ
diff --git a/simscape_subsystems/translation_stage_1dof.slx b/simscape_subsystems/translation_stage_1dof.slx
new file mode 100644
index 0000000..4b5201f
Binary files /dev/null and b/simscape_subsystems/translation_stage_1dof.slx differ
diff --git a/simscape_subsystems/translation_stage_D.slx b/simscape_subsystems/translation_stage_D.slx
new file mode 100644
index 0000000..936a79a
Binary files /dev/null and b/simscape_subsystems/translation_stage_D.slx differ
diff --git a/simscape_subsystems/translation_stage_F.slx b/simscape_subsystems/translation_stage_F.slx
new file mode 100644
index 0000000..f38c8be
Binary files /dev/null and b/simscape_subsystems/translation_stage_F.slx differ