diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e2f11f867..41ae4ce7f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -169,7 +169,7 @@
             android:windowSoftInputMode="stateHidden" />
 
         <activity
-            android:name=".activities.SharedItemsActivity"
+            android:name=".shareditems.activities.SharedItemsActivity"
             android:theme="@style/AppTheme"/>
 
         <receiver android:name=".receivers.PackageReplacedReceiver">
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
index e4714ea08..cfba72955 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
@@ -103,7 +103,7 @@ import com.nextcloud.talk.BuildConfig
 import com.nextcloud.talk.R
 import com.nextcloud.talk.activities.CallActivity
 import com.nextcloud.talk.activities.MainActivity
-import com.nextcloud.talk.activities.SharedItemsActivity
+import com.nextcloud.talk.shareditems.activities.SharedItemsActivity
 import com.nextcloud.talk.activities.TakePhotoActivity
 import com.nextcloud.talk.adapters.messages.IncomingLocationMessageViewHolder
 import com.nextcloud.talk.adapters.messages.IncomingPreviewMessageViewHolder
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt
index bc6c25a1e..7068af0c5 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt
@@ -51,7 +51,7 @@ import com.bluelinelabs.conductor.RouterTransaction
 import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler
 import com.facebook.drawee.backends.pipeline.Fresco
 import com.nextcloud.talk.R
-import com.nextcloud.talk.activities.SharedItemsActivity
+import com.nextcloud.talk.shareditems.activities.SharedItemsActivity
 import com.nextcloud.talk.adapters.items.ParticipantItem
 import com.nextcloud.talk.api.NcApi
 import com.nextcloud.talk.application.NextcloudTalkApplication
diff --git a/app/src/main/java/com/nextcloud/talk/dagger/modules/RepositoryModule.kt b/app/src/main/java/com/nextcloud/talk/dagger/modules/RepositoryModule.kt
index e31957085..b070689b8 100644
--- a/app/src/main/java/com/nextcloud/talk/dagger/modules/RepositoryModule.kt
+++ b/app/src/main/java/com/nextcloud/talk/dagger/modules/RepositoryModule.kt
@@ -22,7 +22,7 @@
 package com.nextcloud.talk.dagger.modules
 
 import com.nextcloud.talk.api.NcApi
-import com.nextcloud.talk.repositories.SharedItemsRepository
+import com.nextcloud.talk.shareditems.repositories.SharedItemsRepository
 import dagger.Module
 import dagger.Provides
 
diff --git a/app/src/main/java/com/nextcloud/talk/dagger/modules/ViewModelModule.kt b/app/src/main/java/com/nextcloud/talk/dagger/modules/ViewModelModule.kt
index 39cfd8036..d684db1b2 100644
--- a/app/src/main/java/com/nextcloud/talk/dagger/modules/ViewModelModule.kt
+++ b/app/src/main/java/com/nextcloud/talk/dagger/modules/ViewModelModule.kt
@@ -23,7 +23,7 @@ package com.nextcloud.talk.dagger.modules
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
-import com.nextcloud.talk.viewmodels.SharedItemsViewModel
+import com.nextcloud.talk.shareditems.viewmodels.SharedItemsViewModel
 import dagger.Binds
 import dagger.MapKey
 import dagger.Module
diff --git a/app/src/main/java/com/nextcloud/talk/activities/SharedItemsActivity.kt b/app/src/main/java/com/nextcloud/talk/shareditems/activities/SharedItemsActivity.kt
similarity index 95%
rename from app/src/main/java/com/nextcloud/talk/activities/SharedItemsActivity.kt
rename to app/src/main/java/com/nextcloud/talk/shareditems/activities/SharedItemsActivity.kt
index 80ba643b2..2582c7729 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/SharedItemsActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/shareditems/activities/SharedItemsActivity.kt
@@ -1,4 +1,4 @@
-package com.nextcloud.talk.activities
+package com.nextcloud.talk.shareditems.activities
 
 import android.os.Bundle
 import android.util.Log
@@ -12,17 +12,17 @@ import androidx.recyclerview.widget.RecyclerView
 import autodagger.AutoInjector
 import com.google.android.material.tabs.TabLayout
 import com.nextcloud.talk.R
-import com.nextcloud.talk.adapters.SharedItemsGridAdapter
-import com.nextcloud.talk.adapters.SharedItemsListAdapter
+import com.nextcloud.talk.shareditems.adapters.SharedItemsGridAdapter
+import com.nextcloud.talk.shareditems.adapters.SharedItemsListAdapter
 import com.nextcloud.talk.application.NextcloudTalkApplication
 import com.nextcloud.talk.databinding.ActivitySharedItemsBinding
 import com.nextcloud.talk.models.database.UserEntity
