diff --git a/openbb_terminal/keys_model.py b/openbb_terminal/keys_model.py
index c5a7a35fcf0..3f49acb8cd0 100644
--- a/openbb_terminal/keys_model.py
+++ b/openbb_terminal/keys_model.py
@@ -35,7 +35,6 @@ from openbb_terminal.rich_config import console
 
 from openbb_terminal.terminal_helper import suppress_stdout
 from openbb_terminal.portfolio.brokers.degiro.degiro_model import DegiroModel
-from openbb_terminal.account.hub_model import put_user_configs
 
 logger = logging.getLogger(__name__)
 
diff --git a/openbb_terminal/parent_classes.py b/openbb_terminal/parent_classes.py
index f4f5b2da319..4883158662f 100644
--- a/openbb_terminal/parent_classes.py
+++ b/openbb_terminal/parent_classes.py
@@ -19,8 +19,8 @@ import matplotlib.pyplot as plt
 from prompt_toolkit.formatted_text import HTML
 from prompt_toolkit.styles import Style
 from rich.markdown import Markdown
-from openbb_terminal.account.session_controller import logout
-from openbb_terminal.account.user import User
+from openbb_terminal.session.session_controller import logout
+from openbb_terminal.session.user import User
 
 from openbb_terminal.core.config.paths import (
     USER_CUSTOM_IMPORTS_DIRECTORY,
diff --git a/openbb_terminal/account/banner.txt b/openbb_terminal/session/banner.txt
similarity index 100%
rename from openbb_terminal/account/banner.txt
rename to openbb_terminal/session/banner.txt
diff --git a/openbb_terminal/account/hub_model.py b/openbb_terminal/session/hub_model.py
similarity index 99%
rename from openbb_terminal/account/hub_model.py
rename to openbb_terminal/session/hub_model.py
index 7b75fecd7d8..b7d3a489f78 100644
--- a/openbb_terminal/account/hub_model.py
+++ b/openbb_terminal/session/hub_model.py
@@ -1,6 +1,6 @@
 from typing import Optional
 import requests
-from openbb_terminal.account.user import User
+from openbb_terminal.session.user import User
 
 from openbb_terminal.rich_config import console
 
diff --git a/openbb_terminal/account/local_model.py b/openbb_terminal/session/local_model.py
similarity index 93%
rename from openbb_terminal/account/local_model.py
rename to openbb_terminal/session/local_model.py
index 8cac30e1192..1771515d15b 100644
--- a/openbb_terminal/account/local_model.py
+++ b/openbb_terminal/session/local_model.py
@@ -3,9 +3,10 @@ from pathlib import Path
 import json
 from openbb_terminal.core.config.paths import SETTINGS_DIRECTORY
 from openbb_terminal.rich_config import console
-from openbb_terminal import feature_flags as obbff
-from openbb_terminal import config_terminal as cfg
-from openbb_terminal.base_helpers import strtobool
+
+# from openbb_terminal import feature_flags as obbff
+# from openbb_terminal import config_terminal as cfg
+# from openbb_terminal.base_helpers import strtobool
 
 SESSION_FILE_PATH = SETTINGS_DIRECTORY / "session.json"
 
diff --git a/openbb_terminal/account/session_controller.py b/openbb_terminal/session/session_controller.py
similarity index 92%
rename from openbb_terminal/account/session_controller.py
rename to openbb_terminal/session/session_controller.py
index 3c50bc2d63f..923e78cda18 100644
--- a/openbb_terminal/account/session_controller.py
+++ b/openbb_terminal/session/session_controller.py
@@ -1,9 +1,9 @@
 from typing import Tuple
 import json
 import matplotlib.pyplot as plt
-import openbb_terminal.account.local_model as Local
-import openbb_terminal.account.hub_model as Hub
-from openbb_terminal.account.user import User
+import openbb_terminal.session.local_model as Local
+import openbb_terminal.session.hub_model as Hub
+from openbb_terminal.session.user import User
 from openbb_terminal.core.config.paths import PACKAGE_DIRECTORY
 from openbb_terminal.helper_funcs import system_clear
 from openbb_terminal.rich_config import console
@@ -12,7 +12,7 @@ from openbb_terminal import terminal_controller
 
 def display_welcome_message():
     """Display welcome message"""
-    with open(PACKAGE_DIRECTORY / "account" / "banner.txt") as f:
+    with open(PACKAGE_DIRECTORY / "session" / "banner.txt") as f:
         console.print(f.read(), style="blue")
 
 
diff --git a/openbb_terminal/account/user.py b/openbb_terminal/session/user.py
similarity index 100%
rename from openbb_terminal/account/user.py
rename to openbb_terminal/session/user.py
diff --git a/openbb_terminal/terminal_controller.py b/openbb_terminal/terminal_controller.py
index c0c630232b5..b6d9f1312fe 100644
--- a/openbb_terminal/terminal_controller.py
+++ b/openbb_terminal/terminal_controller.py
@@ -24,7 +24,7 @@ from prompt_toolkit.formatted_text import HTML
 import pandas as pd
 from openbb_terminal import feature_flags as obbff
 from openbb_terminal.terminal_helper import is_packaged_application
-from openbb_terminal.account import session_controller
+from openbb_terminal.session import session_controller
 
 from openbb_terminal.core.config.paths import (
     HOME_DIRECTORY,
diff --git a/terminal.py b/terminal.py
index bfb9e3c31a0..234c7089ae3 100644
--- a/terminal.py
+++ b/terminal.py
@@ -1,7 +1,7 @@
 import multiprocessing
 import sys
 from openbb_terminal.core.integration_tests import integration_controller
-from openbb_terminal.account import session_controller
+from openbb_terminal.session import session_controller
 from openbb_terminal.terminal_helper import is_packaged_application