diff --git a/ProjectSourceCode/src/resources/css/home-screen.css b/ProjectSourceCode/src/resources/css/homepage/homepage.css
similarity index 100%
rename from ProjectSourceCode/src/resources/css/home-screen.css
rename to ProjectSourceCode/src/resources/css/homepage/homepage.css
diff --git a/ProjectSourceCode/src/resources/img/home-screen/la-liga/icon.png b/ProjectSourceCode/src/resources/img/homepage/la-liga/icon.png
similarity index 100%
rename from ProjectSourceCode/src/resources/img/home-screen/la-liga/icon.png
rename to ProjectSourceCode/src/resources/img/homepage/la-liga/icon.png
diff --git a/ProjectSourceCode/src/resources/img/home-screen/la-liga/title.png b/ProjectSourceCode/src/resources/img/homepage/la-liga/title.png
similarity index 100%
rename from ProjectSourceCode/src/resources/img/home-screen/la-liga/title.png
rename to ProjectSourceCode/src/resources/img/homepage/la-liga/title.png
diff --git a/ProjectSourceCode/src/resources/img/home-screen/premier-league/icon.png b/ProjectSourceCode/src/resources/img/homepage/premier-league/icon.png
similarity index 100%
rename from ProjectSourceCode/src/resources/img/home-screen/premier-league/icon.png
rename to ProjectSourceCode/src/resources/img/homepage/premier-league/icon.png
diff --git a/ProjectSourceCode/src/resources/img/home-screen/premier-league/title.png b/ProjectSourceCode/src/resources/img/homepage/premier-league/title.png
similarity index 100%
rename from ProjectSourceCode/src/resources/img/home-screen/premier-league/title.png
rename to ProjectSourceCode/src/resources/img/homepage/premier-league/title.png
diff --git a/ProjectSourceCode/src/resources/js/homepage/routes.js b/ProjectSourceCode/src/resources/js/homepage/create-league-routes.js
similarity index 100%
rename from ProjectSourceCode/src/resources/js/homepage/routes.js
rename to ProjectSourceCode/src/resources/js/homepage/create-league-routes.js
diff --git a/ProjectSourceCode/src/views/pages/home.hbs b/ProjectSourceCode/src/views/pages/home.hbs
index 2921832..75bb850 100644
--- a/ProjectSourceCode/src/views/pages/home.hbs
+++ b/ProjectSourceCode/src/views/pages/home.hbs
@@ -5,23 +5,23 @@
         
         <!-- 🇬🇧 Premier League -->
         <a href="league-page.hbs" class="card-link">
-          {{> league_table leagueName="Premier League" logo="./img/home-screen/premier-league/icon.png" title="./img/home-screen/premier-league/title.png"}}
+          {{> homepage/league-card leagueName="Premier League" logo="./img/homepage/premier-league/icon.png" title="./img/homepage/premier-league/title.png"}}
         </a>
         
         <!-- 🇪🇸 La Liga -->
-        {{> league_table leagueName="La Liga" logo="./img/home-screen/la-liga/icon.png" title="./img/home-screen/la-liga/title.png"}}
+        {{> homepage/league-card leagueName="La Liga" logo="./img/homepage/la-liga/icon.png" title="./img/homepage/la-liga/title.png"}}
         
         <!-- 🇩🇪 Bundesliga -->
-        {{> league_table leagueName="Bundesliga" logo="./img/home-screen/la-liga/icon.png" title="./img/home-screen/la-liga/title.png"}}
+        {{> homepage/league-card leagueName="Bundesliga" logo="./img/homepage/la-liga/icon.png" title="./img/homepage/la-liga/title.png"}}
         
         <!-- 🇮🇹 Serie A -->
-        {{> league_table leagueName="Serie A" logo="./img/home-screen/la-liga/icon.png" title="./img/home-screen/la-liga/title.png"}}
+        {{> homepage/league-card leagueName="Serie A" logo="./img/homepage/la-liga/icon.png" title="./img/homepage/la-liga/title.png"}}
         
         <!-- 🇫🇷 Ligue 1 -->
-        {{> league_table leagueName="Ligue 1" logo="./img/home-screen/la-liga/icon.png" title="./img/home-screen/la-liga/title.png"}}
+        {{> homepage/league-card leagueName="Ligue 1" logo="./img/homepage/la-liga/icon.png" title="./img/homepage/la-liga/title.png"}}
         
         <!-- 🇧🇷 Brasilerao -->
-        {{> league_table leagueName="Brasileirao" logo="./img/home-screen/la-liga/icon.png" title="./img/home-screen/la-liga/title.png"}}
+        {{> homepage/league-card leagueName="Brasileirao" logo="./img/homepage/la-liga/icon.png" title="./img/homepage/la-liga/title.png"}}
         
         /* Script to generate league URLs */
         <script>
diff --git a/ProjectSourceCode/src/views/partials/head.hbs b/ProjectSourceCode/src/views/partials/head.hbs
index 26fc735..5cdaea4 100644
--- a/ProjectSourceCode/src/views/partials/head.hbs
+++ b/ProjectSourceCode/src/views/partials/head.hbs
@@ -4,7 +4,7 @@
 
   <!-- Linking forms.css -->
   <link rel="stylesheet" type="text/css" href="css/login_and_registration.css">
-  <link rel="stylesheet" type="text/css" href="css/home-screen.css">
+  <link rel="stylesheet" type="text/css" href="css/homepage/homepage.css">
 
   <!-- Navigation Bar Stylesheets -->
   <link rel="stylesheet" type="text/css" href="css/navigation-bar/navigation-bar.css">
diff --git a/ProjectSourceCode/src/views/partials/league_table.hbs b/ProjectSourceCode/src/views/partials/homepage/league-card.hbs
similarity index 100%
rename from ProjectSourceCode/src/views/partials/league_table.hbs
rename to ProjectSourceCode/src/views/partials/homepage/league-card.hbs