-import com.nextcloud.talk.repositories.SharedItemType
+import com.nextcloud.talk.shareditems.model.SharedItemType
 import com.nextcloud.talk.utils.DisplayUtils
 import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_CONVERSATION_NAME
 import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ROOM_TOKEN
 import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_USER_ENTITY
-import com.nextcloud.talk.viewmodels.SharedItemsViewModel
+import com.nextcloud.talk.shareditems.viewmodels.SharedItemsViewModel
 import javax.inject.Inject
 
 @AutoInjector(NextcloudTalkApplication::class)
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/SharedItemsGridAdapter.kt b/app/src/main/java/com/nextcloud/talk/shareditems/adapters/SharedItemsGridAdapter.kt
similarity index 97%
rename from app/src/main/java/com/nextcloud/talk/adapters/SharedItemsGridAdapter.kt
rename to app/src/main/java/com/nextcloud/talk/shareditems/adapters/SharedItemsGridAdapter.kt
index 240842254..29134f172 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/SharedItemsGridAdapter.kt
+++ b/app/src/main/java/com/nextcloud/talk/shareditems/adapters/SharedItemsGridAdapter.kt
@@ -1,4 +1,4 @@
-package com.nextcloud.talk.adapters
+package com.nextcloud.talk.shareditems.adapters
 
 import android.net.Uri
 import android.util.Log
@@ -16,7 +16,7 @@ import com.facebook.imagepipeline.common.RotationOptions
 import com.facebook.imagepipeline.image.ImageInfo
 import com.facebook.imagepipeline.request.ImageRequestBuilder
 import com.nextcloud.talk.databinding.SharedItemGridBinding
-import com.nextcloud.talk.repositories.SharedItem
+import com.nextcloud.talk.shareditems.model.SharedItem
 import com.nextcloud.talk.utils.DrawableUtils
 import com.nextcloud.talk.utils.FileViewerUtils
 
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/SharedItemsListAdapter.kt b/app/src/main/java/com/nextcloud/talk/shareditems/adapters/SharedItemsListAdapter.kt
similarity index 97%
rename from app/src/main/java/com/nextcloud/talk/adapters/SharedItemsListAdapter.kt
rename to app/src/main/java/com/nextcloud/talk/shareditems/adapters/SharedItemsListAdapter.kt
index 56a084b21..7b5bbd6e7 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/SharedItemsListAdapter.kt
+++ b/app/src/main/java/com/nextcloud/talk/shareditems/adapters/SharedItemsListAdapter.kt
@@ -1,4 +1,4 @@
-package com.nextcloud.talk.adapters
+package com.nextcloud.talk.shareditems.adapters
 
 import android.net.Uri
 import android.text.format.Formatter
@@ -16,7 +16,7 @@ import com.facebook.imagepipeline.common.RotationOptions
 import com.facebook.imagepipeline.image.ImageInfo
 import com.facebook.imagepipeline.request.ImageRequestBuilder
 import com.nextcloud.talk.databinding.SharedItemListBinding
-import com.nextcloud.talk.repositories.SharedItem
+import com.nextcloud.talk.shareditems.model.SharedItem
 import com.nextcloud.talk.utils.DateUtils
 import com.nextcloud.talk.utils.DrawableUtils
 import com.nextcloud.talk.utils.FileViewerUtils
diff --git a/app/src/main/java/com/nextcloud/talk/repositories/SharedItem.kt b/app/src/main/java/com/nextcloud/talk/shareditems/model/SharedItem.kt
similarity index 88%
rename from app/src/main/java/com/nextcloud/talk/repositories/SharedItem.kt
rename to app/src/main/java/com/nextcloud/talk/shareditems/model/SharedItem.kt
index 38aeef303..1e684f7ed 100644
--- a/app/src/main/java/com/nextcloud/talk/repositories/SharedItem.kt
+++ b/app/src/main/java/com/nextcloud/talk/shareditems/model/SharedItem.kt
@@ -1,4 +1,4 @@
-package com.nextcloud.talk.repositories
+package com.nextcloud.talk.shareditems.model
 
 import com.nextcloud.talk.models.database.UserEntity
 
diff --git a/app/src/main/java/com/nextcloud/talk/repositories/SharedItemType.kt b/app/src/main/java/com/nextcloud/talk/shareditems/model/SharedItemType.kt
similarity index 84%
rename from app/src/main/java/com/nextcloud/talk/repositories/SharedItemType.kt
rename to app/src/main/java/com/nextcloud/talk/shareditems/model/SharedItemType.kt
index e263ae8cc..7ddf9228e 100644
--- a/app/src/main/java/com/nextcloud/talk/repositories/SharedItemType.kt
+++ b/app/src/main/java/com/nextcloud/talk/shareditems/model/SharedItemType.kt
@@ -1,4 +1,4 @@
-package com.nextcloud.talk.repositories
+package com.nextcloud.talk.shareditems.model
 
 import java.util.Locale
 
