diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/AppController/StockAppController.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/AppControllers/StockAppController.java
similarity index 81%
rename from src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/AppController/StockAppController.java
rename to src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/AppControllers/StockAppController.java
index 352ef70..297a3c3 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/AppController/StockAppController.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/AppControllers/StockAppController.java
@@ -1,12 +1,12 @@
-package edu.ntnu.idi.idatt2003.gruppe42.Controller.AppController;
+package edu.ntnu.idi.idatt2003.gruppe42.Controller.AppControllers;
 
 import edu.ntnu.idi.idatt2003.gruppe42.Controller.MarketController;
-import edu.ntnu.idi.idatt2003.gruppe42.View.Popups.StockPopup;
+import edu.ntnu.idi.idatt2003.gruppe42.View.Apps.StockApp;
 
 public class StockAppController {
   private MarketController marketController;
 
-  public StockAppController(StockPopup stockPopup) {
+  public StockAppController(StockApp stockPopup) {
     marketController = new MarketController();
 
     stockPopup.getStockList().getItems().addAll(marketController.getMarket());
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/PopupController.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/PopupController.java
index 5719237..0083dc5 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/PopupController.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/PopupController.java
@@ -1,6 +1,6 @@
 package edu.ntnu.idi.idatt2003.gruppe42.Controller;
 
-import edu.ntnu.idi.idatt2003.gruppe42.View.Popups.Popup;
+import edu.ntnu.idi.idatt2003.gruppe42.View.Popup;
 import javafx.scene.layout.Pane;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/DesktopViewController.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/ViewControllers/DesktopViewController.java
similarity index 80%
rename from src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/DesktopViewController.java
rename to src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/ViewControllers/DesktopViewController.java
index be2833c..f15927f 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/DesktopViewController.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/ViewControllers/DesktopViewController.java
@@ -1,13 +1,14 @@
-package edu.ntnu.idi.idatt2003.gruppe42.Controller;
+package edu.ntnu.idi.idatt2003.gruppe42.Controller.ViewControllers;
 
+import edu.ntnu.idi.idatt2003.gruppe42.Controller.PopupController;
 import edu.ntnu.idi.idatt2003.gruppe42.Model.App;
-import edu.ntnu.idi.idatt2003.gruppe42.View.Popups.AppStorePopup;
-import edu.ntnu.idi.idatt2003.gruppe42.View.Popups.BankPopup;
-import edu.ntnu.idi.idatt2003.gruppe42.View.Popups.HustlersPopup;
-import edu.ntnu.idi.idatt2003.gruppe42.View.Popups.MailPopup;
-import edu.ntnu.idi.idatt2003.gruppe42.View.Popups.NewsPopup;
-import edu.ntnu.idi.idatt2003.gruppe42.View.Popups.Popup;
-import edu.ntnu.idi.idatt2003.gruppe42.View.Popups.StockPopup;
+import edu.ntnu.idi.idatt2003.gruppe42.View.Apps.AppStoreApp;
+import edu.ntnu.idi.idatt2003.gruppe42.View.Apps.BankApp;
+import edu.ntnu.idi.idatt2003.gruppe42.View.Apps.HustlersApp;
+import edu.ntnu.idi.idatt2003.gruppe42.View.Apps.MailApp;
+import edu.ntnu.idi.idatt2003.gruppe42.View.Apps.NewsApp;
+import edu.ntnu.idi.idatt2003.gruppe42.View.Popup;
+import edu.ntnu.idi.idatt2003.gruppe42.View.Apps.StockApp;
 import javafx.beans.binding.Bindings;
 import javafx.scene.control.Button;
 import javafx.scene.input.ClipboardContent;
@@ -88,12 +89,12 @@ public Button createAppButton(App type) {
    */
   private void openPopup(App type) {
     Popup popup = switch (type) {
-      case APPSTORE -> new AppStorePopup(400, 300, 100, 100);
-      case HUSTLERS -> new HustlersPopup(400, 300, 140, 140);
-      case STOCK -> new StockPopup(400, 300, 200, 200);
-      case MAIL -> new MailPopup(400, 300, 160, 160);
-      case NEWS -> new NewsPopup(400, 300, 180, 180);
-      case BANK -> new BankPopup(400, 300, 120, 120);
+      case APPSTORE -> new AppStoreApp(400, 300, 100, 100);
+      case HUSTLERS -> new HustlersApp(400, 300, 140, 140);
+      case STOCK -> new StockApp(400, 300, 200, 200);
+      case MAIL -> new MailApp(400, 300, 160, 160);
+      case NEWS -> new NewsApp(400, 300, 180, 180);
+      case BANK -> new BankApp(400, 300, 120, 120);
     };
 
     if (popupController.add(popup)) {
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/StartViewController.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/ViewControllers/StartViewController.java
similarity index 94%
rename from src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/StartViewController.java
rename to src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/ViewControllers/StartViewController.java
index 9830be1..6ea848e 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/StartViewController.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/ViewControllers/StartViewController.java
@@ -1,8 +1,8 @@
-package edu.ntnu.idi.idatt2003.gruppe42.Controller;
+package edu.ntnu.idi.idatt2003.gruppe42.Controller.ViewControllers;
 
 import edu.ntnu.idi.idatt2003.gruppe42.Millions;
 import edu.ntnu.idi.idatt2003.gruppe42.Model.Player;
-import edu.ntnu.idi.idatt2003.gruppe42.View.StartView;
+import edu.ntnu.idi.idatt2003.gruppe42.View.Views.StartView;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Random;
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Millions.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Millions.java
index c9cfd38..0c8c244 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Millions.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Millions.java
@@ -1,8 +1,8 @@
 package edu.ntnu.idi.idatt2003.gruppe42;
 
-import edu.ntnu.idi.idatt2003.gruppe42.Controller.StartViewController;
-import edu.ntnu.idi.idatt2003.gruppe42.View.DesktopView;
-import edu.ntnu.idi.idatt2003.gruppe42.View.StartView;
+import edu.ntnu.idi.idatt2003.gruppe42.Controller.ViewControllers.StartViewController;
+import edu.ntnu.idi.idatt2003.gruppe42.View.Views.DesktopView;
+import edu.ntnu.idi.idatt2003.gruppe42.View.Views.StartView;
 import javafx.application.Application;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Popups/AppStorePopup.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Apps/AppStoreApp.java
similarity index 66%
rename from src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Popups/AppStorePopup.java
rename to src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Apps/AppStoreApp.java
index 98fc3a8..6fa285d 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Popups/AppStorePopup.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Apps/AppStoreApp.java
@@ -1,11 +1,12 @@
-package edu.ntnu.idi.idatt2003.gruppe42.View.Popups;
+package edu.ntnu.idi.idatt2003.gruppe42.View.Apps;
 
 import edu.ntnu.idi.idatt2003.gruppe42.Model.App;
+import edu.ntnu.idi.idatt2003.gruppe42.View.Popup;
 
 /**
  * A popup for the AppStore app.
  */
-public class AppStorePopup extends Popup {
+public class AppStoreApp extends Popup {
 
   /**
    * Constructs a new AppStore popup.
@@ -15,7 +16,7 @@ public class AppStorePopup extends Popup {
    * @param x x-position of the popup
    * @param y y-position of the popup
    */
-  public AppStorePopup(int width, int height, int x, int y) {
+  public AppStoreApp(int width, int height, int x, int y) {
     super(width, height, x, y, App.APPSTORE);
     // Add AppStore specific content here
   }
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Popups/BankPopup.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Apps/BankApp.java
similarity index 66%
rename from src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Popups/BankPopup.java
rename to src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Apps/BankApp.java
index 57be052..4652c9d 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Popups/BankPopup.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Apps/BankApp.java
@@ -1,11 +1,12 @@
-package edu.ntnu.idi.idatt2003.gruppe42.View.Popups;
+package edu.ntnu.idi.idatt2003.gruppe42.View.Apps;
 
 import edu.ntnu.idi.idatt2003.gruppe42.Model.App;
+import edu.ntnu.idi.idatt2003.gruppe42.View.Popup;
 
 /**
  * A popup for the Bank app.
  */
-public class BankPopup extends Popup {
+public class BankApp extends Popup {
 
   /**
    * Constructs a new Bank popup.
@@ -15,7 +16,7 @@ public class BankPopup extends Popup {
    * @param x x-position of the popup
    * @param y y-position of the popup
    */
-  public BankPopup(int width, int height, int x, int y) {
+  public BankApp(int width, int height, int x, int y) {
     super(width, height, x, y, App.BANK);
     // Add Bank specific content here
   }
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Popups/HustlersPopup.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Apps/HustlersApp.java
similarity index 66%
rename from src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Popups/HustlersPopup.java
rename to src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Apps/HustlersApp.java
index 7fa7ba8..dc7d7b4 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Popups/HustlersPopup.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Apps/HustlersApp.java
@@ -1,11 +1,12 @@
-package edu.ntnu.idi.idatt2003.gruppe42.View.Popups;
+package edu.ntnu.idi.idatt2003.gruppe42.View.Apps;
 
 import edu.ntnu.idi.idatt2003.gruppe42.Model.App;
+import edu.ntnu.idi.idatt2003.gruppe42.View.Popup;
 
 /**
  * A popup for the Hustlers app.
  */
-public class HustlersPopup extends Popup {
+public class HustlersApp extends Popup {
 
   /**
    * Constructs a new Hustlers popup.
@@ -15,7 +16,7 @@ public class HustlersPopup extends Popup {
    * @param x x-position of the popup
    * @param y y-position of the popup
    */
-  public HustlersPopup(int width, int height, int x, int y) {
+  public HustlersApp(int width, int height, int x, int y) {
     super(width, height, x, y, App.HUSTLERS);
     // Add Hustlers specific content here
   }
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Popups/MailPopup.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Apps/MailApp.java
similarity index 66%
rename from src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Popups/MailPopup.java
rename to src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Apps/MailApp.java
index 5f4f4a1..dde2bc6 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Popups/MailPopup.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Apps/MailApp.java
@@ -1,11 +1,12 @@
-package edu.ntnu.idi.idatt2003.gruppe42.View.Popups;
+package edu.ntnu.idi.idatt2003.gruppe42.View.Apps;
 
 import edu.ntnu.idi.idatt2003.gruppe42.Model.App;
+import edu.ntnu.idi.idatt2003.gruppe42.View.Popup;
 
 /**
  * A popup for the Mail app.
  */
-public class MailPopup extends Popup {
+public class MailApp extends Popup {
 
   /**
    * Constructs a new Mail popup.
@@ -15,7 +16,7 @@ public class MailPopup extends Popup {
    * @param x x-position of the popup
    * @param y y-position of the popup
    */
-  public MailPopup(int width, int height, int x, int y) {
+  public MailApp(int width, int height, int x, int y) {
     super(width, height, x, y, App.MAIL);
     // Add Mail specific content here
   }
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Popups/NewsPopup.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Apps/NewsApp.java
similarity index 66%
rename from src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Popups/NewsPopup.java
rename to src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Apps/NewsApp.java
index 025ee4a..ac57fe8 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Popups/NewsPopup.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Apps/NewsApp.java
@@ -1,11 +1,12 @@
-package edu.ntnu.idi.idatt2003.gruppe42.View.Popups;
+package edu.ntnu.idi.idatt2003.gruppe42.View.Apps;
 
 import edu.ntnu.idi.idatt2003.gruppe42.Model.App;
+import edu.ntnu.idi.idatt2003.gruppe42.View.Popup;
 
 /**
  * A popup for the News app.
  */
-public class NewsPopup extends Popup {
+public class NewsApp extends Popup {
 
   /**
    * Constructs a new News popup.
@@ -15,7 +16,7 @@ public class NewsPopup extends Popup {
    * @param x x-position of the popup
    * @param y y-position of the popup
    */
-  public NewsPopup(int width, int height, int x, int y) {
+  public NewsApp(int width, int height, int x, int y) {
     super(width, height, x, y, App.NEWS);
     // Add News specific content here
   }
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Popups/StockPopup.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Apps/StockApp.java
similarity index 81%
rename from src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Popups/StockPopup.java
rename to src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Apps/StockApp.java
index c1b6ce5..16c4312 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Popups/StockPopup.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Apps/StockApp.java
@@ -1,9 +1,9 @@
-package edu.ntnu.idi.idatt2003.gruppe42.View.Popups;
+package edu.ntnu.idi.idatt2003.gruppe42.View.Apps;
 
-import edu.ntnu.idi.idatt2003.gruppe42.Controller.AppController.StockAppController;
-import edu.ntnu.idi.idatt2003.gruppe42.Controller.MarketController;
+import edu.ntnu.idi.idatt2003.gruppe42.Controller.AppControllers.StockAppController;
 import edu.ntnu.idi.idatt2003.gruppe42.Model.App;
 import edu.ntnu.idi.idatt2003.gruppe42.Model.Stock;
+import edu.ntnu.idi.idatt2003.gruppe42.View.Popup;
 import javafx.geometry.Pos;
 import javafx.scene.control.*;
 import javafx.scene.layout.HBox;
@@ -11,7 +11,7 @@
 /**
  * A popup for the Stock app.
  */
-public class StockPopup extends Popup {
+public class StockApp extends Popup {
 
   private StockAppController stockAppController;
   private ListView<Stock> stockList;
@@ -25,7 +25,7 @@ public class StockPopup extends Popup {
    * @param x x-position of the popup
    * @param y y-position of the popup
    */
-  public StockPopup(int width, int height, int x, int y) {
+  public StockApp(int width, int height, int x, int y) {
     super(width, height, x, y, App.STOCK);
 
     searchField = new TextField();
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Popups/Popup.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Popup.java
similarity index 98%
rename from src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Popups/Popup.java
rename to src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Popup.java
index bdeb365..8d0f99f 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Popups/Popup.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Popup.java
@@ -1,4 +1,4 @@
-package edu.ntnu.idi.idatt2003.gruppe42.View.Popups;
+package edu.ntnu.idi.idatt2003.gruppe42.View;
 
 import edu.ntnu.idi.idatt2003.gruppe42.Model.App;
 import javafx.scene.control.Button;
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/DesktopView.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Views/DesktopView.java
similarity index 95%
rename from src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/DesktopView.java
rename to src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Views/DesktopView.java
index 364ad12..9094dc2 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/DesktopView.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Views/DesktopView.java
@@ -1,6 +1,6 @@
-package edu.ntnu.idi.idatt2003.gruppe42.View;
+package edu.ntnu.idi.idatt2003.gruppe42.View.Views;
 
-import edu.ntnu.idi.idatt2003.gruppe42.Controller.DesktopViewController;
+import edu.ntnu.idi.idatt2003.gruppe42.Controller.ViewControllers.DesktopViewController;
 import edu.ntnu.idi.idatt2003.gruppe42.Controller.PopupController;
 import edu.ntnu.idi.idatt2003.gruppe42.Model.App;
 import javafx.geometry.Pos;
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/StartView.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Views/StartView.java
similarity index 97%
rename from src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/StartView.java
rename to src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Views/StartView.java
index 15c2078..38cd521 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/StartView.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Views/StartView.java
@@ -1,4 +1,4 @@
-package edu.ntnu.idi.idatt2003.gruppe42.View;
+package edu.ntnu.idi.idatt2003.gruppe42.View.Views;
 
 import javafx.geometry.Pos;
 import javafx.scene.control.Button;