diff --git a/app/src/main/java/com/itsaky/androidide/EditorActivity.java b/app/src/main/java/com/itsaky/androidide/EditorActivity.java
index 10df42e1e..fb39b5e6d 100755
--- a/app/src/main/java/com/itsaky/androidide/EditorActivity.java
+++ b/app/src/main/java/com/itsaky/androidide/EditorActivity.java
@@ -120,10 +120,10 @@ import com.itsaky.androidide.utils.RecursiveFileSearcher;
 import com.itsaky.androidide.utils.ResourceUtilsKt;
 import com.itsaky.androidide.utils.SingleSessionCallback;
 import com.itsaky.androidide.viewmodel.EditorViewModel;
-import com.itsaky.androidide.views.EditorBottomSheet;
-import com.itsaky.androidide.views.MaterialBanner;
-import com.itsaky.androidide.views.editor.CodeEditorView;
-import com.itsaky.androidide.views.editor.IDEEditor;
+import com.itsaky.androidide.ui.EditorBottomSheet;
+import com.itsaky.androidide.ui.MaterialBanner;
+import com.itsaky.androidide.ui.editor.CodeEditorView;
+import com.itsaky.androidide.ui.editor.IDEEditor;
 import com.itsaky.androidide.xml.resources.ResourceTableRegistry;
 import com.itsaky.androidide.xml.versions.ApiVersionsRegistry;
 import com.itsaky.androidide.xml.widgets.WidgetTableRegistry;
diff --git a/app/src/main/java/com/itsaky/androidide/TerminalActivity.java b/app/src/main/java/com/itsaky/androidide/TerminalActivity.java
index 4e154e884..b3dcd67c0 100755
--- a/app/src/main/java/com/itsaky/androidide/TerminalActivity.java
+++ b/app/src/main/java/com/itsaky/androidide/TerminalActivity.java
@@ -46,11 +46,11 @@ import com.itsaky.androidide.preferences.internal.GeneralPreferencesKt;
 import com.itsaky.androidide.utils.BootstrapInstaller;
 import com.itsaky.androidide.utils.ILogger;
 import com.itsaky.androidide.utils.TypefaceUtilsKt;
-import com.itsaky.androidide.views.virtualkeys.SpecialButton;
-import com.itsaky.androidide.views.virtualkeys.VirtualKeyButton;
-import com.itsaky.androidide.views.virtualkeys.VirtualKeysConstants;
-import com.itsaky.androidide.views.virtualkeys.VirtualKeysInfo;
-import com.itsaky.androidide.views.virtualkeys.VirtualKeysView;
+import com.itsaky.androidide.ui.virtualkeys.SpecialButton;
+import com.itsaky.androidide.ui.virtualkeys.VirtualKeyButton;
+import com.itsaky.androidide.ui.virtualkeys.VirtualKeysConstants;
+import com.itsaky.androidide.ui.virtualkeys.VirtualKeysInfo;
+import com.itsaky.androidide.ui.virtualkeys.VirtualKeysView;
 import com.itsaky.terminal.TerminalEmulator;
 import com.itsaky.terminal.TerminalSession;
 import com.itsaky.terminal.TerminalSessionClient;
diff --git a/app/src/main/java/com/itsaky/androidide/actions/BaseEditorAction.kt b/app/src/main/java/com/itsaky/androidide/actions/BaseEditorAction.kt
index d0277e3e5..38e3e929d 100644
--- a/app/src/main/java/com/itsaky/androidide/actions/BaseEditorAction.kt
+++ b/app/src/main/java/com/itsaky/androidide/actions/BaseEditorAction.kt
@@ -20,7 +20,7 @@ package com.itsaky.androidide.actions
 import android.content.Context
 import android.graphics.drawable.Drawable
 import androidx.core.content.ContextCompat
