diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e1d6f7b..eec554e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,17 +13,17 @@
         android:theme="@style/Theme.AppCompat.Light.NoActionBar"
         tools:targetApi="31">
         <activity
-            android:name=".dataActivity"
-            android:parentActivityName=".MainActivity"
+            android:name=".Views.dataActivity"
+            android:parentActivityName=".Views.MainActivity"
             android:label="Data Activity"
             android:exported="false" />
         <activity
-            android:name=".SettingsActivity"
-            android:parentActivityName=".MainActivity"
+            android:name=".Views.SettingsActivity"
+            android:parentActivityName=".Views.MainActivity"
             android:label="Settings Activity"
             android:exported="false" />
         <activity
-            android:name=".MainActivity"
+            android:name=".Views.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/com/example/assignment1/CountSharedPreferenceHelper.java b/app/src/main/java/com/example/assignment1/Controllers/CountSharedPreferenceHelper.java
similarity index 97%
rename from app/src/main/java/com/example/assignment1/CountSharedPreferenceHelper.java
rename to app/src/main/java/com/example/assignment1/Controllers/CountSharedPreferenceHelper.java
index 1cf05f8..fc8a77b 100644
--- a/app/src/main/java/com/example/assignment1/CountSharedPreferenceHelper.java
+++ b/app/src/main/java/com/example/assignment1/Controllers/CountSharedPreferenceHelper.java
@@ -1,4 +1,4 @@
-package com.example.assignment1;
+package com.example.assignment1.Controllers;
 
 import android.content.Context;
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/com/example/assignment1/CounterButtonSharedPreferenceHelper.java b/app/src/main/java/com/example/assignment1/Controllers/CounterButtonSharedPreferenceHelper.java
similarity index 88%
rename from app/src/main/java/com/example/assignment1/CounterButtonSharedPreferenceHelper.java
rename to app/src/main/java/com/example/assignment1/Controllers/CounterButtonSharedPreferenceHelper.java
index 2ed4b49..875faf9 100644
--- a/app/src/main/java/com/example/assignment1/CounterButtonSharedPreferenceHelper.java
+++ b/app/src/main/java/com/example/assignment1/Controllers/CounterButtonSharedPreferenceHelper.java
@@ -1,9 +1,11 @@
-package com.example.assignment1;
+package com.example.assignment1.Controllers;
 
 
 import android.content.Context;
 import android.content.SharedPreferences;
 
