diff --git a/bob_party/src/screens/services/conversationService/ILoaderConversation.ts b/bob_party/src/services/conversationService/ILoaderConversation.ts
similarity index 100%
rename from bob_party/src/screens/services/conversationService/ILoaderConversation.ts
rename to bob_party/src/services/conversationService/ILoaderConversation.ts
diff --git a/bob_party/src/screens/services/conversationService/ISaverConversation.ts b/bob_party/src/services/conversationService/ISaverConversation.ts
similarity index 100%
rename from bob_party/src/screens/services/conversationService/ISaverConversation.ts
rename to bob_party/src/services/conversationService/ISaverConversation.ts
diff --git a/bob_party/src/screens/services/matchServices/ILoaderMatch.ts b/bob_party/src/services/matchServices/ILoaderMatch.ts
similarity index 100%
rename from bob_party/src/screens/services/matchServices/ILoaderMatch.ts
rename to bob_party/src/services/matchServices/ILoaderMatch.ts
diff --git a/bob_party/src/screens/services/matchServices/ISaverMatch.ts b/bob_party/src/services/matchServices/ISaverMatch.ts
similarity index 100%
rename from bob_party/src/screens/services/matchServices/ISaverMatch.ts
rename to bob_party/src/services/matchServices/ISaverMatch.ts
diff --git a/bob_party/src/screens/services/messageService/IMessageLoader.ts b/bob_party/src/services/messageService/IMessageLoader.ts
similarity index 100%
rename from bob_party/src/screens/services/messageService/IMessageLoader.ts
rename to bob_party/src/services/messageService/IMessageLoader.ts
diff --git a/bob_party/src/screens/services/messageService/IMessageSaver.ts b/bob_party/src/services/messageService/IMessageSaver.ts
similarity index 100%
rename from bob_party/src/screens/services/messageService/IMessageSaver.ts
rename to bob_party/src/services/messageService/IMessageSaver.ts
diff --git a/bob_party/src/screens/services/userServices/ILoaderUser.ts b/bob_party/src/services/userServices/ILoaderUser.ts
similarity index 100%
rename from bob_party/src/screens/services/userServices/ILoaderUser.ts
rename to bob_party/src/services/userServices/ILoaderUser.ts
diff --git a/bob_party/src/screens/services/userServices/ISaverUser.ts b/bob_party/src/services/userServices/ISaverUser.ts
similarity index 100%
rename from bob_party/src/screens/services/userServices/ISaverUser.ts
rename to bob_party/src/services/userServices/ISaverUser.ts
diff --git a/bob_party/src/screens/services/userServices/ManagerUser.ts b/bob_party/src/services/userServices/ManagerUser.ts
similarity index 100%
rename from bob_party/src/screens/services/userServices/ManagerUser.ts
rename to bob_party/src/services/userServices/ManagerUser.ts
diff --git a/bob_party/src/screens/services/userServices/fakeSaverUser.ts b/bob_party/src/services/userServices/fakeSaverUser.ts
similarity index 100%
rename from bob_party/src/screens/services/userServices/fakeSaverUser.ts
rename to bob_party/src/services/userServices/fakeSaverUser.ts
diff --git a/bob_party/src/screens/services/userServices/loaderUserApi.ts b/bob_party/src/services/userServices/loaderUserApi.ts
similarity index 100%
rename from bob_party/src/screens/services/userServices/loaderUserApi.ts
rename to bob_party/src/services/userServices/loaderUserApi.ts
diff --git a/bob_party/src/screens/services/userServices/saverUserApi.ts b/bob_party/src/services/userServices/saverUserApi.ts
similarity index 100%
rename from bob_party/src/screens/services/userServices/saverUserApi.ts
rename to bob_party/src/services/userServices/saverUserApi.ts
diff --git a/bob_party/src/screens/services/userServices/stub.ts b/bob_party/src/services/userServices/stub.ts
similarity index 100%
rename from bob_party/src/screens/services/userServices/stub.ts
rename to bob_party/src/services/userServices/stub.ts