diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 35051e0751..982682e035 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -168,7 +168,7 @@
             android:value="59d462666c664c57b29e1d79ea123e01f8057cfa" />
 
         <activity
-            android:name=".startupwizard.SetupWizardActivity"
+            android:name=".setupwizard.SetupWizardActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:theme="@style/AppTheme.SetupWizard"
             android:label="@string/title_activity_setup_wizard"></activity>
diff --git a/app/src/main/java/info/nightscout/androidaps/MainActivity.java b/app/src/main/java/info/nightscout/androidaps/MainActivity.java
index b0319a93c7..cdd5c59523 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/MainActivity.java
@@ -49,7 +49,7 @@ import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.Food.FoodPlugin;
 import info.nightscout.androidaps.plugins.Overview.events.EventSetWakeLock;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.startupwizard.SetupWizardActivity;
+import info.nightscout.androidaps.setupwizard.SetupWizardActivity;
 import info.nightscout.androidaps.tabs.SlidingTabLayout;
 import info.nightscout.androidaps.tabs.TabPageAdapter;
 import info.nightscout.utils.ImportExportPrefs;
diff --git a/app/src/main/java/info/nightscout/androidaps/startupwizard/SWDefinition.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.java
similarity index 95%
rename from app/src/main/java/info/nightscout/androidaps/startupwizard/SWDefinition.java
rename to app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.java
index 979a03d331..26e86cafa6 100644
--- a/app/src/main/java/info/nightscout/androidaps/startupwizard/SWDefinition.java
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.startupwizard;
+package info.nightscout.androidaps.setupwizard;
 
 import android.content.Intent;
 import android.support.v7.app.AppCompatActivity;
@@ -34,17 +34,17 @@ import info.nightscout.androidaps.plugins.ProfileNS.NSProfileFragment;
 import info.nightscout.androidaps.plugins.ProfileNS.NSProfilePlugin;
 import info.nightscout.androidaps.plugins.ProfileSimple.SimpleProfileFragment;
 import info.nightscout.androidaps.plugins.ProfileSimple.SimpleProfilePlugin;
-import info.nightscout.androidaps.startupwizard.elements.SWBreak;
-import info.nightscout.androidaps.startupwizard.elements.SWButton;
-import info.nightscout.androidaps.startupwizard.elements.SWFragment;
-import info.nightscout.androidaps.startupwizard.elements.SWHtmlLink;
-import info.nightscout.androidaps.startupwizard.elements.SWInfotext;
-import info.nightscout.androidaps.startupwizard.elements.SWPlugin;
-import info.nightscout.androidaps.startupwizard.elements.SWRadioButton;
-import info.nightscout.androidaps.startupwizard.elements.SWEditString;
-import info.nightscout.androidaps.startupwizard.elements.SWEditUrl;
-import info.nightscout.androidaps.startupwizard.events.EventSWLabel;
-import info.nightscout.androidaps.startupwizard.events.EventSWUpdate;
+import info.nightscout.androidaps.setupwizard.elements.SWBreak;
+import info.nightscout.androidaps.setupwizard.elements.SWButton;
+import info.nightscout.androidaps.setupwizard.elements.SWFragment;
+import info.nightscout.androidaps.setupwizard.elements.SWHtmlLink;
+import info.nightscout.androidaps.setupwizard.elements.SWInfotext;
+import info.nightscout.androidaps.setupwizard.elements.SWPlugin;
+import info.nightscout.androidaps.setupwizard.elements.SWRadioButton;
+import info.nightscout.androidaps.setupwizard.elements.SWEditString;
+import info.nightscout.androidaps.setupwizard.elements.SWEditUrl;
+import info.nightscout.androidaps.setupwizard.events.EventSWLabel;
+import info.nightscout.androidaps.setupwizard.events.EventSWUpdate;
 import info.nightscout.utils.ImportExportPrefs;
 import info.nightscout.utils.LocaleHelper;
 import info.nightscout.utils.PasswordProtection;
diff --git a/app/src/main/java/info/nightscout/androidaps/startupwizard/SWEventListener.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWEventListener.java
similarity index 91%
rename from app/src/main/java/info/nightscout/androidaps/startupwizard/SWEventListener.java
rename to app/src/main/java/info/nightscout/androidaps/setupwizard/SWEventListener.java
index a837325447..40979a3efd 100644
--- a/app/src/main/java/info/nightscout/androidaps/startupwizard/SWEventListener.java
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWEventListener.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.startupwizard;
+package info.nightscout.androidaps.setupwizard;
 
 import android.content.Context;
 import android.view.View;