+import com.example.assignment1.Models.CounterButtonNames;
+
 
 public class CounterButtonSharedPreferenceHelper {
 
diff --git a/app/src/main/java/com/example/assignment1/CounterButtonNames.java b/app/src/main/java/com/example/assignment1/Models/CounterButtonNames.java
similarity index 92%
rename from app/src/main/java/com/example/assignment1/CounterButtonNames.java
rename to app/src/main/java/com/example/assignment1/Models/CounterButtonNames.java
index ced7920..39e6717 100644
--- a/app/src/main/java/com/example/assignment1/CounterButtonNames.java
+++ b/app/src/main/java/com/example/assignment1/Models/CounterButtonNames.java
@@ -1,4 +1,4 @@
-package com.example.assignment1;
+package com.example.assignment1.Models;
 
 // There are only 3 buttons available to select
 // so Enum seemed to be the suitable choice of data structure here
diff --git a/app/src/main/java/com/example/assignment1/MainActivity.java b/app/src/main/java/com/example/assignment1/Views/MainActivity.java
similarity index 93%
rename from app/src/main/java/com/example/assignment1/MainActivity.java
rename to app/src/main/java/com/example/assignment1/Views/MainActivity.java
index 6805c61..e490fad 100644
--- a/app/src/main/java/com/example/assignment1/MainActivity.java
+++ b/app/src/main/java/com/example/assignment1/Views/MainActivity.java
@@ -1,4 +1,4 @@
-package com.example.assignment1;
+package com.example.assignment1.Views;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -9,6 +9,11 @@ import android.widget.Toast;
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import com.example.assignment1.Controllers.CountSharedPreferenceHelper;
+import com.example.assignment1.Models.CounterButtonNames;
+import com.example.assignment1.Controllers.CounterButtonSharedPreferenceHelper;
+import com.example.assignment1.R;
+
 public class MainActivity extends AppCompatActivity {
 
     protected CounterButtonSharedPreferenceHelper counterButtonSharedPrefHelper;
@@ -89,7 +94,7 @@ public class MainActivity extends AppCompatActivity {
         if (counterButtonSharedPrefHelper.getCounterButtonName(CounterButtonNames.FIRST).trim().isEmpty() ||
                 counterButtonSharedPrefHelper.getCounterButtonName(CounterButtonNames.SECOND).trim().isEmpty() ||
                 counterButtonSharedPrefHelper.getCounterButtonName(CounterButtonNames.THIRD).trim().isEmpty()) {
-            Toast.makeText(getApplicationContext(), "Event Button(s) can not be empty", Toast.LENGTH_SHORT).show();
+            Toast.makeText(getApplicationContext(), "Event Button(s) Names can not be empty", Toast.LENGTH_SHORT).show();
             goToSettingsActivity();
 
         // everything field is good, no edit needed
diff --git a/app/src/main/java/com/example/assignment1/SettingsActivity.java b/app/src/main/java/com/example/assignment1/Views/SettingsActivity.java
similarity index 94%
rename from app/src/main/java/com/example/assignment1/SettingsActivity.java
rename to app/src/main/java/com/example/assignment1/Views/SettingsActivity.java
index 66b1d33..56c6d28 100644
--- a/app/src/main/java/com/example/assignment1/SettingsActivity.java
+++ b/app/src/main/java/com/example/assignment1/Views/SettingsActivity.java
@@ -1,4 +1,4 @@
-package com.example.assignment1;
+package com.example.assignment1.Views;
 
 import android.os.Bundle;
 import android.text.InputFilter;
@@ -12,6 +12,11 @@ import android.widget.Toast;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 
+import com.example.assignment1.Controllers.CountSharedPreferenceHelper;
+import com.example.assignment1.Models.CounterButtonNames;
+import com.example.assignment1.Controllers.CounterButtonSharedPreferenceHelper;
+import com.example.assignment1.R;
+
 public class SettingsActivity extends AppCompatActivity {
 
     protected Button saveButton;
@@ -111,6 +116,11 @@ public class SettingsActivity extends AppCompatActivity {
 
         saveButton.setVisibility(View.VISIBLE);
 
+        counter_1_name_edit_text.setHint("");
+        counter_2_name_edit_text.setHint("");
+        counter_3_name_edit_text.setHint("");
+        maximum_counts_edit_text.setHint("");
+
         counter_1_name_edit_text.setEnabled(true);
         counter_2_name_edit_text.setEnabled(true);
         counter_3_name_edit_text.setEnabled(true);
diff --git a/app/src/main/java/com/example/assignment1/dataActivity.java b/app/src/main/java/com/example/assignment1/Views/dataActivity.java
similarity index 94%
rename from app/src/main/java/com/example/assignment1/dataActivity.java
rename to app/src/main/java/com/example/assignment1/Views/dataActivity.java
index 53827e3..38ac0f9 100644
--- a/app/src/main/java/com/example/assignment1/dataActivity.java
+++ b/app/src/main/java/com/example/assignment1/Views/dataActivity.java
@@ -1,4 +1,4 @@
-package com.example.assignment1;
+package com.example.assignment1.Views;
 
 import android.os.Bundle;
 import android.util.Log;
@@ -11,6 +11,11 @@ import android.widget.TextView;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 
+import com.example.assignment1.Controllers.CountSharedPreferenceHelper;
+import com.example.assignment1.Models.CounterButtonNames;
+import com.example.assignment1.Controllers.CounterButtonSharedPreferenceHelper;
+import com.example.assignment1.R;
+
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/app/src/main/res/layout/activity_data.xml b/app/src/main/res/layout/activity_data.xml
index a3e0c8a..8d21300 100644
--- a/app/src/main/res/layout/activity_data.xml
+++ b/app/src/main/res/layout/activity_data.xml
@@ -3,7 +3,7 @@
 xmlns:tools="http://schemas.android.com/tools"
 android:layout_width="match_parent"
 android:layout_height="match_parent"
-tools:context=".SettingsActivity">
+tools:context=".Views.SettingsActivity">
 
 <!-- Action Bar -->
 <androidx.appcompat.widget.Toolbar
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a68d072..71f7f3d 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -11,7 +11,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
 
-    tools:context=".MainActivity">
+    tools:context=".Views.MainActivity">
 
     <Button
         android:id="@+id/settings_button"
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 2594b36..0949d23 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".SettingsActivity">
+    tools:context=".Views.SettingsActivity">
 
     <!-- Action Bar -->
     <androidx.appcompat.widget.Toolbar