Refactor package hierarchy

Signed-off-by: Stefan Niedermann <info@niedermann.it>

44 files changed, 252 insertions, 215 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullCard.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullCard.java
index ea22d506b..a4eb98a50 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullCard.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullCard.java
@@ -20,7 +20,7 @@ import it.niedermann.nextcloud.deck.model.Label;
 import it.niedermann.nextcloud.deck.model.User;
 import it.niedermann.nextcloud.deck.model.interfaces.IRemoteEntity;
 import it.niedermann.nextcloud.deck.model.ocs.comment.DeckComment;
-import it.niedermann.nextcloud.deck.ui.helper.dnd.DragAndDropModel;
+import it.niedermann.nextcloud.deck.ui.dnd.DragAndDropModel;
 
 public class FullCard implements IRemoteEntity, DragAndDropModel {
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/EditActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/EditActivity.java
index cdcc407b5..72be33780 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/EditActivity.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/EditActivity.java
@@ -46,11 +46,11 @@ import it.niedermann.nextcloud.deck.model.ocs.Version;
 import it.niedermann.nextcloud.deck.model.ocs.comment.DeckComment;
 import it.niedermann.nextcloud.deck.persistence.sync.SyncManager;
 import it.niedermann.nextcloud.deck.ui.board.BoardAdapter;
-import it.niedermann.nextcloud.deck.ui.card.CardAttachmentsFragment.NewCardAttachmentHandler;
-import it.niedermann.nextcloud.deck.ui.card.CardDetailsFragment.CardDetailsListener;
 import it.niedermann.nextcloud.deck.ui.card.CardTabAdapter;
+import it.niedermann.nextcloud.deck.ui.card.attachments.NewCardAttachmentHandler;
 import it.niedermann.nextcloud.deck.ui.card.comments.CommentAddedListener;
 import it.niedermann.nextcloud.deck.ui.card.comments.CommentDeletedListener;
+import it.niedermann.nextcloud.deck.ui.card.details.CardDetailsListener;
 import it.niedermann.nextcloud.deck.ui.exception.ExceptionHandler;
 import it.niedermann.nextcloud.deck.util.CardUtil;
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java
index 92314193b..4553596d4 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java
@@ -63,15 +63,15 @@ import it.niedermann.nextcloud.deck.persistence.sync.SyncManager;
 import it.niedermann.nextcloud.deck.persistence.sync.SyncWorker;
 import it.niedermann.nextcloud.deck.persistence.sync.adapters.db.util.WrappedLiveData;
 import it.niedermann.nextcloud.deck.ui.board.EditBoardDialogFragment;
-import it.niedermann.nextcloud.deck.ui.board.EditBoardDialogFragment.EditBoardListener;
+import it.niedermann.nextcloud.deck.ui.board.EditBoardListener;
 import it.niedermann.nextcloud.deck.ui.card.CardAdapter;
+import it.niedermann.nextcloud.deck.ui.dnd.CrossTabDragAndDrop;
 import it.niedermann.nextcloud.deck.ui.exception.ExceptionHandler;
-import it.niedermann.nextcloud.deck.ui.helper.dnd.CrossTabDragAndDrop;
 import it.niedermann.nextcloud.deck.ui.stack.EditStackDialogFragment;
-import it.niedermann.nextcloud.deck.ui.stack.EditStackDialogFragment.EditStackListener;
+import it.niedermann.nextcloud.deck.ui.stack.EditStackListener;
+import it.niedermann.nextcloud.deck.ui.stack.OnScrollListener;
 import it.niedermann.nextcloud.deck.ui.stack.StackAdapter;
 import it.niedermann.nextcloud.deck.ui.stack.StackFragment;
-import it.niedermann.nextcloud.deck.ui.stack.StackFragment.OnScrollListener;
 import it.niedermann.nextcloud.deck.util.DeleteDialogBuilder;
 import it.niedermann.nextcloud.deck.util.DrawerMenuUtil;
 import it.niedermann.nextcloud.deck.util.DrawerMenuUtil.DrawerAccountListener;
@@ -131,7 +131,8 @@ public class MainActivity extends AppCompatActivity implements EditStackListener
     private int minimumServerAppMajor;
     private int minimumServerAppMinor;
     private int minimumServerAppPatch;
-    @Nullable private TabLayoutMediator mediator;
+    @Nullable
+    private TabLayoutMediator mediator;
     @Nullable
     private TabLayoutHelper tabLayoutHelper;
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/attachments/AttachmentAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/attachments/AttachmentAdapter.java
index 554ff8d7f..cfdeb0880 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/attachments/AttachmentAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/attachments/AttachmentAdapter.java
@@ -25,7 +25,7 @@ import it.niedermann.nextcloud.deck.model.Account;
 import it.niedermann.nextcloud.deck.model.Attachment;
 import it.niedermann.nextcloud.deck.util.AttachmentUtil;
 
-public class AttachmentAdapter extends RecyclerView.Adapter<AttachmentAdapter.AttachmentViewHolder> {
+public class AttachmentAdapter extends RecyclerView.Adapter<AttachmentViewHolder> {
 
     private final Account account;
     private final long cardRemoteId;
@@ -88,13 +88,4 @@ public class AttachmentAdapter extends RecyclerView.Adapter<AttachmentAdapter.At
     public int getItemCount() {
         return attachments.size();
     }
-
-    static class AttachmentViewHolder extends RecyclerView.ViewHolder {
-        private ItemAttachmentBinding binding;
-
-        private AttachmentViewHolder(ItemAttachmentBinding binding) {
-            super(binding.getRoot());
-            this.binding = binding;
-        }
-    }
 }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/attachments/AttachmentViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/attachments/AttachmentViewHolder.java
new file mode 100644
index 000000000..584a57d1d
--- /dev/null
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/attachments/AttachmentViewHolder.java
@@ -0,0 +1,15 @@
+package it.niedermann.nextcloud.deck.ui.attachments;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+import it.niedermann.nextcloud.deck.databinding.ItemAttachmentBinding;
+
+public class AttachmentViewHolder extends RecyclerView.ViewHolder {
+    public ItemAttachmentBinding binding;
+
+    @SuppressWarnings("WeakerAccess")
+    public AttachmentViewHolder(ItemAttachmentBinding binding) {
+        super(binding.getRoot());
+        this.binding = binding;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/EditBoardDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/EditBoardDialogFragment.java
index e432d6872..0340fa1fb 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/EditBoardDialogFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/EditBoardDialogFragment.java
@@ -102,10 +102,6 @@ public class EditBoardDialogFragment extends DialogFragment {
         return dialog;
     }
 
-    public interface EditBoardListener {
-        void onUpdateBoard(FullBoard fullBoard);
 
-        void onCreateBoard(String title, String color);
-    }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/EditBoardListener.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/EditBoardListener.java
new file mode 100644
index 000000000..2905593e4
--- /dev/null
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/EditBoardListener.java
@@ -0,0 +1,9 @@
+package it.niedermann.nextcloud.deck.ui.board;
+
+import it.niedermann.nextcloud.deck.model.full.FullBoard;
+
+public interface EditBoardListener {
+    void onUpdateBoard(FullBoard fullBoard);
+
+    void onCreateBoard(String title, String color);
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/AccessControlAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/AccessControlAdapter.java
index 0c606723f..d32b19b7c 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/AccessControlAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/AccessControlAdapter.java
@@ -1,4 +1,4 @@
-package it.niedermann.nextcloud.deck.ui.board;
+package it.niedermann.nextcloud.deck.ui.board.accesscontrol;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -114,29 +114,4 @@ public class AccessControlAdapter extends RecyclerView.Adapter<RecyclerView.View
         return (position == 0) ? TYPE_HEADER : TYPE_ITEM;
     }
 
-    private static class AccessControlViewHolder extends RecyclerView.ViewHolder {
-        //        @BindDrawable(R.drawable.ic_sync_blue_24dp)
-//        Drawable syncIcon;
-        private ItemAccessControlBinding binding;
-
-        private AccessControlViewHolder(ItemAccessControlBinding binding) {
-            super(binding.getRoot());
-            this.binding = binding;
-        }
-    }
-
-    private static class OwnerViewHolder extends RecyclerView.ViewHolder {
-        private ItemAccessControlOwnerBinding binding;
-
-        private OwnerViewHolder(ItemAccessControlOwnerBinding binding) {
-            super(binding.getRoot());
-            this.binding = binding;
-        }
-    }
-
-    public interface AccessControlChangedListener {
-        void updateAccessControl(AccessControl accessControl);
-
-        void deleteAccessControl(AccessControl ac);
-    }
 }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/AccessControlChangedListener.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/AccessControlChangedListener.java
new file mode 100644
index 000000000..9b978377f
--- /dev/null
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/AccessControlChangedListener.java
@@ -0,0 +1,9 @@
+package it.niedermann.nextcloud.deck.ui.board.accesscontrol;
+
+import it.niedermann.nextcloud.deck.model.AccessControl;
+
+public interface AccessControlChangedListener {
+        void updateAccessControl(AccessControl accessControl);
+
+        void deleteAccessControl(AccessControl ac);
+    }
\ No newline at end of file
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/AccessControlDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/AccessControlDialogFragment.java
index 64e750b52..853d1c4e2 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/AccessControlDialogFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/AccessControlDialogFragment.java
@@ -1,4 +1,4 @@
-package it.niedermann.nextcloud.deck.ui.board;
+package it.niedermann.nextcloud.deck.ui.board.accesscontrol;
 
 import android.app.Dialog;
 import android.os.Bundle;
@@ -22,9 +22,7 @@ import it.niedermann.nextcloud.deck.model.full.FullBoard;
 import it.niedermann.nextcloud.deck.persistence.sync.SyncManager;
 import it.niedermann.nextcloud.deck.ui.card.UserAutoCompleteAdapter;
 
-public class AccessControlDialogFragment extends DialogFragment implements
-        AccessControlAdapter.AccessControlChangedListener,
-        AdapterView.OnItemClickListener {
+public class AccessControlDialogFragment extends DialogFragment implements AccessControlChangedListener, AdapterView.OnItemClickListener {
 
     private DialogBoardShareBinding binding;
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/AccessControlViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/AccessControlViewHolder.java
new file mode 100644
index 000000000..576d93124
--- /dev/null
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/AccessControlViewHolder.java
@@ -0,0 +1,17 @@
+package it.niedermann.nextcloud.deck.ui.board.accesscontrol;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+import it.niedermann.nextcloud.deck.databinding.ItemAccessControlBinding;
+
+public class AccessControlViewHolder extends RecyclerView.ViewHolder {
+    // @BindDrawable(R.drawable.ic_sync_blue_24dp)
+    // Drawable syncIcon;
+    public ItemAccessControlBinding binding;
+
+    @SuppressWarnings("WeakerAccess")
+    public AccessControlViewHolder(ItemAccessControlBinding binding) {
+        super(binding.getRoot());
+        this.binding = binding;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/OwnerViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/OwnerViewHolder.java
new file mode 100644
index 000000000..c63f4c34f
--- /dev/null
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/OwnerViewHolder.java
@@ -0,0 +1,15 @@
+package it.niedermann.nextcloud.deck.ui.board.accesscontrol;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+import it.niedermann.nextcloud.deck.databinding.ItemAccessControlOwnerBinding;
+
+public class OwnerViewHolder extends RecyclerView.ViewHolder {
+    public ItemAccessControlOwnerBinding binding;
+
+    @SuppressWarnings("WeakerAccess")
+    public OwnerViewHolder(ItemAccessControlOwnerBinding binding) {
+        super(binding.getRoot());
+        this.binding = binding;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAdapter.java
index fc5221341..0acb6dcab 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAdapter.java
@@ -46,8 +46,8 @@ import it.niedermann.nextcloud.deck.model.full.FullStack;
 import it.niedermann.nextcloud.deck.persistence.sync.SyncManager;
 import it.niedermann.nextcloud.deck.persistence.sync.adapters.db.util.LiveDataHelper;
 import it.niedermann.nextcloud.deck.ui.EditActivity;
-import it.niedermann.nextcloud.deck.ui.helper.dnd.DragAndDropAdapter;
-import it.niedermann.nextcloud.deck.ui.helper.dnd.DraggedItemLocalState;
+import it.niedermann.nextcloud.deck.ui.dnd.DragAndDropAdapter;
+import it.niedermann.nextcloud.deck.ui.dnd.DraggedItemLocalState;
 import it.niedermann.nextcloud.deck.util.ColorUtil;
 import it.niedermann.nextcloud.deck.util.DateUtil;
 import it.niedermann.nextcloud.deck.util.DimensionUtil;
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardItemTouchHelper.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardItemTouchHelper.java
deleted file mode 100644
index 184351e77..000000000
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardItemTouchHelper.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package it.niedermann.nextcloud.deck.ui.card;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.recyclerview.widget.ItemTouchHelper;
-
-public class CardItemTouchHelper extends ItemTouchHelper {
-    public CardItemTouchHelper(CardAdapter adapter) {
-        super(new ItemTouchHelper.SimpleCallback(
-                ItemTouchHelper.UP |
-                        ItemTouchHelper.DOWN |
-                        ItemTouchHelper.LEFT |
-                        ItemTouchHelper.RIGHT |
-                        ItemTouchHelper.START |
-                        ItemTouchHelper.END,
-                0) {
-            @Override
-            public boolean onMove(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder, @NonNull RecyclerView.ViewHolder target) {
-                adapter.moveItem(viewHolder.getAdapterPosition(), target.getAdapterPosition());
-                return true;
-            }
-
-            @Override
-            public void onSwiped(@NonNull RecyclerView.ViewHolder viewHolder, int i) {
-                /* silence is gold. */
-            }
-        });
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardTabAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardTabAdapter.java
index 544905323..9cc3663bf 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardTabAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardTabAdapter.java
@@ -6,7 +6,10 @@ import androidx.fragment.app.FragmentManager;
 import androidx.lifecycle.Lifecycle;
 import androidx.viewpager2.adapter.FragmentStateAdapter;
 
+import it.niedermann.nextcloud.deck.ui.card.activities.CardActivityFragment;
+import it.niedermann.nextcloud.deck.ui.card.attachments.CardAttachmentsFragment;
 import it.niedermann.nextcloud.deck.ui.card.comments.CardCommentsFragment;
+import it.niedermann.nextcloud.deck.ui.card.details.CardDetailsFragment;
 
 public class CardTabAdapter extends FragmentStateAdapter {
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/LabelAutoCompleteAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/LabelAutoCompleteAdapter.java
index 04b28af85..3b95b43c8 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/LabelAutoCompleteAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/LabelAutoCompleteAdapter.java
@@ -23,7 +23,7 @@ public class LabelAutoCompleteAdapter extends AutoCompleteAdapter<Label> {
     private String lastFilterText;
     private boolean canManage = false;
 
-    LabelAutoCompleteAdapter(@NonNull ComponentActivity activity, long accountId, long boardId, long cardId) {
+    public LabelAutoCompleteAdapter(@NonNull ComponentActivity activity, long accountId, long boardId, long cardId) {
         super(activity, accountId, boardId, cardId);
         syncManager.getFullBoardById(accountId, boardId).observe(activity, (fullBoard) -> {
             if (fullBoard.getBoard().isPermissionManage()) {
@@ -93,7 +93,7 @@ public class LabelAutoCompleteAdapter extends AutoCompleteAdapter<Label> {
         };
     }
 
-    String getLastFilterText() {
+    public String getLastFilterText() {
         return this.lastFilterText;
     }
 }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/UserAutoCompleteAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/UserAutoCompleteAdapter.java
index b9a89d76e..a8f3b0c2c 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/UserAutoCompleteAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/UserAutoCompleteAdapter.java
@@ -30,7 +30,6 @@ public class UserAutoCompleteAdapter extends AutoCompleteAdapter<User> {
         this(activity, accountId, boardId, NO_CARD);
     }
 
-    @SuppressWarnings("WeakerAccess")
     public UserAutoCompleteAdapter(@NonNull ComponentActivity activity, long accountId, long boardId, long cardId) {
         super(activity, accountId, boardId, cardId);
     }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardActivityAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityAdapter.java
index 405725a1a..6aa7784bb 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardActivityAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityAdapter.java
@@ -1,4 +1,4 @@
-package it.niedermann.nextcloud.deck.ui.card;
+package it.niedermann.nextcloud.deck.ui.card.activities;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -19,13 +19,14 @@ import it.niedermann.nextcloud.deck.util.DateUtil;
 
 import static it.niedermann.nextcloud.deck.util.ClipboardUtil.copyToClipboard;
 
-public class CardActivityAdapter extends RecyclerView.Adapter<CardActivityAdapter.ActivitiesViewHolder> {
+public class CardActivityAdapter extends RecyclerView.Adapter<CardActivityViewHolder> {
 
     @NonNull
     private final List<Activity> activities;
     @NonNull
     private final MenuInflater menuInflater;
 
+    @SuppressWarnings("WeakerAccess")
     public CardActivityAdapter(@NonNull List<Activity> activities, @NonNull MenuInflater menuInflater) {
         super();
         this.activities = activities;
@@ -34,14 +35,14 @@ public class CardActivityAdapter extends RecyclerView.Adapter<CardActivityAdapte
 
     @NonNull
     @Override
-    public ActivitiesViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+    public CardActivityViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         final Context context = parent.getContext();
         ItemActivityBinding binding = ItemActivityBinding.inflate(LayoutInflater.from(context), parent, false);
-        return new ActivitiesViewHolder(binding);
+        return new CardActivityViewHolder(binding);
     }
 
     @Override
-    public void onBindViewHolder(@NonNull ActivitiesViewHolder holder, int position) {
+    public void onBindViewHolder(@NonNull CardActivityViewHolder holder, int position) {
         final Context context = holder.itemView.getContext();
         final Activity activity = activities.get(position);
         holder.binding.date.setText(DateUtil.getRelativeDateTimeString(context, activity.getLastModified().getTime()));
@@ -78,14 +79,4 @@ public class CardActivityAdapter extends RecyclerView.Adapter<CardActivityAdapte
     public int getItemCount() {
         return activities.size();
     }
-
-    static class ActivitiesViewHolder extends RecyclerView.ViewHolder {
-        private ItemActivityBinding binding;
-
-        private ActivitiesViewHolder(ItemActivityBinding binding) {
-            super(binding.getRoot());
-            this.binding = binding;
-        }
-    }
-
 }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardActivityFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityFragment.java
index 984faefe3..146678034 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardActivityFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityFragment.java
@@ -1,4 +1,4 @@
-package it.niedermann.nextcloud.deck.ui.card;
+package it.niedermann.nextcloud.deck.ui.card.activities;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityViewHolder.java
new file mode 100644
index 000000000..322dc3648
--- /dev/null
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityViewHolder.java
@@ -0,0 +1,15 @@
+package it.niedermann.nextcloud.deck.ui.card.activities;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+import it.niedermann.nextcloud.deck.databinding.ItemActivityBinding;
+
+public class CardActivityViewHolder extends RecyclerView.ViewHolder {
+    public ItemActivityBinding binding;
+
+    @SuppressWarnings("WeakerAccess")
+    public CardActivityViewHolder(ItemActivityBinding binding) {
+        super(binding.getRoot());
+        this.binding = binding;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/AttachmentClickedListener.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/AttachmentClickedListener.java
new file mode 100644
index 000000000..cb7f22588
--- /dev/null
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/AttachmentClickedListener.java
@@ -0,0 +1,5 @@
+package it.niedermann.nextcloud.deck.ui.card.attachments;
+
+public interface AttachmentClickedListener {
+        void onAttachmentClicked(int position);
+    }
\ No newline at end of file
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/AttachmentDeletedListener.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/AttachmentDeletedListener.java
new file mode 100644
index 000000000..c236fa4c5
--- /dev/null
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/AttachmentDeletedListener.java
@@ -0,0 +1,7 @@
+package it.niedermann.nextcloud.deck.ui.card.attachments;
+
+import it.niedermann.nextcloud.deck.model.Attachment;
+
+public interface AttachmentDeletedListener {
+        void onAttachmentDeleted(Attachment attachment);
+    }
\ No newline at end of file
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/AttachmentViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/AttachmentViewHolder.java
new file mode 100644
index 000000000..2205138e2
--- /dev/null
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/AttachmentViewHolder.java
@@ -0,0 +1,17 @@
+package it.niedermann.nextcloud.deck.ui.card.attachments;
+
+import android.view.View;
+import android.widget.ImageView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+public abstract class AttachmentViewHolder extends RecyclerView.ViewHolder {
+    AttachmentViewHolder(@NonNull View itemView) {
+        super(itemView);
+    }
+
+    abstract protected ImageView getPreview();
+
+    abstract protected void setNotSyncedYetStatus(boolean synced);
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAttachmentAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentAdapter.java
index d71ede3e1..24de7eaae 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAttachmentAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentAdapter.java
@@ -1,4 +1,4 @@
-package it.niedermann.nextcloud.deck.ui.card;
+package it.niedermann.nextcloud.deck.ui.card.attachments;
 
 import android.app.Activity;
 import android.content.Context;
@@ -10,7 +10,6 @@ import android.view.LayoutInflater;
 import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -39,7 +38,8 @@ import static it.niedermann.nextcloud.deck.ui.card.CardAdapter.BUNDLE_KEY_LOCAL_
 import static it.niedermann.nextcloud.deck.ui.card.CardAdapter.NO_LOCAL_ID;
 import static it.niedermann.nextcloud.deck.util.ClipboardUtil.copyToClipboard;
 
-public class CardAttachmentAdapter extends RecyclerView.Adapter<CardAttachmentAdapter.AttachmentViewHolder> {
+@SuppressWarnings("WeakerAccess")
+public class CardAttachmentAdapter extends RecyclerView.Adapter<AttachmentViewHolder> {
 
     public static final int VIEW_TYPE_DEFAULT = 2;
     public static final int VIEW_TYPE_IMAGE = 1;
@@ -211,60 +211,4 @@ public class CardAttachmentAdapter extends RecyclerView.Adapter<CardAttachmentAd
             }
         }
     }
-
-    static abstract class AttachmentViewHolder extends RecyclerView.ViewHolder {
-        AttachmentViewHolder(@NonNull View itemView) {
-            super(itemView);
-        }
-
-        abstract protected ImageView getPreview();
-
-        abstract protected void setNotSyncedYetStatus(boolean synced);
-    }
-
-    static class DefaultAttachmentViewHolder extends AttachmentViewHolder {
-        ItemAttachmentDefaultBinding binding;
-
-        private DefaultAttachmentViewHolder(ItemAttachmentDefaultBinding binding) {
-            super(binding.getRoot());
-            this.binding = binding;
-        }
-
-        @Override
-        protected ImageView getPreview() {
-            return binding.preview;
-        }
-
-        @Override
-        protected void setNotSyncedYetStatus(boolean synced) {
-            binding.notSyncedYet.setVisibility(synced ? View.GONE : View.VISIBLE);
-        }
-    }
-
-    static class ImageAttachmentViewHolder extends AttachmentViewHolder {
-        private ItemAttachmentImageBinding binding;
-
-        private ImageAttachmentViewHolder(ItemAttachmentImageBinding binding) {
-            super(binding.getRoot());
-            this.binding = binding;
-        }
-
-        @Override
-        protected ImageView getPreview() {
-            return binding.preview;
-        }
-
-        @Override
-        protected void setNotSyncedYetStatus(boolean synced) {
-            binding.notSyncedYet.setVisibility(synced ? View.GONE : View.VISIBLE);
-        }
-    }
-
-    public interface AttachmentDeletedListener {
-        void onAttachmentDeleted(Attachment attachment);
-    }
-
-    public interface AttachmentClickedListener {
-        void onAttachmentClicked(int position);
-    }
 }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAttachmentsFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsFragment.java
index 692f91b63..1647bb91c 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAttachmentsFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsFragment.java
@@ -1,4 +1,4 @@
-package it.niedermann.nextcloud.deck.ui.card;
+package it.niedermann.nextcloud.deck.ui.card.attachments;
 
 import android.Manifest;
 import android.app.Activity;
@@ -37,10 +37,8 @@ import static it.niedermann.nextcloud.deck.ui.card.CardAdapter.BUNDLE_KEY_BOARD_
 import static it.niedermann.nextcloud.deck.ui.card.CardAdapter.BUNDLE_KEY_CAN_EDIT;
 import static it.niedermann.nextcloud.deck.ui.card.CardAdapter.BUNDLE_KEY_LOCAL_ID;
 import static it.niedermann.nextcloud.deck.ui.card.CardAdapter.NO_LOCAL_ID;
-import static it.niedermann.nextcloud.deck.ui.card.CardAttachmentAdapter.AttachmentClickedListener;
-import static it.niedermann.nextcloud.deck.ui.card.CardAttachmentAdapter.AttachmentDeletedListener;
-import static it.niedermann.nextcloud.deck.ui.card.CardAttachmentAdapter.VIEW_TYPE_DEFAULT;
-import static it.niedermann.nextcloud.deck.ui.card.CardAttachmentAdapter.VIEW_TYPE_IMAGE;
+import static it.niedermann.nextcloud.deck.ui.card.attachments.CardAttachmentAdapter.VIEW_TYPE_DEFAULT;
+import static it.niedermann.nextcloud.deck.ui.card.attachments.CardAttachmentAdapter.VIEW_TYPE_IMAGE;
 
 public class CardAttachmentsFragment extends Fragment implements AttachmentDeletedListener, AttachmentClickedListener {
     private FragmentCardEditTabAttachmentsBinding binding;
@@ -105,7 +103,7 @@ public class CardAttachmentsFragment extends Fragment implements AttachmentDelet
                     setExitSharedElementCallback(new SharedElementCallback() {
                         @Override
                         public void onMapSharedElements(List<String> names, Map<String, View> sharedElements) {
-                            CardAttachmentAdapter.AttachmentViewHolder selectedViewHolder = (CardAttachmentAdapter.AttachmentViewHolder) binding.attachmentsList
+                            AttachmentViewHolder selectedViewHolder = (AttachmentViewHolder) binding.attachmentsList
                                     .findViewHolderForAdapterPosition(clickedItemPosition);
                             if (selectedViewHolder != null) {
                                 sharedElements.put(names.get(0), selectedViewHolder.getPreview());
@@ -239,11 +237,6 @@ public class CardAttachmentsFragment extends Fragment implements AttachmentDelet
         this.clickedItemPosition = position;
     }
 
-    public interface NewCardAttachmentHandler {
-        void attachmentAdded(Attachment attachment);
-
-        void attachmentRemoved(Attachment attachment);
-    }
 
     private void updateEmptyContentView() {
         if (this.adapter == null || this.adapter.getItemCount() == 0) {
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/DefaultAttachmentViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/DefaultAttachmentViewHolder.java
new file mode 100644
index 000000000..70a06340a
--- /dev/null
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/DefaultAttachmentViewHolder.java
@@ -0,0 +1,26 @@
+package it.niedermann.nextcloud.deck.ui.card.attachments;
+
+import android.view.View;
+import android.widget.ImageView;
+
+import it.niedermann.nextcloud.deck.databinding.ItemAttachmentDefaultBinding;
+
+public class DefaultAttachmentViewHolder extends AttachmentViewHolder {
+    ItemAttachmentDefaultBinding binding;
+
+    @SuppressWarnings("WeakerAccess")
+    public DefaultAttachmentViewHolder(ItemAttachmentDefaultBinding binding) {
+        super(binding.getRoot());
+        this.binding = binding;
+    }
+
+    @Override
+    protected ImageView getPreview() {
+        return binding.preview;
+    }
+
+    @Override
+    protected void setNotSyncedYetStatus(boolean synced) {
+        binding.notSyncedYet.setVisibility(synced ? View.GONE : View.VISIBLE);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/ImageAttachmentViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/ImageAttachmentViewHolder.java
new file mode 100644
index 000000000..5e93a0be7
--- /dev/null
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/ImageAttachmentViewHolder.java
@@ -0,0 +1,26 @@
+package it.niedermann.nextcloud.deck.ui.card.attachments;
+
+import android.view.View;
+import android.widget.ImageView;
+
+import it.niedermann.nextcloud.deck.databinding.ItemAttachmentImageBinding;
+
+public class ImageAttachmentViewHolder extends AttachmentViewHolder {
+    private ItemAttachmentImageBinding binding;
+
+    @SuppressWarnings("WeakerAccess")
+    public ImageAttachmentViewHolder(ItemAttachmentImageBinding binding) {
+        super(binding.getRoot());
+        this.binding = binding;
+    }
+
+    @Override
+    protected ImageView getPreview() {
+        return binding.preview;
+    }
+
+    @Override
+    protected void setNotSyncedYetStatus(boolean synced) {
+        binding.notSyncedYet.setVisibility(synced ? View.GONE : View.VISIBLE);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/NewCardAttachmentHandler.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/NewCardAttachmentHandler.java
new file mode 100644
index 000000000..88c728691
--- /dev/null
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/NewCardAttachmentHandler.java
@@ -0,0 +1,9 @@
+package it.niedermann.nextcloud.deck.ui.card.attachments;
+
+import it.niedermann.nextcloud.deck.model.Attachment;
+
+public interface NewCardAttachmentHandler {
+    void attachmentAdded(Attachment attachment);
+
+    void attachmentRemoved(Attachment attachment);
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardDetailsFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/CardDetailsFragment.java
index b45fdd021..c967de267 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardDetailsFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/CardDetailsFragment.java
@@ -1,4 +1,4 @@
-package it.niedermann.nextcloud.deck.ui.card;
+package it.niedermann.nextcloud.deck.ui.card.details;
 
 import android.app.DatePickerDialog;
 import android.app.TimePickerDialog;
@@ -45,6 +45,8 @@ import it.niedermann.nextcloud.deck.model.Label;
 import it.niedermann.nextcloud.deck.model.User;
 import it.niedermann.nextcloud.deck.model.full.FullCard;
 import it.niedermann.nextcloud.deck.persistence.sync.SyncManager;
+import it.niedermann.nextcloud.deck.ui.card.LabelAutoCompleteAdapter;
+import it.niedermann.nextcloud.deck.ui.card.UserAutoCompleteAdapter;
 import it.niedermann.nextcloud.deck.util.ColorUtil;
 import it.niedermann.nextcloud.deck.util.DimensionUtil;
 import it.niedermann.nextcloud.deck.util.MarkDownUtil;
@@ -427,19 +429,4 @@ public class CardDetailsFragment extends Fragment implements DatePickerDialog.On
             binding.clearDueDate.setVisibility(View.VISIBLE);
         }
     }
-
-    public interface CardDetailsListener {
-
-        void onDescriptionChanged(String toString);
-
-        void onDueDateChanged(Date dueDate);
-
-        void onUserAdded(User user);
-
-        void onUserRemoved(User user);
-
-        void onLabelRemoved(Label label);
-
-        void onLabelAdded(Label createdLabel);
-    }
 }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/CardDetailsListener.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/CardDetailsListener.java
new file mode 100644
index 000000000..2efbab789
--- /dev/null
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/CardDetailsListener.java
@@ -0,0 +1,21 @@
+package it.niedermann.nextcloud.deck.ui.card.details;
+
+import java.util.Date;
+
+import it.niedermann.nextcloud.deck.model.Label;
+import it.niedermann.nextcloud.deck.model.User;
+
+public interface CardDetailsListener {
+
+    void onDescriptionChanged(String toString);
+
+    void onDueDateChanged(Date dueDate);
+
+    void onUserAdded(User user);
+
+    void onUserRemoved(User user);
+
+    void onLabelRemoved(Label label);
+
+    void onLabelAdded(Label createdLabel);
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/helper/dnd/CrossTabDragAndDrop.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/dnd/CrossTabDragAndDrop.java
index 3dc8d8cb8..9c50f3659 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/helper/dnd/CrossTabDragAndDrop.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/dnd/CrossTabDragAndDrop.java
@@ -1,4 +1,4 @@
-package it.niedermann.nextcloud.deck.ui.helper.dnd;
+package it.niedermann.nextcloud.deck.ui.dnd;
 
 import android.content.res.Resources;
 import android.util.Log;
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/helper/dnd/DragAndDropAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/dnd/DragAndDropAdapter.java
index 36d488892..5d8a036dd 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/helper/dnd/DragAndDropAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/dnd/DragAndDropAdapter.java
@@ -1,4 +1,4 @@
-package it.niedermann.nextcloud.deck.ui.helper.dnd;
+package it.niedermann.nextcloud.deck.ui.dnd;
 
 import java.util.List;
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/helper/dnd/DragAndDropModel.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/dnd/DragAndDropModel.java
index 18de52318..c4b0493c2 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/helper/dnd/DragAndDropModel.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/dnd/DragAndDropModel.java
@@ -1,4 +1,4 @@
-package it.niedermann.nextcloud.deck.ui.helper.dnd;
+package it.niedermann.nextcloud.deck.ui.dnd;
 
 import androidx.annotation.NonNull;
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/helper/dnd/DragAndDropTab.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/dnd/DragAndDropTab.java
index 35b82b29e..13633e02d 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/helper/dnd/DragAndDropTab.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/dnd/DragAndDropTab.java
@@ -1,4 +1,4 @@
-package it.niedermann.nextcloud.deck.ui.helper.dnd;
+package it.niedermann.nextcloud.deck.ui.dnd;
 
 import androidx.recyclerview.widget.RecyclerView;
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/helper/dnd/DragAndDropUtil.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/dnd/DragAndDropUtil.java
index ebe0c5771..0c861d17b 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/helper/dnd/DragAndDropUtil.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/dnd/DragAndDropUtil.java
@@ -1,4 +1,4 @@
-package it.niedermann.nextcloud.deck.ui.helper.dnd;
+package it.niedermann.nextcloud.deck.ui.dnd;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/helper/dnd/DraggedItemLocalState.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/dnd/DraggedItemLocalState.java
index e887f7d14..cd3ab58a3 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/helper/dnd/DraggedItemLocalState.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/dnd/DraggedItemLocalState.java
@@ -1,4 +1,4 @@
-package it.niedermann.nextcloud.deck.ui.helper.dnd;
+package it.niedermann.nextcloud.deck.ui.dnd;
 
 import android.view.View;
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/helper/dnd/ItemMovedByDragListener.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/dnd/ItemMovedByDragListener.java
index cf072d19d..8c00a1a26 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/helper/dnd/ItemMovedByDragListener.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/dnd/ItemMovedByDragListener.java
@@ -1,4 +1,4 @@
-package it.niedermann.nextcloud.deck.ui.helper.dnd;
+package it.niedermann.nextcloud.deck.ui.dnd;
 
 public interface ItemMovedByDragListener<ItemModel> {
     void onItemMoved(ItemModel movedItem, long tabId, int position);
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/helper/dnd/ScrollHelper.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/dnd/ScrollHelper.java
index e69aa5420..2fb52e733 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/helper/dnd/ScrollHelper.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/dnd/ScrollHelper.java
@@ -1,4 +1,4 @@
-package it.niedermann.nextcloud.deck.ui.helper.dnd;
+package it.niedermann.nextcloud.deck.ui.dnd;
 
 import android.os.Handler;
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/EditStackDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/EditStackDialogFragment.java
index 95f564f75..0992e0837 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/EditStackDialogFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/EditStackDialogFragment.java
@@ -92,10 +92,4 @@ public class EditStackDialogFragment extends DialogFragment {
 
         return dialog;
     }
-
-    public interface EditStackListener {
-        void onCreateStack(String title);
-
-        void onUpdateStack(long stackId, String title);
-    }
 }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/EditStackListener.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/EditStackListener.java
new file mode 100644
index 000000000..8615d7a85
--- /dev/null
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/EditStackListener.java
@@ -0,0 +1,7 @@
+package it.niedermann.nextcloud.deck.ui.stack;
+
+public interface EditStackListener {
+    void onCreateStack(String title);
+
+    void onUpdateStack(long stackId, String title);
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/OnScrollListener.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/OnScrollListener.java
new file mode 100644
index 000000000..edfe5e349
--- /dev/null
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/OnScrollListener.java
@@ -0,0 +1,7 @@
+package it.niedermann.nextcloud.deck.ui.stack;
+
+public interface OnScrollListener {
+    void onScrollUp();
+
+    void onScrollDown();
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/StackAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/StackAdapter.java
index 7913589f7..726613dbe 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/StackAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/StackAdapter.java
@@ -59,9 +59,4 @@ public class StackAdapter extends FragmentStateAdapter {
         this.canEdit = currentBoardHasEditPermission;
         notifyDataSetChanged();
     }
-
-    public void addStack(FullStack stack) {
-        this.stackList.add(stack);
-        notifyItemInserted(stackList.size() - 1);
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/StackFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/StackFragment.java
index be76603db..aa0a51229 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/StackFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/StackFragment.java
@@ -19,7 +19,7 @@ import it.niedermann.nextcloud.deck.model.full.FullCard;
 import it.niedermann.nextcloud.deck.persistence.sync.SyncManager;
 import it.niedermann.nextcloud.deck.ui.card.CardAdapter;
 import it.niedermann.nextcloud.deck.ui.card.CardAdapter.SelectCardListener;
-import it.niedermann.nextcloud.deck.ui.helper.dnd.DragAndDropTab;
+import it.niedermann.nextcloud.deck.ui.dnd.DragAndDropTab;
 
 public class StackFragment extends Fragment implements DragAndDropTab<CardAdapter> {
 
@@ -126,10 +126,4 @@ public class StackFragment extends Fragment implements DragAndDropTab<CardAdapte
     public RecyclerView getRecyclerView() {
         return binding.recyclerView;
     }
-
-    public interface OnScrollListener {
-        void onScrollUp();
-
-        void onScrollDown();
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/util/DrawerMenuUtil.java b/app/src/main/java/it/niedermann/nextcloud/deck/util/DrawerMenuUtil.java
index 07df87c4e..31b081e31 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/util/DrawerMenuUtil.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/util/DrawerMenuUtil.java
@@ -28,8 +28,8 @@ import it.niedermann.nextcloud.deck.DeckLog;
 import it.niedermann.nextcloud.deck.R;
 import it.niedermann.nextcloud.deck.model.Account;
 import it.niedermann.nextcloud.deck.model.Board;
-import it.niedermann.nextcloud.deck.ui.board.AccessControlDialogFragment;
 import it.niedermann.nextcloud.deck.ui.board.EditBoardDialogFragment;
+import it.niedermann.nextcloud.deck.ui.board.accesscontrol.AccessControlDialogFragment;
 
 public class DrawerMenuUtil {
     public static final int MENU_ID_ADD_ACCOUNT = -2;