diff --git a/core/routes.php b/ocs/routes.php
similarity index 56%
rename from core/routes.php
rename to ocs/routes.php
index 4c5004dcf5a98156ae16008184b9a8183ab3ca4d..e2f70342b8519c13bc67b1135fc424206f5e5d54 100644
--- a/core/routes.php
+++ b/ocs/routes.php
@@ -6,20 +6,20 @@
  */
 
 // Config
-OC_API::register('get', '/config.{format}', array('OC_API_Config', 'apiConfig'));
+OC_API::register('get', '/config.{format}', array('OC_OCS_Config', 'apiConfig'));
 // Person
-OC_API::register('post', '/person/check.{format}', array('OC_API_Person', 'check'));
+OC_API::register('post', '/person/check.{format}', array('OC_OCS_Person', 'check'));
 // Activity
-OC_API::register('get', '/activity.{format}', array('OC_API_Activity', 'activityGet'));
-OC_API::register('post', '/activity.{format}', array('OC_API_Activity', 'activityPut'));
+OC_API::register('get', '/activity.{format}', array('OC_OCS_Activity', 'activityGet'));
 // Privatedata
-OC_API::register('get', '/privatedata/getattribute/{app}/{key}.{format}', array('OC_API_Privatedata', 'privatedataGet'));
-OC_API::register('post', '/privatedata/setattribute/{app}/{key}.{format}', array('OC_API_Privatedata', 'privatedataPut'));
-OC_API::register('post', '/privatedata/deleteattribute/{app}/{key}.{format}', array('OC_API_Privatedata', 'privatedataDelete'));
+OC_API::register('get', '/privatedata/getattribute/{app}/{key}.{format}', array('OC_OCS_Privatedata', 'privatedataGet'));
+OC_API::register('post', '/privatedata/setattribute/{app}/{key}.{format}', array('OC_OCS_Privatedata', 'privatedataPut'));
+OC_API::register('post', '/privatedata/deleteattribute/{app}/{key}.{format}', array('OC_OCS_Privatedata', 'privatedataDelete'));
 // Cloud
-OC_API::register('get', '/cloud/system/webapps.{format}', array('OC_API_Cloud', 'systemwebapps'));
-OC_API::register('get', '/cloud/user/{user}.{format}', array('OC_API_Cloud', 'getQuota'));
-OC_API::register('post', '/cloud/user/{user}.{format}', array('OC_API_Cloud', 'setQuota'));
-OC_API::register('get', '/cloud/user/{user}/publickey.{format}', array('OC_API_Cloud', 'getPublicKey'));
-OC_API::register('get', '/cloud/user/{user}/privatekey.{format}', array('OC_API_Cloud', 'getPrivateKey'));
+OC_API::register('get', '/cloud/system/webapps.{format}', array('OC_OCS_Cloud', 'systemwebapps'));
+OC_API::register('get', '/cloud/user/{user}.{format}', array('OC_OCS_Cloud', 'getQuota'));
+OC_API::register('post', '/cloud/user/{user}.{format}', array('OC_OCS_Cloud', 'setQuota'));
+OC_API::register('get', '/cloud/user/{user}/publickey.{format}', array('OC_OCS_Cloud', 'getPublicKey'));
+OC_API::register('get', '/cloud/user/{user}/privatekey.{format}', array('OC_OCS_Cloud', 'getPrivateKey'));
+
 ?>
\ No newline at end of file