diff --git a/opensrp-gizi/src/main/AndroidManifest.xml b/opensrp-gizi/src/main/AndroidManifest.xml
index b3f2f6f..bf76be0 100644
--- a/opensrp-gizi/src/main/AndroidManifest.xml
+++ b/opensrp-gizi/src/main/AndroidManifest.xml
@@ -50,7 +50,7 @@
             android:theme="@style/AppThemeNoActionBarAndTitle"
             android:windowSoftInputMode="adjustResize"
             android:screenOrientation="landscape"/>
-        <activity android:name=".giziIbu.IbuSmartRegisterActivity"
+        <activity android:name=".activity.IbuSmartRegisterActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:theme="@style/AppThemeNoActionBarAndTitle"
             android:windowSoftInputMode="adjustResize"
diff --git a/opensrp-gizi/src/main/java/org/smartregister/gizi/giziIbu/IbuSmartRegisterActivity.java b/opensrp-gizi/src/main/java/org/smartregister/gizi/activity/IbuSmartRegisterActivity.java
similarity index 98%
rename from opensrp-gizi/src/main/java/org/smartregister/gizi/giziIbu/IbuSmartRegisterActivity.java
rename to opensrp-gizi/src/main/java/org/smartregister/gizi/activity/IbuSmartRegisterActivity.java
index a2a60bd..870e1cc 100644
--- a/opensrp-gizi/src/main/java/org/smartregister/gizi/giziIbu/IbuSmartRegisterActivity.java
+++ b/opensrp-gizi/src/main/java/org/smartregister/gizi/activity/IbuSmartRegisterActivity.java
@@ -1,4 +1,4 @@
-package org.smartregister.gizi.giziIbu;
+package org.smartregister.gizi.activity;
 
 import android.app.AlertDialog;
 import android.content.DialogInterface;
@@ -13,7 +13,6 @@
 
 import org.smartregister.domain.form.FieldOverrides;
 import org.smartregister.domain.form.FormSubmission;
-import org.smartregister.gizi.activity.LoginActivity;
 import org.smartregister.gizi.R;
 import org.smartregister.gizi.fragment.GiziIbuSmartRegisterFragment;
 import org.smartregister.gizi.pageradapter.BaseRegisterActivityPagerAdapter;
@@ -32,8 +31,7 @@
 import org.json.JSONObject;
 
 import org.smartregister.enketo.view.fragment.DisplayFormFragment;
-import org.smartregister.view.fragment.SecuredNativeSmartRegisterFragment;
-import org.smartregister.view.viewpager.OpenSRPViewPager;
+
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
diff --git a/opensrp-gizi/src/main/java/org/smartregister/gizi/controller/GiziNavigationController.java b/opensrp-gizi/src/main/java/org/smartregister/gizi/controller/GiziNavigationController.java
index 4a9c0d0..bc5537a 100644
--- a/opensrp-gizi/src/main/java/org/smartregister/gizi/controller/GiziNavigationController.java
+++ b/opensrp-gizi/src/main/java/org/smartregister/gizi/controller/GiziNavigationController.java
@@ -2,20 +2,16 @@
 
 import android.app.Activity;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.net.Uri;
 
 
 //import org.ei.opensrp.gizi.test.TestSmartRegisterActivity;
 import org.smartregister.gizi.R;
 import org.smartregister.gizi.activity.GiziSmartRegisterActivity;
-import org.smartregister.gizi.giziIbu.IbuSmartRegisterActivity;
+import org.smartregister.gizi.activity.IbuSmartRegisterActivity;
 import org.smartregister.view.controller.ANMController;
 import org.json.JSONObject;
 
