diff --git a/attachment-viewer/.gitignore b/library/attachment-viewer/.gitignore
similarity index 100%
rename from attachment-viewer/.gitignore
rename to library/attachment-viewer/.gitignore
diff --git a/attachment-viewer/build.gradle b/library/attachment-viewer/build.gradle
similarity index 100%
rename from attachment-viewer/build.gradle
rename to library/attachment-viewer/build.gradle
diff --git a/attachment-viewer/consumer-rules.pro b/library/attachment-viewer/consumer-rules.pro
similarity index 100%
rename from attachment-viewer/consumer-rules.pro
rename to library/attachment-viewer/consumer-rules.pro
diff --git a/attachment-viewer/proguard-rules.pro b/library/attachment-viewer/proguard-rules.pro
similarity index 100%
rename from attachment-viewer/proguard-rules.pro
rename to library/attachment-viewer/proguard-rules.pro
diff --git a/attachment-viewer/src/main/AndroidManifest.xml b/library/attachment-viewer/src/main/AndroidManifest.xml
similarity index 100%
rename from attachment-viewer/src/main/AndroidManifest.xml
rename to library/attachment-viewer/src/main/AndroidManifest.xml
diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AnimatedImageViewHolder.kt b/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AnimatedImageViewHolder.kt
similarity index 100%
rename from attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AnimatedImageViewHolder.kt
rename to library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AnimatedImageViewHolder.kt
diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentEvents.kt b/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentEvents.kt
similarity index 100%
rename from attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentEvents.kt
rename to library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentEvents.kt
diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentSourceProvider.kt b/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentSourceProvider.kt
similarity index 100%
rename from attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentSourceProvider.kt
rename to library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentSourceProvider.kt
diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentViewerActivity.kt b/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentViewerActivity.kt
similarity index 100%
rename from attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentViewerActivity.kt
rename to library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentViewerActivity.kt
diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentsAdapter.kt b/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentsAdapter.kt
similarity index 100%
rename from attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentsAdapter.kt
rename to library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentsAdapter.kt
diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/BaseViewHolder.kt b/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/BaseViewHolder.kt
similarity index 100%
rename from attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/BaseViewHolder.kt
rename to library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/BaseViewHolder.kt
diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt b/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt
similarity index 100%
rename from attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt
rename to library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt
diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirection.kt b/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirection.kt
similarity index 100%
rename from attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirection.kt
rename to library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirection.kt
diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirectionDetector.kt b/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirectionDetector.kt
similarity index 100%
rename from attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirectionDetector.kt
rename to library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirectionDetector.kt
diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeToDismissHandler.kt b/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeToDismissHandler.kt
similarity index 100%
rename from attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeToDismissHandler.kt
rename to library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeToDismissHandler.kt
diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoLoaderTarget.kt b/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoLoaderTarget.kt
similarity index 100%
rename from attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoLoaderTarget.kt
rename to library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoLoaderTarget.kt
diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt b/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt
similarity index 100%
rename from attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt
rename to library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt
diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ZoomableImageViewHolder.kt b/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ZoomableImageViewHolder.kt
similarity index 100%
rename from attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ZoomableImageViewHolder.kt
rename to library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ZoomableImageViewHolder.kt
diff --git a/attachment-viewer/src/main/res/layout/activity_attachment_viewer.xml b/library/attachment-viewer/src/main/res/layout/activity_attachment_viewer.xml
similarity index 100%
rename from attachment-viewer/src/main/res/layout/activity_attachment_viewer.xml
rename to library/attachment-viewer/src/main/res/layout/activity_attachment_viewer.xml
diff --git a/attachment-viewer/src/main/res/layout/item_animated_image_attachment.xml b/library/attachment-viewer/src/main/res/layout/item_animated_image_attachment.xml
similarity index 100%
rename from attachment-viewer/src/main/res/layout/item_animated_image_attachment.xml
rename to library/attachment-viewer/src/main/res/layout/item_animated_image_attachment.xml
diff --git a/attachment-viewer/src/main/res/layout/item_image_attachment.xml b/library/attachment-viewer/src/main/res/layout/item_image_attachment.xml
similarity index 100%
rename from attachment-viewer/src/main/res/layout/item_image_attachment.xml
rename to library/attachment-viewer/src/main/res/layout/item_image_attachment.xml
diff --git a/attachment-viewer/src/main/res/layout/item_video_attachment.xml b/library/attachment-viewer/src/main/res/layout/item_video_attachment.xml
similarity index 100%
rename from attachment-viewer/src/main/res/layout/item_video_attachment.xml
rename to library/attachment-viewer/src/main/res/layout/item_video_attachment.xml
diff --git a/attachment-viewer/src/main/res/values/strings.xml b/library/attachment-viewer/src/main/res/values/strings.xml
similarity index 100%
rename from attachment-viewer/src/main/res/values/strings.xml
rename to library/attachment-viewer/src/main/res/values/strings.xml
diff --git a/settings.gradle b/settings.gradle
index 4f370a6684..06ceb6cdf8 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,9 +1,9 @@
 include ':vector'
 include ':matrix-sdk-android'
-include ':attachment-viewer'
 include ':multipicker'
 include ':library:core-utils'
 include ':library:ui-styles'
 include ':library:jsonviewer'
+include ':library:attachment-viewer'
 include ':library:diff-match-patch'
 include ':matrix-sdk-android-flow'
diff --git a/vector/build.gradle b/vector/build.gradle
index 51929fa9f9..4b9e6c1144 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -336,10 +336,10 @@ dependencies {
     implementation project(":matrix-sdk-android")
     implementation project(":matrix-sdk-android-flow")
     implementation project(":multipicker")
-    implementation project(":attachment-viewer")
     implementation project(":library:jsonviewer")
     implementation project(":library:ui-styles")
     implementation project(":library:core-utils")
+    implementation project(":library:attachment-viewer")
     implementation project(":library:diff-match-patch")
     implementation 'androidx.multidex:multidex:2.0.1'