diff --git a/app/src/main/java/com/nextcloud/talk/repositories/SharedMediaItems.kt b/app/src/main/java/com/nextcloud/talk/shareditems/model/SharedMediaItems.kt
similarity index 78%
rename from app/src/main/java/com/nextcloud/talk/repositories/SharedMediaItems.kt
rename to app/src/main/java/com/nextcloud/talk/shareditems/model/SharedMediaItems.kt
index 6572c1595..7d4fd1ed3 100644
--- a/app/src/main/java/com/nextcloud/talk/repositories/SharedMediaItems.kt
+++ b/app/src/main/java/com/nextcloud/talk/shareditems/model/SharedMediaItems.kt
@@ -1,4 +1,4 @@
-package com.nextcloud.talk.repositories
+package com.nextcloud.talk.shareditems.model
 
 class SharedMediaItems(
     val items: List<SharedItem>,
diff --git a/app/src/main/java/com/nextcloud/talk/repositories/SharedItemsRepository.kt b/app/src/main/java/com/nextcloud/talk/shareditems/repositories/SharedItemsRepository.kt
similarity index 95%
rename from app/src/main/java/com/nextcloud/talk/repositories/SharedItemsRepository.kt
rename to app/src/main/java/com/nextcloud/talk/shareditems/repositories/SharedItemsRepository.kt
index be6460dd7..0aecfe12f 100644
--- a/app/src/main/java/com/nextcloud/talk/repositories/SharedItemsRepository.kt
+++ b/app/src/main/java/com/nextcloud/talk/shareditems/repositories/SharedItemsRepository.kt
@@ -1,4 +1,4 @@
-package com.nextcloud.talk.repositories
+package com.nextcloud.talk.shareditems.repositories
 
 import android.util.Log
 import com.nextcloud.talk.R
@@ -6,6 +6,9 @@ import com.nextcloud.talk.api.NcApi
 import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication
 import com.nextcloud.talk.models.database.UserEntity
 import com.nextcloud.talk.models.json.chat.ChatShareOverall
+import com.nextcloud.talk.shareditems.model.SharedItem
+import com.nextcloud.talk.shareditems.model.SharedItemType
+import com.nextcloud.talk.shareditems.model.SharedMediaItems
 import com.nextcloud.talk.utils.ApiUtils
 import io.reactivex.Observable
 import retrofit2.Response
diff --git a/app/src/main/java/com/nextcloud/talk/viewmodels/SharedItemsViewModel.kt b/app/src/main/java/com/nextcloud/talk/shareditems/viewmodels/SharedItemsViewModel.kt
similarity index 94%
rename from app/src/main/java/com/nextcloud/talk/viewmodels/SharedItemsViewModel.kt
rename to app/src/main/java/com/nextcloud/talk/shareditems/viewmodels/SharedItemsViewModel.kt
index 134cd7f23..23bf6028e 100644
--- a/app/src/main/java/com/nextcloud/talk/viewmodels/SharedItemsViewModel.kt
+++ b/app/src/main/java/com/nextcloud/talk/shareditems/viewmodels/SharedItemsViewModel.kt
@@ -1,13 +1,13 @@
-package com.nextcloud.talk.viewmodels
+package com.nextcloud.talk.shareditems.viewmodels
 
 import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.nextcloud.talk.models.database.UserEntity
-import com.nextcloud.talk.repositories.SharedItemType
-import com.nextcloud.talk.repositories.SharedItemsRepository
-import com.nextcloud.talk.repositories.SharedMediaItems
+import com.nextcloud.talk.shareditems.model.SharedItemType
+import com.nextcloud.talk.shareditems.repositories.SharedItemsRepository
+import com.nextcloud.talk.shareditems.model.SharedMediaItems
 import io.reactivex.Observer
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
diff --git a/app/src/main/res/layout/activity_shared_items.xml b/app/src/main/res/layout/activity_shared_items.xml
index 5b2b2f6b5..dc65d9f27 100644
--- a/app/src/main/res/layout/activity_shared_items.xml
+++ b/app/src/main/res/layout/activity_shared_items.xml
@@ -25,7 +25,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/bg_default"
-    tools:context=".activities.SharedItemsActivity">
+    tools:context=".shareditems.activities.SharedItemsActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/shared_items_appbar"