diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWayFormTest.java b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayForm.java
similarity index 96%
rename from app/src/main/java/com/sf/stormwaterutilityandroid/WaterWayFormTest.java
rename to app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayForm.java
index fe92fd3..a797f99 100644
--- a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWayFormTest.java
+++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayForm.java
@@ -1,10 +1,12 @@
-package com.sf.stormwaterutilityandroid;
+package com.sf.stormwaterutilityandroid.WaterWay;
 
 import android.os.Bundle;
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.sf.stormwaterutilityandroid.R;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -12,7 +14,7 @@
 import me.riddhimanadib.formmaster.model.BaseFormElement;
 import me.riddhimanadib.formmaster.model.FormElementTextNumber;
 
-public class WaterWayFormTest extends AppCompatActivity {
+public class WaterWayForm extends AppCompatActivity {
     //HQ form
     private FormBuilder formBuilder;
     private RecyclerView recyclerView;