diff --git a/object/OpenBis.m b/OpenBis.m
similarity index 100%
rename from object/OpenBis.m
rename to OpenBis.m
diff --git a/MatlabOpenbis_wrapper.m b/legacy/MatlabOpenbis_wrapper.m
similarity index 100%
rename from MatlabOpenbis_wrapper.m
rename to legacy/MatlabOpenbis_wrapper.m
diff --git a/MatlabPybis_example.m b/legacy/MatlabPybis_example.m
similarity index 100%
rename from MatlabPybis_example.m
rename to legacy/MatlabPybis_example.m
diff --git a/delete_space.m b/legacy/delete_space.m
similarity index 100%
rename from delete_space.m
rename to legacy/delete_space.m
diff --git a/object/df_to_table.m b/legacy/df_to_table.m
similarity index 100%
rename from object/df_to_table.m
rename to legacy/df_to_table.m
diff --git a/download_ds_files.m b/legacy/download_ds_files.m
similarity index 100%
rename from download_ds_files.m
rename to legacy/download_ds_files.m
diff --git a/get_dataset_types.m b/legacy/get_dataset_types.m
similarity index 100%
rename from get_dataset_types.m
rename to legacy/get_dataset_types.m
diff --git a/get_datasets.m b/legacy/get_datasets.m
similarity index 100%
rename from get_datasets.m
rename to legacy/get_datasets.m
diff --git a/get_experiment_types.m b/legacy/get_experiment_types.m
similarity index 100%
rename from get_experiment_types.m
rename to legacy/get_experiment_types.m
diff --git a/get_material_types.m b/legacy/get_material_types.m
similarity index 100%
rename from get_material_types.m
rename to legacy/get_material_types.m
diff --git a/get_sample_types.m b/legacy/get_sample_types.m
similarity index 100%
rename from get_sample_types.m
rename to legacy/get_sample_types.m
diff --git a/get_spaces.m b/legacy/get_spaces.m
similarity index 100%
rename from get_spaces.m
rename to legacy/get_spaces.m
diff --git a/get_terms.m b/legacy/get_terms.m
similarity index 100%
rename from get_terms.m
rename to legacy/get_terms.m
diff --git a/login.m b/legacy/login.m
similarity index 100%
rename from login.m
rename to legacy/login.m
diff --git a/logout.m b/legacy/logout.m
similarity index 100%
rename from logout.m
rename to legacy/logout.m
diff --git a/new_space.m b/legacy/new_space.m
similarity index 100%
rename from new_space.m
rename to legacy/new_space.m
diff --git a/test_connection.m b/legacy/test_connection.m
similarity index 100%
rename from test_connection.m
rename to legacy/test_connection.m
diff --git a/object/Space.m b/object/Space.m
deleted file mode 100644
index cdf4a0c0aa3d1b4b4f5f625131abad576cf6db99..0000000000000000000000000000000000000000
--- a/object/Space.m
+++ /dev/null
@@ -1,27 +0,0 @@
-classdef Space
-    % Space   Summary of class Space
-    % This is the first line of the description of Space.
-    
-     properties
-        pybis % Python space object
-        code % Space code
-        description % Space description
-    end
-    
-    methods
-        
-        function save()
-            
-            
-        end
-        
-        function delete(obj, reason)
-            
-            
-        end
-        
-        
-    end
-    
-    
-end
\ No newline at end of file
diff --git a/object/passwordEntryDialog.m b/passwordEntryDialog.m
similarity index 100%
rename from object/passwordEntryDialog.m
rename to passwordEntryDialog.m
diff --git a/object/user_url_pw_inputdlg.m b/user_url_pw_inputdlg.m
similarity index 100%
rename from object/user_url_pw_inputdlg.m
rename to user_url_pw_inputdlg.m