diff --git a/lib/constants/app_strings.dart b/lib/constants/app_strings.dart
deleted file mode 100644
index b9763af..0000000
--- a/lib/constants/app_strings.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-class AppStrings {
-  AppStrings._();
-
-  static const String home = 'Home';
-
-  static const String partnership = 'Partnership';
-  static const String selfApply = 'Self-apply';
-  static const String contracting = 'Contracting';
-  static const String tenderSubmitting = 'Tender submitting';
-  static const String approvedTenders = 'Approved tenders';
-  static const String tenderValue = 'Tender Value';
-  static const String thunderStatus = 'Thunder status';
-  static const String yourTenders = 'Your tenders';
-}
diff --git a/lib/core/constants/strings.dart b/lib/core/constants/strings.dart
index bc76716..7e9f5de 100644
--- a/lib/core/constants/strings.dart
+++ b/lib/core/constants/strings.dart
@@ -1,10 +1,10 @@
 class AppStrings {
+  AppStrings._();
   // App Titles
   static const String appName = 'My Awesome App';
   static const String loginTitle = 'Welcome Back';
 
   // Labels and Buttons
-  static const String loginButton = 'Sign In';
   static const String signupButton = 'Create Account';
   static const String forgotPassword = 'Forgot Password?';
   static const String emailHint = 'Email address';
@@ -14,4 +14,23 @@ class AppStrings {
   static const String loginFailed =
       'Login failed. Please check your credentials.';
   static const String networkError = 'Network error. Please try again.';
+
+  //Login
+  static const signInTitle = 'Sign In';
+  static const signInSubtitle = 'Enter valid username & password to continue';
+  static const usernameLabel = 'User Name';
+  static const passwordLabel = 'Password';
+  static const loginButton = 'Login';
+
+  //Home
+  static const String home = 'Home';
+
+  static const String partnership = 'Partnership';
+  static const String selfApply = 'Self-apply';
+  static const String contracting = 'Contracting';
+  static const String tenderSubmitting = 'Tender submitting';
+  static const String approvedTenders = 'Approved tenders';
+  static const String tenderValue = 'Tender Value';
+  static const String thunderStatus = 'Thunder status';
+  static const String yourTenders = 'Your tenders';
 }
diff --git a/lib/core/constants/texts.dart b/lib/core/constants/texts.dart
deleted file mode 100644
index f336237..0000000
--- a/lib/core/constants/texts.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-class TextManager {
-  static const signInTitle = 'Sign In';
-  static const signInSubtitle = 'Enter valid username & password to continue';
-  static const usernameLabel = 'User Name';
-  static const passwordLabel = 'Password';
-  static const loginButton = 'Login';
-}
\ No newline at end of file
diff --git a/lib/main.dart b/lib/main.dart
index a9cfff6..dfaf797 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -6,7 +6,7 @@ import 'data/repositories/auth_repository.dart';
 import 'data/services/auth_service.dart';
 import 'size_config.dart';
 import 'view_models/auth_view_model.dart';
-import 'views/login_screen.dart';
+import 'views/login/login_screen.dart';
 
 void main() {
   runApp(
diff --git a/lib/home/home_page.dart b/lib/views/home/home_page.dart
similarity index 95%
rename from lib/home/home_page.dart
rename to lib/views/home/home_page.dart
index 7b73246..987404a 100644
--- a/lib/home/home_page.dart
+++ b/lib/views/home/home_page.dart
@@ -1,12 +1,12 @@
 import 'package:flutter/material.dart';
 
-import '../../bottom_navigation.dart';
-import '../../constants/app_strings.dart';
-import '../../size_config.dart';
+import '../../../bottom_navigation.dart';
+import '../../../core/constants/strings.dart';
+import '../../../size_config.dart';
 import 'widgets.dart';
 
-class HomePage extends StatelessWidget {
-  const HomePage({super.key});
+class Homescreen extends StatelessWidget {
+  const Homescreen({super.key});
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/home/progress_bar_column.dart b/lib/views/home/progress_bar_column.dart
similarity index 98%
rename from lib/home/progress_bar_column.dart
rename to lib/views/home/progress_bar_column.dart
index e7224ed..ff9d5b6 100644
--- a/lib/home/progress_bar_column.dart
+++ b/lib/views/home/progress_bar_column.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import '../size_config.dart';
+import '../../size_config.dart';
 
 class ProgressBarColumn extends StatefulWidget {
   const ProgressBarColumn({
diff --git a/lib/home/statistics_card.dart b/lib/views/home/statistics_card.dart
similarity index 98%
rename from lib/home/statistics_card.dart
rename to lib/views/home/statistics_card.dart
index eb8a17f..9090d33 100644
--- a/lib/home/statistics_card.dart
+++ b/lib/views/home/statistics_card.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 
-import '../size_config.dart';
+import '../../size_config.dart';
 
 class StatisticsCard extends StatelessWidget {
   const StatisticsCard({
diff --git a/lib/home/tenders_list_item.dart b/lib/views/home/tenders_list_item.dart
similarity index 99%
rename from lib/home/tenders_list_item.dart
rename to lib/views/home/tenders_list_item.dart
index 301cbca..decbabe 100644
--- a/lib/home/tenders_list_item.dart
+++ b/lib/views/home/tenders_list_item.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 
-import '../size_config.dart';
+import '../../size_config.dart';
 
 class TendersListItem extends StatelessWidget {
   const TendersListItem({super.key});
diff --git a/lib/home/widgets.dart b/lib/views/home/widgets.dart
similarity index 100%
rename from lib/home/widgets.dart
rename to lib/views/home/widgets.dart
diff --git a/lib/views/login_screen.dart b/lib/views/login/login_screen.dart
similarity index 86%
rename from lib/views/login_screen.dart
rename to lib/views/login/login_screen.dart
index fee7a1a..ef2137b 100644
--- a/lib/views/login_screen.dart
+++ b/lib/views/login/login_screen.dart
@@ -1,13 +1,10 @@
 // lib/views/login_screen.dart
 import 'package:flutter/material.dart';
 
-import '../core/constants/assets.dart';
-import '../core/constants/texts.dart';
-import '../size_config.dart';
-import '../views/widget/login_button.dart';
-import '../views/widget/login_logo.dart';
-import '../views/widget/login_textfield.dart';
-import '../views/widget/login_title.dart';
+import '../../core/constants/assets.dart';
+import '../../core/constants/strings.dart';
+import '../../size_config.dart';
+import 'widgets/widgets.dart';
 
 class LoginScreen extends StatefulWidget {
   const LoginScreen({super.key});
@@ -69,7 +66,7 @@ class _LoginScreenState extends State<LoginScreen> {
               LoginTextField(
                 controller: _usernameController,
                 focusNode: _usernameFocus,
-                label: TextManager.usernameLabel,
+                label: AppStrings.usernameLabel,
                 iconPath: AssetsManager.userIcon,
               ),
 
@@ -78,7 +75,7 @@ class _LoginScreenState extends State<LoginScreen> {
               LoginTextField(
                 controller: _passwordController,
                 focusNode: _passwordFocus,
-                label: TextManager.passwordLabel,
+                label: AppStrings.passwordLabel,
                 iconPath: AssetsManager.passwordIcon,
                 isPassword: true,
                 obscureText: _obscurePassword,
diff --git a/lib/views/widget/login_button.dart b/lib/views/login/widgets/login_button.dart
similarity index 83%
rename from lib/views/widget/login_button.dart
rename to lib/views/login/widgets/login_button.dart
index 0ebd88f..09cd44f 100644
--- a/lib/views/widget/login_button.dart
+++ b/lib/views/login/widgets/login_button.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 
-import '../../core/constants/colors.dart';
-import '../../core/constants/texts.dart';
-import '../../size_config.dart';
+import '../../../core/constants/colors.dart';
+import '../../../core/constants/strings.dart';
+import '../../../size_config.dart';
 
 class LoginButton extends StatelessWidget {
   final bool isEnabled;
@@ -29,7 +29,7 @@ class LoginButton extends StatelessWidget {
           ),
         ),
         child: Text(
-          TextManager.loginButton,
+          AppStrings.loginButton,
           style: TextStyle(fontSize: 16.0.sp(), fontWeight: FontWeight.bold),
         ),
       ),
diff --git a/lib/views/widget/login_logo.dart b/lib/views/login/widgets/login_logo.dart
similarity index 75%
rename from lib/views/widget/login_logo.dart
rename to lib/views/login/widgets/login_logo.dart
index 6458770..70ba9e9 100644
--- a/lib/views/widget/login_logo.dart
+++ b/lib/views/login/widgets/login_logo.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
-import '../../core/constants/assets.dart';
-import '../../size_config.dart';
+import '../../../core/constants/assets.dart';
+import '../../../size_config.dart';
 
 class LoginLogo extends StatelessWidget {
   const LoginLogo({super.key});
diff --git a/lib/views/widget/login_textfield.dart b/lib/views/login/widgets/login_textfield.dart
similarity index 94%
rename from lib/views/widget/login_textfield.dart
rename to lib/views/login/widgets/login_textfield.dart
index 7825418..59a6e36 100644
--- a/lib/views/widget/login_textfield.dart
+++ b/lib/views/login/widgets/login_textfield.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 
-import '../../core/constants/assets.dart';
-import '../../core/constants/colors.dart';
-import '../../size_config.dart';
+import '../../../core/constants/assets.dart';
+import '../../../core/constants/colors.dart';
+import '../../../size_config.dart';
 
 class LoginTextField extends StatelessWidget {
   final TextEditingController controller;
diff --git a/lib/views/widget/login_title.dart b/lib/views/login/widgets/login_title.dart
similarity index 78%
rename from lib/views/widget/login_title.dart
rename to lib/views/login/widgets/login_title.dart
index ed456d3..87089a2 100644
--- a/lib/views/widget/login_title.dart
+++ b/lib/views/login/widgets/login_title.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
-import '../../core/constants/texts.dart';
-import '../../size_config.dart';
+import '../../../core/constants/strings.dart';
+import '../../../size_config.dart';
 
 class LoginTitle extends StatelessWidget {
   const LoginTitle({super.key});
@@ -11,12 +11,12 @@ class LoginTitle extends StatelessWidget {
     return Column(
       children: [
         Text(
-          TextManager.signInTitle,
+          AppStrings.signInTitle,
           style: TextStyle(fontSize: 28.0.sp(), fontWeight: FontWeight.w700),
         ),
         SizedBox(height: 8.0.h()),
         Text(
-          TextManager.signInSubtitle,
+          AppStrings.signInSubtitle,
           style: TextStyle(
             fontSize: 14.0.sp(),
             fontWeight: FontWeight.w400,
diff --git a/lib/views/login/widgets/widgets.dart b/lib/views/login/widgets/widgets.dart
new file mode 100644
index 0000000..ab511f9
--- /dev/null
+++ b/lib/views/login/widgets/widgets.dart
@@ -0,0 +1,4 @@
+export 'login_button.dart';
+export 'login_logo.dart';
+export 'login_textfield.dart';
+export 'login_title.dart';