-
-import static android.preference.PreferenceManager.getDefaultSharedPreferences;
-
 public class GiziNavigationController extends org.smartregister.view.controller.NavigationController {
     private Activity activity;
     private ANMController anmController;
diff --git a/opensrp-gizi/src/main/java/org/smartregister/gizi/fragment/GiziIbuSmartRegisterFragment.java b/opensrp-gizi/src/main/java/org/smartregister/gizi/fragment/GiziIbuSmartRegisterFragment.java
index 5dee108..977cc55 100644
--- a/opensrp-gizi/src/main/java/org/smartregister/gizi/fragment/GiziIbuSmartRegisterFragment.java
+++ b/opensrp-gizi/src/main/java/org/smartregister/gizi/fragment/GiziIbuSmartRegisterFragment.java
@@ -3,17 +3,13 @@
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.os.Parcelable;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
 import android.view.View;
 import android.widget.EditText;
 
-import com.flurry.android.FlurryAgent;
-
 import org.smartregister.Context;
-import org.smartregister.commonregistry.CommonPersonObjectClient;
 import org.smartregister.commonregistry.CommonPersonObjectController;
 import org.smartregister.commonregistry.CommonRepository;
 import org.smartregister.cursoradapter.CursorCommonObjectFilterOption;
@@ -23,11 +19,9 @@
 import org.smartregister.cursoradapter.SmartRegisterPaginatedCursorAdapter;
 import org.smartregister.cursoradapter.SmartRegisterQueryBuilder;
 import org.smartregister.gizi.R;
-import org.smartregister.gizi.giziIbu.IbuServiceModeOption;
-import org.smartregister.gizi.giziIbu.IbuSmartClientsProvider;
-import org.smartregister.gizi.giziIbu.IbuSmartRegisterActivity;
-import org.smartregister.gizi.giziIbu.KICommonObjectFilterOption;
-import org.smartregister.gizi.provider.ChildSmartClientsProvider;
+import org.smartregister.gizi.option.IbuServiceModeOption;
+import org.smartregister.gizi.provider.IbuSmartClientsProvider;
+import org.smartregister.gizi.activity.IbuSmartRegisterActivity;
 import org.smartregister.provider.SmartRegisterClientsProvider;
 import org.smartregister.sync.ClientProcessor;
 import org.smartregister.util.StringUtil;
@@ -42,7 +36,6 @@
 import org.smartregister.view.dialog.DialogOptionModel;
 import org.smartregister.view.dialog.EditOption;
 import org.smartregister.view.dialog.FilterOption;
-import org.smartregister.view.dialog.NameSort;
 import org.smartregister.view.dialog.ServiceModeOption;
 import org.smartregister.view.dialog.SortOption;
 import org.opensrp.api.domain.Location;
@@ -191,6 +184,7 @@ public void setupViews(View view) {
         super.setupViews(view);
         view.findViewById(R.id.btn_report_month).setVisibility(INVISIBLE);
         view.findViewById(R.id.service_mode_selection).setVisibility(View.GONE);
+        view.findViewById(R.id.register_client).setVisibility(View.GONE);
         clientsView.setVisibility(View.VISIBLE);
         clientsProgressView.setVisibility(View.INVISIBLE);
 //        list.setBackgroundColor(Color.RED);
diff --git a/opensrp-gizi/src/main/java/org/smartregister/gizi/giziIbu/IbuServiceModeOption.java b/opensrp-gizi/src/main/java/org/smartregister/gizi/option/IbuServiceModeOption.java
similarity index 98%
rename from opensrp-gizi/src/main/java/org/smartregister/gizi/giziIbu/IbuServiceModeOption.java
rename to opensrp-gizi/src/main/java/org/smartregister/gizi/option/IbuServiceModeOption.java
index 5c57881..c1ff8ec 100644
--- a/opensrp-gizi/src/main/java/org/smartregister/gizi/giziIbu/IbuServiceModeOption.java
+++ b/opensrp-gizi/src/main/java/org/smartregister/gizi/option/IbuServiceModeOption.java
@@ -1,4 +1,4 @@
-package org.smartregister.gizi.giziIbu;
+package org.smartregister.gizi.option;
 
 import android.view.View;
 
diff --git a/opensrp-gizi/src/main/java/org/smartregister/gizi/giziIbu/IbuSmartClientsProvider.java b/opensrp-gizi/src/main/java/org/smartregister/gizi/provider/IbuSmartClientsProvider.java
similarity index 99%
rename from opensrp-gizi/src/main/java/org/smartregister/gizi/giziIbu/IbuSmartClientsProvider.java
rename to opensrp-gizi/src/main/java/org/smartregister/gizi/provider/IbuSmartClientsProvider.java
index 275a7c5..65185db 100644
--- a/opensrp-gizi/src/main/java/org/smartregister/gizi/giziIbu/IbuSmartClientsProvider.java
+++ b/opensrp-gizi/src/main/java/org/smartregister/gizi/provider/IbuSmartClientsProvider.java
@@ -1,4 +1,4 @@
-package org.smartregister.gizi.giziIbu;
+package org.smartregister.gizi.provider;
 
 import android.app.Activity;
 import android.content.Context;