@@ -11,8 +11,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.startupwizard.elements.SWItem;
-import info.nightscout.androidaps.startupwizard.events.EventSWLabel;
+import info.nightscout.androidaps.setupwizard.elements.SWItem;
+import info.nightscout.androidaps.setupwizard.events.EventSWLabel;
 
 
 public class SWEventListener extends SWItem {
diff --git a/app/src/main/java/info/nightscout/androidaps/startupwizard/SWScreen.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWScreen.java
similarity index 89%
rename from app/src/main/java/info/nightscout/androidaps/startupwizard/SWScreen.java
rename to app/src/main/java/info/nightscout/androidaps/setupwizard/SWScreen.java
index 7e68055557..5c7b10315f 100644
--- a/app/src/main/java/info/nightscout/androidaps/startupwizard/SWScreen.java
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWScreen.java
@@ -1,10 +1,10 @@
-package info.nightscout.androidaps.startupwizard;
+package info.nightscout.androidaps.setupwizard;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.startupwizard.elements.SWItem;
+import info.nightscout.androidaps.setupwizard.elements.SWItem;
 
 public class SWScreen {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/startupwizard/SWTextValidator.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWTextValidator.java
similarity index 59%
rename from app/src/main/java/info/nightscout/androidaps/startupwizard/SWTextValidator.java
rename to app/src/main/java/info/nightscout/androidaps/setupwizard/SWTextValidator.java
index 6c91967574..427afbd45d 100644
--- a/app/src/main/java/info/nightscout/androidaps/startupwizard/SWTextValidator.java
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWTextValidator.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.startupwizard;
+package info.nightscout.androidaps.setupwizard;
 
 public interface SWTextValidator {
     boolean isValid(String text);
diff --git a/app/src/main/java/info/nightscout/androidaps/startupwizard/SWValidator.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWValidator.java
similarity index 53%
rename from app/src/main/java/info/nightscout/androidaps/startupwizard/SWValidator.java
rename to app/src/main/java/info/nightscout/androidaps/setupwizard/SWValidator.java
index e1fce21478..3cc8d6b0c1 100644
--- a/app/src/main/java/info/nightscout/androidaps/startupwizard/SWValidator.java
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWValidator.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.startupwizard;
+package info.nightscout.androidaps.setupwizard;
 
 public interface SWValidator {
     boolean isValid();
diff --git a/app/src/main/java/info/nightscout/androidaps/startupwizard/SetupWizardActivity.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/startupwizard/SetupWizardActivity.java
rename to app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.java
index 8e0d9e978c..68ebcafdad 100644
--- a/app/src/main/java/info/nightscout/androidaps/startupwizard/SetupWizardActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.startupwizard;
+package info.nightscout.androidaps.setupwizard;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -22,8 +22,8 @@ import info.nightscout.androidaps.events.EventProfileSwitchChange;
 import info.nightscout.androidaps.events.EventPumpStatusChanged;
 import info.nightscout.androidaps.plugins.ConstraintsObjectives.events.EventObjectivesSaved;
 import info.nightscout.androidaps.plugins.NSClientInternal.events.EventNSClientStatus;
-import info.nightscout.androidaps.startupwizard.elements.SWItem;
-import info.nightscout.androidaps.startupwizard.events.EventSWUpdate;
+import info.nightscout.androidaps.setupwizard.elements.SWItem;
+import info.nightscout.androidaps.setupwizard.events.EventSWUpdate;
 import info.nightscout.utils.LocaleHelper;
 import info.nightscout.utils.OKDialog;
 import info.nightscout.utils.SP;
diff --git a/app/src/main/java/info/nightscout/androidaps/startupwizard/elements/SWBreak.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWBreak.java
similarity index 89%
rename from app/src/main/java/info/nightscout/androidaps/startupwizard/elements/SWBreak.java
rename to app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWBreak.java
index 7fe141682c..f513cccf4e 100644
--- a/app/src/main/java/info/nightscout/androidaps/startupwizard/elements/SWBreak.java
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWBreak.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.startupwizard.elements;
+package info.nightscout.androidaps.setupwizard.elements;
 
 import android.content.Context;
 import android.view.View;
@@ -8,7 +8,7 @@ import android.widget.TextView;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import info.nightscout.androidaps.startupwizard.SWValidator;
+import info.nightscout.androidaps.setupwizard.SWValidator;
 
 
 public class SWBreak extends SWItem {
diff --git a/app/src/main/java/info/nightscout/androidaps/startupwizard/elements/SWButton.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWButton.java
similarity index 92%
rename from app/src/main/java/info/nightscout/androidaps/startupwizard/elements/SWButton.java
rename to app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWButton.java
index 5b2c73c3e0..4f22720091 100644
--- a/app/src/main/java/info/nightscout/androidaps/startupwizard/elements/SWButton.java
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWButton.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.startupwizard.elements;
+package info.nightscout.androidaps.setupwizard.elements;
 
 import android.content.Context;
 import android.view.View;
@@ -8,7 +8,7 @@ import android.widget.LinearLayout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import info.nightscout.androidaps.startupwizard.SWValidator;
+import info.nightscout.androidaps.setupwizard.SWValidator;
 
 public class SWButton extends SWItem {
     private static Logger log = LoggerFactory.getLogger(SWButton.class);
diff --git a/app/src/main/java/info/nightscout/androidaps/startupwizard/elements/SWCheckbox.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWCheckbox.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/startupwizard/elements/SWCheckbox.java
rename to app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWCheckbox.java
index d0fbf836b6..816fb79a97 100644
--- a/app/src/main/java/info/nightscout/androidaps/startupwizard/elements/SWCheckbox.java
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWCheckbox.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.startupwizard.elements;
+package info.nightscout.androidaps.setupwizard.elements;
 
 import android.content.Context;
 import android.view.View;
diff --git a/app/src/main/java/info/nightscout/androidaps/startupwizard/elements/SWEditString.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditString.java
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/startupwizard/elements/SWEditString.java
rename to app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditString.java
index a77bc3d1c8..b464ae6316 100644
--- a/app/src/main/java/info/nightscout/androidaps/startupwizard/elements/SWEditString.java
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditString.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.startupwizard.elements;
+package info.nightscout.androidaps.setupwizard.elements;
 
 import android.content.Context;
 import android.graphics.Typeface;
@@ -13,7 +13,7 @@ import android.widget.TextView;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import info.nightscout.androidaps.startupwizard.SWTextValidator;
+import info.nightscout.androidaps.setupwizard.SWTextValidator;
 import info.nightscout.utils.SP;
 
 
diff --git a/app/src/main/java/info/nightscout/androidaps/startupwizard/elements/SWEditUrl.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditUrl.java
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/startupwizard/elements/SWEditUrl.java
rename to app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditUrl.java
index 96b0322299..6039577bff 100644
--- a/app/src/main/java/info/nightscout/androidaps/startupwizard/elements/SWEditUrl.java
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditUrl.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.startupwizard.elements;
+package info.nightscout.androidaps.setupwizard.elements;
 
 import android.content.Context;
 import android.graphics.Typeface;
@@ -16,7 +16,7 @@ import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.startupwizard.events.EventSWLabel;
+import info.nightscout.androidaps.setupwizard.events.EventSWLabel;
 import info.nightscout.utils.SP;
 
 public class SWEditUrl extends SWItem {
diff --git a/app/src/main/java/info/nightscout/androidaps/startupwizard/elements/SWFragment.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWFragment.java
similarity index 86%
rename from app/src/main/java/info/nightscout/androidaps/startupwizard/elements/SWFragment.java
rename to app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWFragment.java
index 92f5e48cb2..9e470fa687 100644
--- a/app/src/main/java/info/nightscout/androidaps/startupwizard/elements/SWFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWFragment.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.startupwizard.elements;
+package info.nightscout.androidaps.setupwizard.elements;
 
 import android.support.v4.app.Fragment;
 import android.view.View;
@@ -7,7 +7,7 @@ import android.widget.LinearLayout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import info.nightscout.androidaps.startupwizard.SWDefinition;
+import info.nightscout.androidaps.setupwizard.SWDefinition;
 
 
 public class SWFragment extends SWItem {
diff --git a/app/src/main/java/info/nightscout/androidaps/startupwizard/elements/SWHtmlLink.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWHtmlLink.java
similarity index 92%
rename from app/src/main/java/info/nightscout/androidaps/startupwizard/elements/SWHtmlLink.java
rename to app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWHtmlLink.java
index 903648748d..1ee27be6ae 100644
--- a/app/src/main/java/info/nightscout/androidaps/startupwizard/elements/SWHtmlLink.java
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWHtmlLink.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.startupwizard.elements;
+package info.nightscout.androidaps.setupwizard.elements;
 
 import android.content.Context;
 import android.text.util.Linkify;
@@ -9,7 +9,7 @@ import android.widget.TextView;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import info.nightscout.androidaps.startupwizard.SWValidator;
+import info.nightscout.androidaps.setupwizard.SWValidator;
 
 
 public class SWHtmlLink extends SWItem {
diff --git a/app/src/main/java/info/nightscout/androidaps/startupwizard/elements/SWInfotext.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWInfotext.java
similarity index 92%
rename from app/src/main/java/info/nightscout/androidaps/startupwizard/elements/SWInfotext.java
rename to app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWInfotext.java
index 8b115367a5..f98fbee82f 100644
--- a/app/src/main/java/info/nightscout/androidaps/startupwizard/elements/SWInfotext.java
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWInfotext.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.startupwizard.elements;
+package info.nightscout.androidaps.setupwizard.elements;
 
 import android.content.Context;
 import android.view.View;
@@ -8,7 +8,7 @@ import android.widget.TextView;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import info.nightscout.androidaps.startupwizard.SWValidator;
+import info.nightscout.androidaps.setupwizard.SWValidator;
 
 
 public class SWInfotext extends SWItem {
diff --git a/app/src/main/java/info/nightscout/androidaps/startupwizard/elements/SWItem.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWItem.java
similarity index 93%
rename from app/src/main/java/info/nightscout/androidaps/startupwizard/elements/SWItem.java
rename to app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWItem.java
index 2d6095c6e1..c82d4f5683 100644
--- a/app/src/main/java/info/nightscout/androidaps/startupwizard/elements/SWItem.java
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWItem.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.startupwizard.elements;
+package info.nightscout.androidaps.setupwizard.elements;
 
 import android.view.View;
 import android.widget.LinearLayout;
@@ -8,7 +8,7 @@ import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.events.EventPreferenceChange;
-import info.nightscout.androidaps.startupwizard.events.EventSWUpdate;
+import info.nightscout.androidaps.setupwizard.events.EventSWUpdate;
 import info.nightscout.utils.SP;
 
 public class SWItem {
diff --git a/app/src/main/java/info/nightscout/androidaps/startupwizard/elements/SWPlugin.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWPlugin.java
similarity index 95%
rename from app/src/main/java/info/nightscout/androidaps/startupwizard/elements/SWPlugin.java
rename to app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWPlugin.java
index 55e2ebf65f..b9519bc9b5 100644
--- a/app/src/main/java/info/nightscout/androidaps/startupwizard/elements/SWPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWPlugin.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.startupwizard.elements;
+package info.nightscout.androidaps.setupwizard.elements;
 
 import android.content.Context;
 import android.view.View;
@@ -17,7 +17,7 @@ import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderFragment;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.startupwizard.events.EventSWUpdate;
+import info.nightscout.androidaps.setupwizard.events.EventSWUpdate;
 
 public class SWPlugin extends SWItem {
     private static Logger log = LoggerFactory.getLogger(SWPlugin.class);
diff --git a/app/src/main/java/info/nightscout/androidaps/startupwizard/elements/SWRadioButton.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWRadioButton.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/startupwizard/elements/SWRadioButton.java
rename to app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWRadioButton.java
index 9ff7ac5f9c..e034e86ba8 100644
--- a/app/src/main/java/info/nightscout/androidaps/startupwizard/elements/SWRadioButton.java
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWRadioButton.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.startupwizard.elements;
+package info.nightscout.androidaps.setupwizard.elements;
 
 import android.content.Context;
 import android.view.View;
diff --git a/app/src/main/java/info/nightscout/androidaps/startupwizard/events/EventSWLabel.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/events/EventSWLabel.java
similarity index 77%
rename from app/src/main/java/info/nightscout/androidaps/startupwizard/events/EventSWLabel.java
rename to app/src/main/java/info/nightscout/androidaps/setupwizard/events/EventSWLabel.java
index 3d9bd86cc8..f0f4ff7628 100644
--- a/app/src/main/java/info/nightscout/androidaps/startupwizard/events/EventSWLabel.java
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/events/EventSWLabel.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.startupwizard.events;
+package info.nightscout.androidaps.setupwizard.events;
 
 import info.nightscout.androidaps.events.Event;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/startupwizard/events/EventSWUpdate.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/events/EventSWUpdate.java
similarity index 81%
rename from app/src/main/java/info/nightscout/androidaps/startupwizard/events/EventSWUpdate.java
rename to app/src/main/java/info/nightscout/androidaps/setupwizard/events/EventSWUpdate.java
index 0cae3d618c..181960ac40 100644
--- a/app/src/main/java/info/nightscout/androidaps/startupwizard/events/EventSWUpdate.java
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/events/EventSWUpdate.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.startupwizard.events;
+package info.nightscout.androidaps.setupwizard.events;
 
 import info.nightscout.androidaps.events.Event;
 
diff --git a/app/src/main/res/layout/activity_setupwizard.xml b/app/src/main/res/layout/activity_setupwizard.xml
index 6141bd53b6..e47762631c 100644
--- a/app/src/main/res/layout/activity_setupwizard.xml
+++ b/app/src/main/res/layout/activity_setupwizard.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".startupwizard.SetupWizardActivity">
+    tools:context=".setupwizard.SetupWizardActivity">
 
     <ImageButton
         android:layout_width="wrap_content"