-import com.itsaky.androidide.views.editor.IDEEditor
+import com.itsaky.androidide.ui.editor.IDEEditor
 
 /** @author Akash Yadav */
 abstract class BaseEditorAction : EditorActionItem {
diff --git a/app/src/main/java/com/itsaky/androidide/actions/EditorRelatedAction.kt b/app/src/main/java/com/itsaky/androidide/actions/EditorRelatedAction.kt
index 676138cd5..aa84e217e 100644
--- a/app/src/main/java/com/itsaky/androidide/actions/EditorRelatedAction.kt
+++ b/app/src/main/java/com/itsaky/androidide/actions/EditorRelatedAction.kt
@@ -17,8 +17,8 @@
 
 package com.itsaky.androidide.actions
 
-import com.itsaky.androidide.views.editor.CodeEditorView
-import com.itsaky.androidide.views.editor.IDEEditor
+import com.itsaky.androidide.ui.editor.CodeEditorView
+import com.itsaky.androidide.ui.editor.IDEEditor
 
 /** @author Akash Yadav */
 abstract class EditorRelatedAction : EditorActivityAction(), EditorActionItem {
diff --git a/app/src/main/java/com/itsaky/androidide/adapters/SymbolInputAdapter.java b/app/src/main/java/com/itsaky/androidide/adapters/SymbolInputAdapter.java
index 6cba51860..14be9d489 100755
--- a/app/src/main/java/com/itsaky/androidide/adapters/SymbolInputAdapter.java
+++ b/app/src/main/java/com/itsaky/androidide/adapters/SymbolInputAdapter.java
@@ -28,9 +28,8 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.itsaky.androidide.R;
 import com.itsaky.androidide.databinding.LayoutSymbolItemBinding;
-import com.itsaky.androidide.utils.ResourceUtilsKt;
-import com.itsaky.androidide.views.SymbolInputView.Symbol;
-import com.itsaky.androidide.views.editor.IDEEditor;
+import com.itsaky.androidide.ui.SymbolInputView.Symbol;
+import com.itsaky.androidide.ui.editor.IDEEditor;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/com/itsaky/androidide/fragments/DiagnosticsListFragment.java b/app/src/main/java/com/itsaky/androidide/fragments/DiagnosticsListFragment.java
index 970560321..2b91acd8a 100644
--- a/app/src/main/java/com/itsaky/androidide/fragments/DiagnosticsListFragment.java
+++ b/app/src/main/java/com/itsaky/androidide/fragments/DiagnosticsListFragment.java
@@ -30,7 +30,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.itsaky.androidide.adapters.DiagnosticsAdapter;
-import com.itsaky.androidide.views.EmptyView;
+import com.itsaky.androidide.ui.EmptyView;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/com/itsaky/androidide/fragments/NonEditableEditorFragment.java b/app/src/main/java/com/itsaky/androidide/fragments/NonEditableEditorFragment.java
index 8a7c93491..e913de9ab 100644
--- a/app/src/main/java/com/itsaky/androidide/fragments/NonEditableEditorFragment.java
+++ b/app/src/main/java/com/itsaky/androidide/fragments/NonEditableEditorFragment.java
@@ -28,9 +28,8 @@ import androidx.fragment.app.Fragment;
 
 import com.itsaky.androidide.databinding.FragmentNonEditableEditorBinding;
 import com.itsaky.androidide.syntax.colorschemes.SchemeAndroidIDE;
-import com.itsaky.androidide.utils.ILogger;
 import com.itsaky.androidide.utils.TypefaceUtilsKt;
-import com.itsaky.androidide.views.editor.IDEEditor;
+import com.itsaky.androidide.ui.editor.IDEEditor;
 
 import io.github.rosemoe.sora.lang.EmptyLanguage;
 
diff --git a/app/src/main/java/com/itsaky/androidide/fragments/SearchResultFragment.java b/app/src/main/java/com/itsaky/androidide/fragments/SearchResultFragment.java
index 1f5bbff0e..e4bfffa2b 100644
--- a/app/src/main/java/com/itsaky/androidide/fragments/SearchResultFragment.java
+++ b/app/src/main/java/com/itsaky/androidide/fragments/SearchResultFragment.java
@@ -30,7 +30,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.itsaky.androidide.adapters.SearchListAdapter;
-import com.itsaky.androidide.views.EmptyView;
+import com.itsaky.androidide.ui.EmptyView;
 
 import java.util.Collections;
 
diff --git a/app/src/main/java/com/itsaky/androidide/fragments/sheets/TextSheetFragment.java b/app/src/main/java/com/itsaky/androidide/fragments/sheets/TextSheetFragment.java
index f509e7f63..c90358022 100755
--- a/app/src/main/java/com/itsaky/androidide/fragments/sheets/TextSheetFragment.java
+++ b/app/src/main/java/com/itsaky/androidide/fragments/sheets/TextSheetFragment.java
@@ -27,7 +27,7 @@ import androidx.annotation.NonNull;
 
 import com.itsaky.androidide.resources.R;
 import com.itsaky.androidide.utils.TypefaceUtilsKt;
-import com.itsaky.androidide.views.editor.IDEEditor;
+import com.itsaky.androidide.ui.editor.IDEEditor;
 
 import io.github.rosemoe.sora.lang.EmptyLanguage;
 
diff --git a/app/src/main/java/com/itsaky/androidide/language/IDELanguage.java b/app/src/main/java/com/itsaky/androidide/language/IDELanguage.java
index 6091f7b22..3ee6012d3 100644
--- a/app/src/main/java/com/itsaky/androidide/language/IDELanguage.java
+++ b/app/src/main/java/com/itsaky/androidide/language/IDELanguage.java
@@ -25,7 +25,7 @@ import com.itsaky.androidide.lsp.api.ICompletionCancelChecker;
 import com.itsaky.androidide.lsp.api.ILanguageServer;
 import com.itsaky.androidide.preferences.internal.EditorPreferencesKt;
 import com.itsaky.androidide.utils.ILogger;
-import com.itsaky.androidide.views.editor.IDEEditor;
+import com.itsaky.androidide.ui.editor.IDEEditor;
 
 import java.nio.file.Paths;
 import java.util.ArrayList;
diff --git a/app/src/main/java/com/itsaky/androidide/lsp/IDELanguageClientImpl.java b/app/src/main/java/com/itsaky/androidide/lsp/IDELanguageClientImpl.java
index 2a9fd3dd1..ffbedfbfa 100755
--- a/app/src/main/java/com/itsaky/androidide/lsp/IDELanguageClientImpl.java
+++ b/app/src/main/java/com/itsaky/androidide/lsp/IDELanguageClientImpl.java
@@ -34,7 +34,6 @@ import com.itsaky.androidide.fragments.sheets.ProgressSheet;
 import com.itsaky.androidide.interfaces.EditorActivityProvider;
 import com.itsaky.androidide.lsp.api.ILanguageClient;
 import com.itsaky.androidide.lsp.models.CodeActionItem;
-import com.itsaky.androidide.lsp.models.Command;
 import com.itsaky.androidide.lsp.models.DiagnosticItem;
 import com.itsaky.androidide.lsp.models.DiagnosticResult;
 import com.itsaky.androidide.lsp.models.ShowDocumentParams;
@@ -48,8 +47,8 @@ import com.itsaky.androidide.models.SearchResult;
 import com.itsaky.androidide.tasks.TaskExecutor;
 import com.itsaky.androidide.utils.ILogger;
 import com.itsaky.androidide.utils.LSPUtils;
-import com.itsaky.androidide.views.editor.CodeEditorView;
-import com.itsaky.androidide.views.editor.IDEEditor;
+import com.itsaky.androidide.ui.editor.CodeEditorView;
+import com.itsaky.androidide.ui.editor.IDEEditor;
 import com.itsaky.toaster.ToastUtilsKt;
 import com.itsaky.toaster.Toaster;
 
diff --git a/app/src/main/java/com/itsaky/androidide/views/EditorBottomSheet.kt b/app/src/main/java/com/itsaky/androidide/ui/EditorBottomSheet.kt
similarity index 98%
rename from app/src/main/java/com/itsaky/androidide/views/EditorBottomSheet.kt
rename to app/src/main/java/com/itsaky/androidide/ui/EditorBottomSheet.kt
index 6b84370ba..3a9003735 100644
--- a/app/src/main/java/com/itsaky/androidide/views/EditorBottomSheet.kt
+++ b/app/src/main/java/com/itsaky/androidide/ui/EditorBottomSheet.kt
@@ -15,7 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.itsaky.androidide.views
+package com.itsaky.androidide.ui
 
 import android.app.Activity
 import android.app.ProgressDialog
@@ -30,7 +30,6 @@ import android.widget.RelativeLayout
 import androidx.annotation.GravityInt
 import androidx.appcompat.widget.TooltipCompat
 import androidx.core.view.updateLayoutParams
-import androidx.core.view.updateMargins
 import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
@@ -58,7 +57,7 @@ import com.itsaky.androidide.tasks.TaskExecutor.executeAsyncProvideError
 import com.itsaky.androidide.utils.ILogger
 import com.itsaky.androidide.utils.IntentUtils.shareFile
 import com.itsaky.androidide.utils.Symbols.forFile
-import com.itsaky.androidide.views.editor.CodeEditorView
+import com.itsaky.androidide.ui.editor.CodeEditorView
 import com.itsaky.toaster.Toaster.Type.ERROR
 import com.itsaky.toaster.toast
 import java.io.File
diff --git a/app/src/main/java/com/itsaky/androidide/views/EmptyView.java b/app/src/main/java/com/itsaky/androidide/ui/EmptyView.java
similarity index 98%
rename from app/src/main/java/com/itsaky/androidide/views/EmptyView.java
rename to app/src/main/java/com/itsaky/androidide/ui/EmptyView.java
index 17628350b..f7a6a22dc 100755
--- a/app/src/main/java/com/itsaky/androidide/views/EmptyView.java
+++ b/app/src/main/java/com/itsaky/androidide/ui/EmptyView.java
@@ -18,7 +18,7 @@
  *
  **************************************************************************************/
 
-package com.itsaky.androidide.views;
+package com.itsaky.androidide.ui;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/app/src/main/java/com/itsaky/androidide/views/MaterialBanner.java b/app/src/main/java/com/itsaky/androidide/ui/MaterialBanner.java
similarity index 99%
rename from app/src/main/java/com/itsaky/androidide/views/MaterialBanner.java
rename to app/src/main/java/com/itsaky/androidide/ui/MaterialBanner.java
index d71c70101..da32b0aea 100755
--- a/app/src/main/java/com/itsaky/androidide/views/MaterialBanner.java
+++ b/app/src/main/java/com/itsaky/androidide/ui/MaterialBanner.java
@@ -18,7 +18,7 @@
  *
  **************************************************************************************/
 
-package com.itsaky.androidide.views;
+package com.itsaky.androidide.ui;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
diff --git a/app/src/main/java/com/itsaky/androidide/views/ScalableTabLayout.kt b/app/src/main/java/com/itsaky/androidide/ui/ScalableTabLayout.kt
similarity index 96%
rename from app/src/main/java/com/itsaky/androidide/views/ScalableTabLayout.kt
rename to app/src/main/java/com/itsaky/androidide/ui/ScalableTabLayout.kt
index f9a2e2e3c..6f5a339f4 100644
--- a/app/src/main/java/com/itsaky/androidide/views/ScalableTabLayout.kt
+++ b/app/src/main/java/com/itsaky/androidide/ui/ScalableTabLayout.kt
@@ -1,4 +1,4 @@
-package com.itsaky.androidide.views
+package com.itsaky.androidide.ui
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/app/src/main/java/com/itsaky/androidide/views/SymbolInputView.java b/app/src/main/java/com/itsaky/androidide/ui/SymbolInputView.java
similarity index 96%
rename from app/src/main/java/com/itsaky/androidide/views/SymbolInputView.java
rename to app/src/main/java/com/itsaky/androidide/ui/SymbolInputView.java
index 30911da7f..6c336f834 100755
--- a/app/src/main/java/com/itsaky/androidide/views/SymbolInputView.java
+++ b/app/src/main/java/com/itsaky/androidide/ui/SymbolInputView.java
@@ -15,7 +15,7 @@
  * along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-package com.itsaky.androidide.views;
+package com.itsaky.androidide.ui;
 
 import static com.itsaky.androidide.utils.ResourceUtilsKt.resolveAttr;
 
@@ -27,7 +27,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.itsaky.androidide.R;
 import com.itsaky.androidide.adapters.SymbolInputAdapter;
-import com.itsaky.androidide.views.editor.IDEEditor;
+import com.itsaky.androidide.ui.editor.IDEEditor;
 
 public class SymbolInputView extends RecyclerView {
 
diff --git a/app/src/main/java/com/itsaky/androidide/views/editor/AbstractPopupWindow.kt b/app/src/main/java/com/itsaky/androidide/ui/editor/AbstractPopupWindow.kt
similarity index 96%
rename from app/src/main/java/com/itsaky/androidide/views/editor/AbstractPopupWindow.kt
rename to app/src/main/java/com/itsaky/androidide/ui/editor/AbstractPopupWindow.kt
index 8333c49ce..4ab431473 100644
--- a/app/src/main/java/com/itsaky/androidide/views/editor/AbstractPopupWindow.kt
+++ b/app/src/main/java/com/itsaky/androidide/ui/editor/AbstractPopupWindow.kt
@@ -15,7 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.itsaky.androidide.views.editor
+package com.itsaky.androidide.ui.editor
 
 import io.github.rosemoe.sora.widget.CodeEditor
 import io.github.rosemoe.sora.widget.base.EditorPopupWindow
diff --git a/app/src/main/java/com/itsaky/androidide/views/editor/BaseEditorWindow.java b/app/src/main/java/com/itsaky/androidide/ui/editor/BaseEditorWindow.java
similarity index 98%
rename from app/src/main/java/com/itsaky/androidide/views/editor/BaseEditorWindow.java
rename to app/src/main/java/com/itsaky/androidide/ui/editor/BaseEditorWindow.java
index de58700b9..830ee49dc 100644
--- a/app/src/main/java/com/itsaky/androidide/views/editor/BaseEditorWindow.java
+++ b/app/src/main/java/com/itsaky/androidide/ui/editor/BaseEditorWindow.java
@@ -15,7 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.itsaky.androidide.views.editor;
+package com.itsaky.androidide.ui.editor;
 
 import static android.view.View.MeasureSpec.AT_MOST;
 import static android.view.View.MeasureSpec.makeMeasureSpec;
diff --git a/app/src/main/java/com/itsaky/androidide/views/editor/CodeEditorView.java b/app/src/main/java/com/itsaky/androidide/ui/editor/CodeEditorView.java
similarity index 99%
rename from app/src/main/java/com/itsaky/androidide/views/editor/CodeEditorView.java
rename to app/src/main/java/com/itsaky/androidide/ui/editor/CodeEditorView.java
index 70a1e5ce1..280222d09 100644
--- a/app/src/main/java/com/itsaky/androidide/views/editor/CodeEditorView.java
+++ b/app/src/main/java/com/itsaky/androidide/ui/editor/CodeEditorView.java
@@ -14,7 +14,7 @@
  *  You should have received a copy of the GNU General Public License
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.itsaky.androidide.views.editor;
+package com.itsaky.androidide.ui.editor;
 
 import static com.itsaky.androidide.preferences.internal.EditorPreferencesKt.FLAG_LINE_BREAK;
 import static com.itsaky.androidide.preferences.internal.EditorPreferencesKt.FLAG_PASSWORD;
diff --git a/app/src/main/java/com/itsaky/androidide/views/editor/DiagnosticWindow.kt b/app/src/main/java/com/itsaky/androidide/ui/editor/DiagnosticWindow.kt
similarity index 97%
rename from app/src/main/java/com/itsaky/androidide/views/editor/DiagnosticWindow.kt
rename to app/src/main/java/com/itsaky/androidide/ui/editor/DiagnosticWindow.kt
index ceaa283da..2be9a65f3 100644
--- a/app/src/main/java/com/itsaky/androidide/views/editor/DiagnosticWindow.kt
+++ b/app/src/main/java/com/itsaky/androidide/ui/editor/DiagnosticWindow.kt
@@ -14,7 +14,7 @@
  *  You should have received a copy of the GNU General Public License
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.itsaky.androidide.views.editor
+package com.itsaky.androidide.ui.editor
 
 import com.itsaky.androidide.lsp.models.DiagnosticItem
 
diff --git a/app/src/main/java/com/itsaky/androidide/views/editor/EditorActionsMenu.kt b/app/src/main/java/com/itsaky/androidide/ui/editor/EditorActionsMenu.kt
similarity index 96%
rename from app/src/main/java/com/itsaky/androidide/views/editor/EditorActionsMenu.kt
rename to app/src/main/java/com/itsaky/androidide/ui/editor/EditorActionsMenu.kt
index eb83d3cbc..fb08b241d 100644
--- a/app/src/main/java/com/itsaky/androidide/views/editor/EditorActionsMenu.kt
+++ b/app/src/main/java/com/itsaky/androidide/ui/editor/EditorActionsMenu.kt
@@ -15,7 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.itsaky.androidide.views.editor
+package com.itsaky.androidide.ui.editor
 
 import android.annotation.SuppressLint
 import android.content.Context
diff --git a/app/src/main/java/com/itsaky/androidide/views/editor/EditorCompletionWindow.kt b/app/src/main/java/com/itsaky/androidide/ui/editor/EditorCompletionWindow.kt
similarity index 99%
rename from app/src/main/java/com/itsaky/androidide/views/editor/EditorCompletionWindow.kt
rename to app/src/main/java/com/itsaky/androidide/ui/editor/EditorCompletionWindow.kt
index fdf239a79..39e985847 100644
--- a/app/src/main/java/com/itsaky/androidide/views/editor/EditorCompletionWindow.kt
+++ b/app/src/main/java/com/itsaky/androidide/ui/editor/EditorCompletionWindow.kt
@@ -15,7 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.itsaky.androidide.views.editor
+package com.itsaky.androidide.ui.editor
 
 import android.content.Intent
 import android.net.Uri
diff --git a/app/src/main/java/com/itsaky/androidide/views/editor/EditorSearchLayout.kt b/app/src/main/java/com/itsaky/androidide/ui/editor/EditorSearchLayout.kt
similarity index 97%
rename from app/src/main/java/com/itsaky/androidide/views/editor/EditorSearchLayout.kt
rename to app/src/main/java/com/itsaky/androidide/ui/editor/EditorSearchLayout.kt
index 8cc32606e..4b1ddfb71 100644
--- a/app/src/main/java/com/itsaky/androidide/views/editor/EditorSearchLayout.kt
+++ b/app/src/main/java/com/itsaky/androidide/ui/editor/EditorSearchLayout.kt
@@ -15,7 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.itsaky.androidide.views.editor
+package com.itsaky.androidide.ui.editor
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -30,7 +30,7 @@ import android.widget.PopupMenu
 import com.itsaky.androidide.resources.R
 import com.itsaky.androidide.databinding.LayoutFindInFileBinding
 import com.itsaky.androidide.utils.SingleTextWatcher
-import com.itsaky.androidide.views.editor.ReplaceAction.doReplace
+import com.itsaky.androidide.ui.editor.ReplaceAction.doReplace
 import io.github.rosemoe.sora.widget.EditorSearcher.SearchOptions
 import java.util.regex.Pattern
 
diff --git a/app/src/main/java/com/itsaky/androidide/views/editor/IDEEditor.java b/app/src/main/java/com/itsaky/androidide/ui/editor/IDEEditor.java
similarity index 96%
rename from app/src/main/java/com/itsaky/androidide/views/editor/IDEEditor.java
rename to app/src/main/java/com/itsaky/androidide/ui/editor/IDEEditor.java
index 8a67dbd9d..c8797a7bf 100644
--- a/app/src/main/java/com/itsaky/androidide/views/editor/IDEEditor.java
+++ b/app/src/main/java/com/itsaky/androidide/ui/editor/IDEEditor.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.itsaky.androidide.views.editor;
+package com.itsaky.androidide.ui.editor;
 
 import static com.itsaky.androidide.preferences.internal.EditorPreferencesKt.getVisiblePasswordFlag;
 import static com.itsaky.androidide.resources.R.string;
diff --git a/app/src/main/java/com/itsaky/androidide/views/editor/ReplaceAction.kt b/app/src/main/java/com/itsaky/androidide/ui/editor/ReplaceAction.kt
similarity index 98%
rename from app/src/main/java/com/itsaky/androidide/views/editor/ReplaceAction.kt
rename to app/src/main/java/com/itsaky/androidide/ui/editor/ReplaceAction.kt
index 81a031a80..4a1aa74bd 100644
--- a/app/src/main/java/com/itsaky/androidide/views/editor/ReplaceAction.kt
+++ b/app/src/main/java/com/itsaky/androidide/ui/editor/ReplaceAction.kt
@@ -15,7 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.itsaky.androidide.views.editor
+package com.itsaky.androidide.ui.editor
 
 import android.view.LayoutInflater
 import com.itsaky.androidide.resources.R
diff --git a/app/src/main/java/com/itsaky/androidide/views/editor/SignatureHelpWindow.java b/app/src/main/java/com/itsaky/androidide/ui/editor/SignatureHelpWindow.java
similarity index 99%
rename from app/src/main/java/com/itsaky/androidide/views/editor/SignatureHelpWindow.java
rename to app/src/main/java/com/itsaky/androidide/ui/editor/SignatureHelpWindow.java
index cb202a85d..858943a59 100644
--- a/app/src/main/java/com/itsaky/androidide/views/editor/SignatureHelpWindow.java
+++ b/app/src/main/java/com/itsaky/androidide/ui/editor/SignatureHelpWindow.java
@@ -15,7 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.itsaky.androidide.views.editor;
+package com.itsaky.androidide.ui.editor;
 
 import android.text.SpannableStringBuilder;
 import android.text.style.BackgroundColorSpan;
diff --git a/app/src/main/java/com/itsaky/androidide/views/transition/ArcMotionPlus.java b/app/src/main/java/com/itsaky/androidide/ui/transition/ArcMotionPlus.java
similarity index 98%
rename from app/src/main/java/com/itsaky/androidide/views/transition/ArcMotionPlus.java
rename to app/src/main/java/com/itsaky/androidide/ui/transition/ArcMotionPlus.java
index 80ca304c9..f5a55991c 100755
--- a/app/src/main/java/com/itsaky/androidide/views/transition/ArcMotionPlus.java
+++ b/app/src/main/java/com/itsaky/androidide/ui/transition/ArcMotionPlus.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.itsaky.androidide.views.transition;
+package com.itsaky.androidide.ui.transition;
 
 /**
  * A PathMotion that generates a curved path along an arc on an imaginary circle containing the two
diff --git a/app/src/main/java/com/itsaky/androidide/views/transition/CubicBezierArc.java b/app/src/main/java/com/itsaky/androidide/ui/transition/CubicBezierArc.java
similarity index 99%
rename from app/src/main/java/com/itsaky/androidide/views/transition/CubicBezierArc.java
rename to app/src/main/java/com/itsaky/androidide/ui/transition/CubicBezierArc.java
index d2f3a3a81..b89856be5 100755
--- a/app/src/main/java/com/itsaky/androidide/views/transition/CubicBezierArc.java
+++ b/app/src/main/java/com/itsaky/androidide/ui/transition/CubicBezierArc.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.itsaky.androidide.views.transition;
+package com.itsaky.androidide.ui.transition;
 
 /**
  * A Class that takes an angle, start point and end point that it uses to calculate controls points
diff --git a/app/src/main/java/com/itsaky/androidide/views/transition/ProgressTransition.java b/app/src/main/java/com/itsaky/androidide/ui/transition/ProgressTransition.java
similarity index 98%
rename from app/src/main/java/com/itsaky/androidide/views/transition/ProgressTransition.java
rename to app/src/main/java/com/itsaky/androidide/ui/transition/ProgressTransition.java
index 3890bbde7..b02f11ff4 100755
--- a/app/src/main/java/com/itsaky/androidide/views/transition/ProgressTransition.java
+++ b/app/src/main/java/com/itsaky/androidide/ui/transition/ProgressTransition.java
@@ -15,7 +15,7 @@
  * along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  *
  **************************************************************************************/
-package com.itsaky.androidide.views.transition;
+package com.itsaky.androidide.ui.transition;
 
 import android.animation.Animator;
 import android.animation.ObjectAnimator;
diff --git a/app/src/main/java/com/itsaky/androidide/utils/Symbols.kt b/app/src/main/java/com/itsaky/androidide/utils/Symbols.kt
index daf32aa34..c2b8d440a 100755
--- a/app/src/main/java/com/itsaky/androidide/utils/Symbols.kt
+++ b/app/src/main/java/com/itsaky/androidide/utils/Symbols.kt
@@ -19,7 +19,7 @@ package com.itsaky.androidide.utils
 
 import com.itsaky.androidide.preferences.internal.tabSize
 import com.itsaky.androidide.preferences.internal.useSoftTab
-import com.itsaky.androidide.views.SymbolInputView.Symbol
+import com.itsaky.androidide.ui.SymbolInputView.Symbol
 import java.io.File
 
 object Symbols {
diff --git a/app/src/main/java/io/github/rosemoe/sora/widget/IDEEditorSearcher.kt b/app/src/main/java/io/github/rosemoe/sora/widget/IDEEditorSearcher.kt
index 415a5906d..f7d283962 100644
--- a/app/src/main/java/io/github/rosemoe/sora/widget/IDEEditorSearcher.kt
+++ b/app/src/main/java/io/github/rosemoe/sora/widget/IDEEditorSearcher.kt
@@ -23,7 +23,7 @@ import android.app.ProgressDialog
 import android.widget.Toast
 import com.itsaky.androidide.resources.R.string
 import com.itsaky.androidide.utils.ILogger
-import com.itsaky.androidide.views.editor.IDEEditor
+import com.itsaky.androidide.ui.editor.IDEEditor
 import io.github.rosemoe.sora.text.TextUtils
 import io.github.rosemoe.sora.util.IntPair
 import java.util.concurrent.CompletableFuture
diff --git a/app/src/main/res/layout/activity_editor.xml b/app/src/main/res/layout/activity_editor.xml
index 2eec47af7..7879fc48f 100755
--- a/app/src/main/res/layout/activity_editor.xml
+++ b/app/src/main/res/layout/activity_editor.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.itsaky.androidide.views.ContentTranslatingDrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.itsaky.androidide.ui.ContentTranslatingDrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
   android:id="@+id/editor_drawerLayout"
@@ -32,7 +32,7 @@
         android:layout_height="wrap_content"
         android:indeterminate="true" />
 
-      <com.itsaky.androidide.views.MaterialBanner
+      <com.itsaky.androidide.ui.MaterialBanner
         android:id="@+id/syncBanner"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -98,7 +98,7 @@
 
     </ViewFlipper>
 
-    <com.itsaky.androidide.views.EditorBottomSheet
+    <com.itsaky.androidide.ui.EditorBottomSheet
       android:id="@+id/bottom_sheet"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
@@ -137,4 +137,4 @@
 
   </com.google.android.material.navigation.NavigationView>
 
-</com.itsaky.androidide.views.ContentTranslatingDrawerLayout>
+</com.itsaky.androidide.ui.ContentTranslatingDrawerLayout>
diff --git a/app/src/main/res/layout/activity_terminal.xml b/app/src/main/res/layout/activity_terminal.xml
index c1eaa6685..42f2fc7d4 100755
--- a/app/src/main/res/layout/activity_terminal.xml
+++ b/app/src/main/res/layout/activity_terminal.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.itsaky.androidide.views.virtualkeys.VirtualKeysView
+    <com.itsaky.androidide.ui.virtualkeys.VirtualKeysView
         android:id="@+id/virtual_key_table"
         android:layout_width="match_parent"
         android:layout_height="75dp"
diff --git a/app/src/main/res/layout/fragment_log.xml b/app/src/main/res/layout/fragment_log.xml
index 7e9034721..ecbe5b89f 100644
--- a/app/src/main/res/layout/fragment_log.xml
+++ b/app/src/main/res/layout/fragment_log.xml
@@ -14,7 +14,7 @@
   ~  You should have received a copy of the GNU General Public License
   ~   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
   -->
-<com.itsaky.androidide.views.editor.IDEEditor xmlns:android="http://schemas.android.com/apk/res/android"
+<com.itsaky.androidide.ui.editor.IDEEditor xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/editor"
     android:layout_width="match_parent"
     android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_non_editable_editor.xml b/app/src/main/res/layout/fragment_non_editable_editor.xml
index ab606d7ff..0c25b799d 100644
--- a/app/src/main/res/layout/fragment_non_editable_editor.xml
+++ b/app/src/main/res/layout/fragment_non_editable_editor.xml
@@ -15,7 +15,7 @@
   ~   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
   -->
 
-<com.itsaky.androidide.views.editor.IDEEditor xmlns:android="http://schemas.android.com/apk/res/android"
+<com.itsaky.androidide.ui.editor.IDEEditor xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/editor"
     android:layout_width="match_parent"
     android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_code_editor.xml b/app/src/main/res/layout/layout_code_editor.xml
index b3b67f66a..f28189625 100644
--- a/app/src/main/res/layout/layout_code_editor.xml
+++ b/app/src/main/res/layout/layout_code_editor.xml
@@ -4,7 +4,7 @@
   android:layout_height="match_parent"
   android:orientation="vertical">
 
-  <com.itsaky.androidide.views.editor.IDEEditor
+  <com.itsaky.androidide.ui.editor.IDEEditor
     android:id="@+id/editor"
     android:layout_width="match_parent"
     android:layout_height="0dp"
diff --git a/common/src/main/java/com/itsaky/androidide/views/ContentTranslatingDrawerLayout.kt b/common/src/main/java/com/itsaky/androidide/ui/ContentTranslatingDrawerLayout.kt
similarity index 98%
rename from common/src/main/java/com/itsaky/androidide/views/ContentTranslatingDrawerLayout.kt
rename to common/src/main/java/com/itsaky/androidide/ui/ContentTranslatingDrawerLayout.kt
index 5303553c2..99e906bb1 100644
--- a/common/src/main/java/com/itsaky/androidide/views/ContentTranslatingDrawerLayout.kt
+++ b/common/src/main/java/com/itsaky/androidide/ui/ContentTranslatingDrawerLayout.kt
@@ -15,7 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.itsaky.androidide.views
+package com.itsaky.androidide.ui
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/common/src/main/java/com/itsaky/androidide/views/InterceptableDrawerLayout.kt b/common/src/main/java/com/itsaky/androidide/ui/InterceptableDrawerLayout.kt
similarity index 98%
rename from common/src/main/java/com/itsaky/androidide/views/InterceptableDrawerLayout.kt
rename to common/src/main/java/com/itsaky/androidide/ui/InterceptableDrawerLayout.kt
index 9a76767d0..739cc2511 100644
--- a/common/src/main/java/com/itsaky/androidide/views/InterceptableDrawerLayout.kt
+++ b/common/src/main/java/com/itsaky/androidide/ui/InterceptableDrawerLayout.kt
@@ -15,7 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.itsaky.androidide.views
+package com.itsaky.androidide.ui
 
 import android.content.Context
 import android.graphics.Rect
diff --git a/emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/SpecialButton.java b/emulatorview/src/main/java/com/itsaky/androidide/ui/virtualkeys/SpecialButton.java
similarity index 96%
rename from emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/SpecialButton.java
rename to emulatorview/src/main/java/com/itsaky/androidide/ui/virtualkeys/SpecialButton.java
index 97cf4438e..024d41d8b 100755
--- a/emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/SpecialButton.java
+++ b/emulatorview/src/main/java/com/itsaky/androidide/ui/virtualkeys/SpecialButton.java
@@ -1,4 +1,4 @@
-package com.itsaky.androidide.views.virtualkeys;
+package com.itsaky.androidide.ui.virtualkeys;
 
 import androidx.annotation.NonNull;
 
diff --git a/emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/SpecialButtonState.java b/emulatorview/src/main/java/com/itsaky/androidide/ui/virtualkeys/SpecialButtonState.java
similarity index 96%
rename from emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/SpecialButtonState.java
rename to emulatorview/src/main/java/com/itsaky/androidide/ui/virtualkeys/SpecialButtonState.java
index 312114d7b..552e1fed8 100755
--- a/emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/SpecialButtonState.java
+++ b/emulatorview/src/main/java/com/itsaky/androidide/ui/virtualkeys/SpecialButtonState.java
@@ -1,4 +1,4 @@
-package com.itsaky.androidide.views.virtualkeys;
+package com.itsaky.androidide.ui.virtualkeys;
 
 import android.widget.Button;
 
diff --git a/emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/VirtualKeyButton.java b/emulatorview/src/main/java/com/itsaky/androidide/ui/virtualkeys/VirtualKeyButton.java
similarity index 99%
rename from emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/VirtualKeyButton.java
rename to emulatorview/src/main/java/com/itsaky/androidide/ui/virtualkeys/VirtualKeyButton.java
index 1d6c4b2d7..67c1e3970 100755
--- a/emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/VirtualKeyButton.java
+++ b/emulatorview/src/main/java/com/itsaky/androidide/ui/virtualkeys/VirtualKeyButton.java
@@ -1,4 +1,4 @@
-package com.itsaky.androidide.views.virtualkeys;
+package com.itsaky.androidide.ui.virtualkeys;
 
 import android.text.TextUtils;
 
diff --git a/emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/VirtualKeysConstants.java b/emulatorview/src/main/java/com/itsaky/androidide/ui/virtualkeys/VirtualKeysConstants.java
similarity index 99%
rename from emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/VirtualKeysConstants.java
rename to emulatorview/src/main/java/com/itsaky/androidide/ui/virtualkeys/VirtualKeysConstants.java
index d1934396a..fda6d119b 100755
--- a/emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/VirtualKeysConstants.java
+++ b/emulatorview/src/main/java/com/itsaky/androidide/ui/virtualkeys/VirtualKeysConstants.java
@@ -1,4 +1,4 @@
-package com.itsaky.androidide.views.virtualkeys;
+package com.itsaky.androidide.ui.virtualkeys;
 
 import android.view.KeyEvent;
 
diff --git a/emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/VirtualKeysInfo.java b/emulatorview/src/main/java/com/itsaky/androidide/ui/virtualkeys/VirtualKeysInfo.java
similarity index 96%
rename from emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/VirtualKeysInfo.java
rename to emulatorview/src/main/java/com/itsaky/androidide/ui/virtualkeys/VirtualKeysInfo.java
index fd6980b12..d8fce937e 100755
--- a/emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/VirtualKeysInfo.java
+++ b/emulatorview/src/main/java/com/itsaky/androidide/ui/virtualkeys/VirtualKeysInfo.java
@@ -1,11 +1,11 @@
-package com.itsaky.androidide.views.virtualkeys;
+package com.itsaky.androidide.ui.virtualkeys;
 
 import android.view.View;
 import android.widget.Button;
 
 import androidx.annotation.NonNull;
 
-import com.itsaky.androidide.views.virtualkeys.VirtualKeysConstants.EXTRA_KEY_DISPLAY_MAPS;
+import com.itsaky.androidide.ui.virtualkeys.VirtualKeysConstants.EXTRA_KEY_DISPLAY_MAPS;
 
 import org.json.JSONArray;
 import org.json.JSONException;
diff --git a/emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/VirtualKeysView.java b/emulatorview/src/main/java/com/itsaky/androidide/ui/virtualkeys/VirtualKeysView.java
similarity index 99%
rename from emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/VirtualKeysView.java
rename to emulatorview/src/main/java/com/itsaky/androidide/ui/virtualkeys/VirtualKeysView.java
index 1e7c3ae66..74cbdede4 100755
--- a/emulatorview/src/main/java/com/itsaky/androidide/views/virtualkeys/VirtualKeysView.java
+++ b/emulatorview/src/main/java/com/itsaky/androidide/ui/virtualkeys/VirtualKeysView.java
@@ -1,4 +1,4 @@
-package com.itsaky.androidide.views.virtualkeys;
+package com.itsaky.androidide.ui.virtualkeys;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
diff --git a/uidesigner/src/main/res/layout/activity_ui_designer.xml b/uidesigner/src/main/res/layout/activity_ui_designer.xml
index 0b0b38ee0..1ce7aa2a2 100644
--- a/uidesigner/src/main/res/layout/activity_ui_designer.xml
+++ b/uidesigner/src/main/res/layout/activity_ui_designer.xml
@@ -15,7 +15,7 @@
   ~   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
   -->
 
-<com.itsaky.androidide.views.ContentTranslatingDrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.itsaky.androidide.ui.ContentTranslatingDrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
@@ -68,4 +68,4 @@
 
   </com.google.android.material.navigation.NavigationView>
 
-</com.itsaky.androidide.views.ContentTranslatingDrawerLayout>
+</com.itsaky.androidide.ui.ContentTranslatingDrawerLayout>