diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
index 13193fb..1092eb1 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -14,7 +14,7 @@
         android:supportsRtl="true"
         android:theme="@style/NameGameAppTheme">
         <activity
-            android:name=".MainActivity"
+            android:name=".ui.MainActivity"
             android:label="@string/app_name"
             android:screenOrientation="portrait"
             android:theme="@style/NameGameAppTheme">
diff --git a/android/src/main/java/org/reduxkotlin/namegame/AndroidNavigator.kt b/android/src/main/java/org/reduxkotlin/namegame/AndroidNavigator.kt
index a496392..dd7a369 100644
--- a/android/src/main/java/org/reduxkotlin/namegame/AndroidNavigator.kt
+++ b/android/src/main/java/org/reduxkotlin/namegame/AndroidNavigator.kt
@@ -8,7 +8,7 @@ import androidx.navigation.findNavController
 import org.reduxkotlin.namegame.common.util.Logger
 import org.reduxkotlin.namegame.common.middleware.Navigator
 import org.reduxkotlin.namegame.common.middleware.Screen
-import org.reduxkotlin.namegame.store.SettingsDialogFragment
+import org.reduxkotlin.namegame.ui.SettingsDialogFragment
 import java.lang.Exception
 
 /**
diff --git a/android/src/main/java/org/reduxkotlin/namegame/RoundedCornersTransformation.java b/android/src/main/java/org/reduxkotlin/namegame/RoundedCornersTransformation.java
deleted file mode 100644
index 4de537c..0000000
--- a/android/src/main/java/org/reduxkotlin/namegame/RoundedCornersTransformation.java
+++ /dev/null
@@ -1,281 +0,0 @@
-package org.reduxkotlin.namegame;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.BitmapShader;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.RectF;
-import android.graphics.Shader;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.Transformation;
-import com.bumptech.glide.load.engine.Resource;
-import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
-import com.bumptech.glide.load.resource.bitmap.BitmapResource;
-
-import java.security.MessageDigest;
-
-
-public class RoundedCornersTransformation implements Transformation<Bitmap> {
-
-    public enum CornerType {
-        ALL,
-        TOP_LEFT, TOP_RIGHT, BOTTOM_LEFT, BOTTOM_RIGHT,
-        TOP, BOTTOM, LEFT, RIGHT,
-        OTHER_TOP_LEFT, OTHER_TOP_RIGHT, OTHER_BOTTOM_LEFT, OTHER_BOTTOM_RIGHT,
-        DIAGONAL_FROM_TOP_LEFT, DIAGONAL_FROM_TOP_RIGHT, BORDER
-    }
-
-    private BitmapPool mBitmapPool;
-    private int mRadius;
-    private int mDiameter;
-    private int mMargin;
-    private CornerType mCornerType;
-    private String mColor;
-    private int mBorder;
-
-    public RoundedCornersTransformation(Context context, int radius, int margin) {
-        this(context, radius, margin, CornerType.ALL);
-    }
-
-    public RoundedCornersTransformation(Context context, int radius, int margin, String color, int border) {
-        this(context, radius, margin, CornerType.BORDER);
-        mColor = color;
-        mBorder = border;
-    }
-
-    public RoundedCornersTransformation(BitmapPool pool, int radius, int margin) {
-        this(pool, radius, margin, CornerType.ALL);
-    }
-
-    public RoundedCornersTransformation(Context context, int radius, int margin,
-                                        CornerType cornerType) {
-        this(Glide.get(context).getBitmapPool(), radius, margin, cornerType);
-    }
-
-    public RoundedCornersTransformation(BitmapPool pool, int radius, int margin,
-                                        CornerType cornerType) {
-        mBitmapPool = pool;
-        mRadius = radius;
-        mDiameter = mRadius * 2;
-        mMargin = margin;
-        mCornerType = cornerType;
-    }
-
-    @Override
-    public Resource<Bitmap> transform(Context context, Resource<Bitmap> resource, int outWidth, int outHeight) {
-        Bitmap source = resource.get();
-
-        int width = source.getWidth();
-        int height = source.getHeight();
-
-        Bitmap bitmap = mBitmapPool.get(width, height, Bitmap.Config.ARGB_8888);
-        if (bitmap == null) {
-            bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-        }
-
-        Canvas canvas = new Canvas(bitmap);
-        Paint paint = new Paint();
-        paint.setAntiAlias(true);
-        paint.setShader(new BitmapShader(source, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP));
-        drawRoundRect(canvas, paint, width, height);
-        return BitmapResource.obtain(bitmap, mBitmapPool);
-    }
-
-    private void drawRoundRect(Canvas canvas, Paint paint, float width, float height) {
-        float right = width - mMargin;
-        float bottom = height - mMargin;
-
-        switch (mCornerType) {
-            case ALL:
-                canvas.drawRoundRect(new RectF(mMargin, mMargin, right, bottom), mRadius, mRadius, paint);
-                break;
-            case TOP_LEFT:
-                drawTopLeftRoundRect(canvas, paint, right, bottom);
-                break;
-            case TOP_RIGHT:
-                drawTopRightRoundRect(canvas, paint, right, bottom);
-                break;
-            case BOTTOM_LEFT:
-                drawBottomLeftRoundRect(canvas, paint, right, bottom);
-                break;
-            case BOTTOM_RIGHT:
-                drawBottomRightRoundRect(canvas, paint, right, bottom);
-                break;
-            case TOP:
-                drawTopRoundRect(canvas, paint, right, bottom);
-                break;
-            case BOTTOM:
-                drawBottomRoundRect(canvas, paint, right, bottom);
-                break;
-            case LEFT:
-                drawLeftRoundRect(canvas, paint, right, bottom);
-                break;
-            case RIGHT:
-                drawRightRoundRect(canvas, paint, right, bottom);
-                break;
-            case OTHER_TOP_LEFT:
-                drawOtherTopLeftRoundRect(canvas, paint, right, bottom);
-                break;
-            case OTHER_TOP_RIGHT:
-                drawOtherTopRightRoundRect(canvas, paint, right, bottom);
-                break;
-            case OTHER_BOTTOM_LEFT:
-                drawOtherBottomLeftRoundRect(canvas, paint, right, bottom);
-                break;
-            case OTHER_BOTTOM_RIGHT:
-                drawOtherBottomRightRoundRect(canvas, paint, right, bottom);
-                break;
-            case DIAGONAL_FROM_TOP_LEFT:
-                drawDiagonalFromTopLeftRoundRect(canvas, paint, right, bottom);
-                break;
-            case DIAGONAL_FROM_TOP_RIGHT:
-                drawDiagonalFromTopRightRoundRect(canvas, paint, right, bottom);
-                break;
-            case BORDER:
-                drawBorder(canvas, paint, right, bottom);
-                break;
-            default:
-                canvas.drawRoundRect(new RectF(mMargin, mMargin, right, bottom), mRadius, mRadius, paint);
-                break;
-        }
-    }
-
-    private void drawTopLeftRoundRect(Canvas canvas, Paint paint, float right, float bottom) {
-        canvas.drawRoundRect(new RectF(mMargin, mMargin, mMargin + mDiameter, mMargin + mDiameter),
-                mRadius, mRadius, paint);
-        canvas.drawRect(new RectF(mMargin, mMargin + mRadius, mMargin + mRadius, bottom), paint);
-        canvas.drawRect(new RectF(mMargin + mRadius, mMargin, right, bottom), paint);
-    }
-
-    private void drawTopRightRoundRect(Canvas canvas, Paint paint, float right, float bottom) {
-        canvas.drawRoundRect(new RectF(right - mDiameter, mMargin, right, mMargin + mDiameter), mRadius,
-                mRadius, paint);
-        canvas.drawRect(new RectF(mMargin, mMargin, right - mRadius, bottom), paint);
-        canvas.drawRect(new RectF(right - mRadius, mMargin + mRadius, right, bottom), paint);
-    }
-
-    private void drawBottomLeftRoundRect(Canvas canvas, Paint paint, float right, float bottom) {
-        canvas.drawRoundRect(new RectF(mMargin, bottom - mDiameter, mMargin + mDiameter, bottom),
-                mRadius, mRadius, paint);
-        canvas.drawRect(new RectF(mMargin, mMargin, mMargin + mDiameter, bottom - mRadius), paint);
-        canvas.drawRect(new RectF(mMargin + mRadius, mMargin, right, bottom), paint);
-    }
-
-    private void drawBottomRightRoundRect(Canvas canvas, Paint paint, float right, float bottom) {
-        canvas.drawRoundRect(new RectF(right - mDiameter, bottom - mDiameter, right, bottom), mRadius,
-                mRadius, paint);
-        canvas.drawRect(new RectF(mMargin, mMargin, right - mRadius, bottom), paint);
-        canvas.drawRect(new RectF(right - mRadius, mMargin, right, bottom - mRadius), paint);
-    }
-
-    private void drawTopRoundRect(Canvas canvas, Paint paint, float right, float bottom) {
-        canvas.drawRoundRect(new RectF(mMargin, mMargin, right, mMargin + mDiameter), mRadius, mRadius,
-                paint);
-        canvas.drawRect(new RectF(mMargin, mMargin + mRadius, right, bottom), paint);
-    }
-
-    private void drawBottomRoundRect(Canvas canvas, Paint paint, float right, float bottom) {
-        canvas.drawRoundRect(new RectF(mMargin, bottom - mDiameter, right, bottom), mRadius, mRadius,
-                paint);
-        canvas.drawRect(new RectF(mMargin, mMargin, right, bottom - mRadius), paint);
-    }
-
-    private void drawLeftRoundRect(Canvas canvas, Paint paint, float right, float bottom) {
-        canvas.drawRoundRect(new RectF(mMargin, mMargin, mMargin + mDiameter, bottom), mRadius, mRadius,
-                paint);
-        canvas.drawRect(new RectF(mMargin + mRadius, mMargin, right, bottom), paint);
-    }
-
-    private void drawRightRoundRect(Canvas canvas, Paint paint, float right, float bottom) {
-        canvas.drawRoundRect(new RectF(right - mDiameter, mMargin, right, bottom), mRadius, mRadius,
-                paint);
-        canvas.drawRect(new RectF(mMargin, mMargin, right - mRadius, bottom), paint);
-    }
-
-    private void drawOtherTopLeftRoundRect(Canvas canvas, Paint paint, float right, float bottom) {
-        canvas.drawRoundRect(new RectF(mMargin, bottom - mDiameter, right, bottom), mRadius, mRadius,
-                paint);
-        canvas.drawRoundRect(new RectF(right - mDiameter, mMargin, right, bottom), mRadius, mRadius,
-                paint);
-        canvas.drawRect(new RectF(mMargin, mMargin, right - mRadius, bottom - mRadius), paint);
-    }
-
-    private void drawOtherTopRightRoundRect(Canvas canvas, Paint paint, float right, float bottom) {
-        canvas.drawRoundRect(new RectF(mMargin, mMargin, mMargin + mDiameter, bottom), mRadius, mRadius,
-                paint);
-        canvas.drawRoundRect(new RectF(mMargin, bottom - mDiameter, right, bottom), mRadius, mRadius,
-                paint);
-        canvas.drawRect(new RectF(mMargin + mRadius, mMargin, right, bottom - mRadius), paint);
-    }
-
-    private void drawOtherBottomLeftRoundRect(Canvas canvas, Paint paint, float right, float bottom) {
-        canvas.drawRoundRect(new RectF(mMargin, mMargin, right, mMargin + mDiameter), mRadius, mRadius,
-                paint);
-        canvas.drawRoundRect(new RectF(right - mDiameter, mMargin, right, bottom), mRadius, mRadius,
-                paint);
-        canvas.drawRect(new RectF(mMargin, mMargin + mRadius, right - mRadius, bottom), paint);
-    }
-
-    private void drawOtherBottomRightRoundRect(Canvas canvas, Paint paint, float right,
-                                               float bottom) {
-        canvas.drawRoundRect(new RectF(mMargin, mMargin, right, mMargin + mDiameter), mRadius, mRadius,
-                paint);
-        canvas.drawRoundRect(new RectF(mMargin, mMargin, mMargin + mDiameter, bottom), mRadius, mRadius,
-                paint);
-        canvas.drawRect(new RectF(mMargin + mRadius, mMargin + mRadius, right, bottom), paint);
-    }
-
-    private void drawDiagonalFromTopLeftRoundRect(Canvas canvas, Paint paint, float right,
-                                                  float bottom) {
-        canvas.drawRoundRect(new RectF(mMargin, mMargin, mMargin + mDiameter, mMargin + mDiameter),
-                mRadius, mRadius, paint);
-        canvas.drawRoundRect(new RectF(right - mDiameter, bottom - mDiameter, right, bottom), mRadius,
-                mRadius, paint);
-        canvas.drawRect(new RectF(mMargin, mMargin + mRadius, right - mDiameter, bottom), paint);
-        canvas.drawRect(new RectF(mMargin + mDiameter, mMargin, right, bottom - mRadius), paint);
-    }
-
-    private void drawDiagonalFromTopRightRoundRect(Canvas canvas, Paint paint, float right,
-                                                   float bottom) {
-        canvas.drawRoundRect(new RectF(right - mDiameter, mMargin, right, mMargin + mDiameter), mRadius,
-                mRadius, paint);
-        canvas.drawRoundRect(new RectF(mMargin, bottom - mDiameter, mMargin + mDiameter, bottom),
-                mRadius, mRadius, paint);
-        canvas.drawRect(new RectF(mMargin, mMargin, right - mRadius, bottom - mRadius), paint);
-        canvas.drawRect(new RectF(mMargin + mRadius, mMargin + mRadius, right, bottom), paint);
-    }
-
-    private void drawBorder(Canvas canvas, Paint paint, float right,
-                            float bottom) {
-
-        // stroke
-        Paint strokePaint = new Paint();
-        strokePaint.setStyle(Paint.Style.STROKE);
-        if (mColor != null) {
-            strokePaint.setColor(Color.parseColor(mColor));
-        } else {
-            strokePaint.setColor(Color.BLACK);
-        }
-        strokePaint.setStrokeWidth(mBorder);
-
-        canvas.drawRoundRect(new RectF(mMargin, mMargin, right, bottom), mRadius, mRadius, paint);
-
-        // stroke
-        canvas.drawRoundRect(new RectF(mMargin, mMargin, right, bottom), mRadius, mRadius, strokePaint);
-    }
-
-
-    @Override
-    public void updateDiskCacheKey(MessageDigest messageDigest) {
-
-    }
-
-    public String getId() {
-        return "RoundedTransformation(radius=" + mRadius + ", margin=" + mMargin + ", diameter="
-                + mDiameter + ", cornerType=" + mCornerType.name() + ")";
-    }
-}
-
diff --git a/android/src/main/java/org/reduxkotlin/namegame/Utils.kt b/android/src/main/java/org/reduxkotlin/namegame/Utils.kt
index 4282403..d6e84ea 100644
--- a/android/src/main/java/org/reduxkotlin/namegame/Utils.kt
+++ b/android/src/main/java/org/reduxkotlin/namegame/Utils.kt
@@ -8,7 +8,7 @@ import com.bumptech.glide.load.DataSource
 import com.bumptech.glide.load.engine.GlideException
 import com.bumptech.glide.request.RequestListener
 import com.bumptech.glide.request.target.Target
-import org.reduxkotlin.namegame.GlideRequest
+import org.reduxkotlin.namegame.ui.GlideRequest
 
 val Int.dp: Int
     get() = (this / Resources.getSystem().displayMetrics.density).toInt()
diff --git a/android/src/main/java/org/reduxkotlin/namegame/store/BaseNameGameViewFragment.kt b/android/src/main/java/org/reduxkotlin/namegame/ui/BaseNameGameViewFragment.kt
similarity index 87%
rename from android/src/main/java/org/reduxkotlin/namegame/store/BaseNameGameViewFragment.kt
rename to android/src/main/java/org/reduxkotlin/namegame/ui/BaseNameGameViewFragment.kt
index 1c60e19..26b9c3d 100644
--- a/android/src/main/java/org/reduxkotlin/namegame/store/BaseNameGameViewFragment.kt
+++ b/android/src/main/java/org/reduxkotlin/namegame/ui/BaseNameGameViewFragment.kt
@@ -1,4 +1,4 @@
-package org.reduxkotlin.namegame.store
+package org.reduxkotlin.namegame.ui
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
@@ -9,7 +9,6 @@ open class BaseNameGameViewFragment<V: GameBaseView>: Fragment(), GameBaseView {
     private val presenterObserver = PresenterLifecycleObserver(this)
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        retainInstance = true
         lifecycle.addObserver(presenterObserver)
         super.onCreate(savedInstanceState)
     }
diff --git a/android/src/main/java/org/reduxkotlin/namegame/store/GameResultsFragment.kt b/android/src/main/java/org/reduxkotlin/namegame/ui/GameResultsFragment.kt
similarity index 90%
rename from android/src/main/java/org/reduxkotlin/namegame/store/GameResultsFragment.kt
rename to android/src/main/java/org/reduxkotlin/namegame/ui/GameResultsFragment.kt
index fede85f..e733792 100644
--- a/android/src/main/java/org/reduxkotlin/namegame/store/GameResultsFragment.kt
+++ b/android/src/main/java/org/reduxkotlin/namegame/ui/GameResultsFragment.kt
@@ -1,4 +1,4 @@
-package org.reduxkotlin.namegame.store
+package org.reduxkotlin.namegame.ui
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -7,11 +7,9 @@ import android.view.ViewGroup
 import org.reduxkotlin.namegame.common.middleware.UiActions
 import org.reduxkotlin.namegame.common.ui.GameResultsViewState
 import org.reduxkotlin.namegame.common.ui.GameResultsView
-import org.reduxkotlin.namegame.MainActivity
 import org.reduxkotlin.namegame.R
 import org.reduxkotlin.namegame.dispatch
 import kotlinx.android.synthetic.main.fragment_game_results.*
-import org.reduxkotlin.namegame.store.BaseNameGameViewFragment
 
 class GameResultsFragment : BaseNameGameViewFragment<GameResultsView>(), GameResultsView, MainActivity.IOnBackPressed {
 
diff --git a/android/src/main/java/org/reduxkotlin/namegame/MainActivity.kt b/android/src/main/java/org/reduxkotlin/namegame/ui/MainActivity.kt
similarity index 97%
rename from android/src/main/java/org/reduxkotlin/namegame/MainActivity.kt
rename to android/src/main/java/org/reduxkotlin/namegame/ui/MainActivity.kt
index 8321733..f1a9e50 100644
--- a/android/src/main/java/org/reduxkotlin/namegame/MainActivity.kt
+++ b/android/src/main/java/org/reduxkotlin/namegame/ui/MainActivity.kt
@@ -1,4 +1,4 @@
-package org.reduxkotlin.namegame
+package org.reduxkotlin.namegame.ui
 
 import android.os.Bundle
 import android.os.Handler
@@ -11,6 +11,7 @@ import com.bumptech.glide.module.AppGlideModule
 import com.willowtreeapps.hyperion.core.Hyperion
 import kotlinx.android.synthetic.main.app_bar_main.*
 import kotlinx.android.synthetic.main.activity_main.*
+import org.reduxkotlin.namegame.R
 
 
 @GlideModule
diff --git a/android/src/main/java/org/reduxkotlin/namegame/store/QuestionFragment.kt b/android/src/main/java/org/reduxkotlin/namegame/ui/QuestionFragment.kt
similarity index 99%
rename from android/src/main/java/org/reduxkotlin/namegame/store/QuestionFragment.kt
rename to android/src/main/java/org/reduxkotlin/namegame/ui/QuestionFragment.kt
index 7697c83..0054894 100644
--- a/android/src/main/java/org/reduxkotlin/namegame/store/QuestionFragment.kt
+++ b/android/src/main/java/org/reduxkotlin/namegame/ui/QuestionFragment.kt
@@ -1,4 +1,4 @@
-package org.reduxkotlin.namegame.store
+package org.reduxkotlin.namegame.ui
 
 import android.animation.AnimatorSet
 import android.animation.ObjectAnimator
@@ -22,7 +22,6 @@ import androidx.interpolator.view.animation.FastOutSlowInInterpolator
 import org.reduxkotlin.namegame.common.util.Logger
 import org.reduxkotlin.namegame.common.middleware.UiActions
 import org.reduxkotlin.namegame.*
-import org.reduxkotlin.namegame.MainActivity
 import org.reduxkotlin.namegame.dispatch
 import org.reduxkotlin.namegame.onComplete
 import java.util.*
diff --git a/android/src/main/java/org/reduxkotlin/namegame/store/SettingsDialogFragment.kt b/android/src/main/java/org/reduxkotlin/namegame/ui/SettingsDialogFragment.kt
similarity index 97%
rename from android/src/main/java/org/reduxkotlin/namegame/store/SettingsDialogFragment.kt
rename to android/src/main/java/org/reduxkotlin/namegame/ui/SettingsDialogFragment.kt
index 75b3c92..79f490e 100644
--- a/android/src/main/java/org/reduxkotlin/namegame/store/SettingsDialogFragment.kt
+++ b/android/src/main/java/org/reduxkotlin/namegame/ui/SettingsDialogFragment.kt
@@ -1,4 +1,4 @@
-package org.reduxkotlin.namegame.store
+package org.reduxkotlin.namegame.ui
 
 import android.Manifest
 import android.content.pm.PackageManager
@@ -12,7 +12,6 @@ import org.reduxkotlin.namegame.common.middleware.UiActions
 //import com.google.firebase.auth.FirebaseAuth
 import org.reduxkotlin.namegame.common.ui.SettingsView
 import org.reduxkotlin.namegame.common.ui.SettingsViewState
-import org.reduxkotlin.namegame.MainActivity
 import org.reduxkotlin.namegame.dispatch
 import kotlinx.android.synthetic.main.fragment_settings.*
 import org.reduxkotlin.PresenterLifecycleObserver
diff --git a/android/src/main/java/org/reduxkotlin/namegame/store/StartFragment.kt b/android/src/main/java/org/reduxkotlin/namegame/ui/StartFragment.kt
similarity index 92%
rename from android/src/main/java/org/reduxkotlin/namegame/store/StartFragment.kt
rename to android/src/main/java/org/reduxkotlin/namegame/ui/StartFragment.kt
index c2063fa..ba911c2 100644
--- a/android/src/main/java/org/reduxkotlin/namegame/store/StartFragment.kt
+++ b/android/src/main/java/org/reduxkotlin/namegame/ui/StartFragment.kt
@@ -1,4 +1,4 @@
-package org.reduxkotlin.namegame.store
+package org.reduxkotlin.namegame.ui
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -9,7 +9,6 @@ import org.reduxkotlin.namegame.common.ui.StartView
 import kotlinx.android.synthetic.main.fragment_start.*
 import org.reduxkotlin.namegame.R
 import org.reduxkotlin.namegame.dispatch
-import org.reduxkotlin.namegame.store.BaseNameGameViewFragment
 
 class StartFragment : BaseNameGameViewFragment<StartView>(), StartView {
 
diff --git a/android/src/main/res/layout/app_bar_main.xml b/android/src/main/res/layout/app_bar_main.xml
index edaaa26..131f754 100644
--- a/android/src/main/res/layout/app_bar_main.xml
+++ b/android/src/main/res/layout/app_bar_main.xml
@@ -11,7 +11,7 @@
         android:id="@+id/rootContent"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        tools:context=".MainActivity">
+        tools:context=".ui.MainActivity">
 
 
         <fragment
diff --git a/android/src/main/res/layout/fragment_game_results.xml b/android/src/main/res/layout/fragment_game_results.xml
index 43bf4bd..5d14671 100644
--- a/android/src/main/res/layout/fragment_game_results.xml
+++ b/android/src/main/res/layout/fragment_game_results.xml
@@ -9,7 +9,7 @@
     android:focusable="true"
     android:focusableInTouchMode="true"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context=".MainActivity">
+    tools:context=".ui.MainActivity">
 
 
   <TextView
diff --git a/android/src/main/res/layout/fragment_question.xml b/android/src/main/res/layout/fragment_question.xml
index af0cd7e..d787dec 100644
--- a/android/src/main/res/layout/fragment_question.xml
+++ b/android/src/main/res/layout/fragment_question.xml
@@ -9,7 +9,7 @@
     android:focusable="true"
     android:focusableInTouchMode="true"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context=".MainActivity">
+    tools:context=".ui.MainActivity">
 
   <TextView
       android:id="@+id/txt_question_title"
diff --git a/android/src/main/res/layout/fragment_start.xml b/android/src/main/res/layout/fragment_start.xml
index 4da59a0..df13582 100644
--- a/android/src/main/res/layout/fragment_start.xml
+++ b/android/src/main/res/layout/fragment_start.xml
@@ -9,7 +9,7 @@
     android:focusable="true"
     android:focusableInTouchMode="true"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context=".MainActivity">
+    tools:context=".ui.MainActivity">
 
     <Button
         android:id="@+id/btn_start"
diff --git a/android/src/main/res/navigation/nav_graph.xml b/android/src/main/res/navigation/nav_graph.xml
index da7d446..3fe97cc 100644
--- a/android/src/main/res/navigation/nav_graph.xml
+++ b/android/src/main/res/navigation/nav_graph.xml
@@ -6,7 +6,7 @@
 
     <fragment
         android:id="@+id/startScreen"
-        android:name="org.reduxkotlin.namegame.store.StartFragment"
+        android:name="org.reduxkotlin.namegame.ui.StartFragment"
         android:label="StartFragment"
         tools:layout="@layout/fragment_start" >
         <action
@@ -16,7 +16,7 @@
 
     <fragment
         android:id="@+id/questionScreen"
-        android:name="org.reduxkotlin.namegame.store.QuestionFragment"
+        android:name="org.reduxkotlin.namegame.ui.QuestionFragment"
         android:label="QuestionFragment"
         app:enterAnim="@anim/slide_in_right"
         app:exitAnim="@anim/slide_out_left"
@@ -30,7 +30,7 @@
     </fragment>
     <fragment
         android:id="@+id/resultsFragment"
-        android:name="org.reduxkotlin.namegame.store.GameResultsFragment"
+        android:name="org.reduxkotlin.namegame.ui.GameResultsFragment"
         android:label="ResultsFragment"
         tools:layout="@layout/fragment_game_results">
         <action
diff --git a/common/src/commonMain/kotlin/org/reduxkotlin/namegame/common/GameEngine.kt b/common/src/commonMain/kotlin/org/reduxkotlin/namegame/common/GameEngine.kt
index cb3ee9f..5f11f03 100644
--- a/common/src/commonMain/kotlin/org/reduxkotlin/namegame/common/GameEngine.kt
+++ b/common/src/commonMain/kotlin/org/reduxkotlin/namegame/common/GameEngine.kt
@@ -20,15 +20,13 @@ class GameEngine(navigator: Navigator,
     val vibrateUtil = VibrateUtil(application)
     private val localStorageSettingsRepository by lazy { LocalStorageSettingsRepository(userSettings(application)) }
 
-    val appStore by lazy {
-        createStore(reducer, AppState.INITIAL_STATE,
-                compose(listOf(presenterEnhancer(uiContext),
-                        applyMiddleware(createThunkMiddleware(),
-                                uiMiddleware(networkThunks, timerThunks, uiContext),
-                                navigationMiddleware(navigator),
-                                loggerMiddleware,
-                                settingsMiddleware(localStorageSettingsRepository, networkContext)))))
-    }
+    val appStore = createStore(reducer, AppState.INITIAL_STATE,
+                    compose(listOf(presenterEnhancer(uiContext),
+                            applyMiddleware(createThunkMiddleware(),
+                                    uiMiddleware(networkThunks, timerThunks, uiContext),
+                                    navigationMiddleware(navigator),
+                                    loggerMiddleware,
+                                    settingsMiddleware(localStorageSettingsRepository, networkContext)))))
 
     init {
         CoroutineScope(uiContext).launch {
diff --git a/common/src/commonMain/kotlin/org/reduxkotlin/namegame/common/ui/SettingsView.kt b/common/src/commonMain/kotlin/org/reduxkotlin/namegame/common/ui/SettingsView.kt
index 4d167d9..ece5c9a 100644
--- a/common/src/commonMain/kotlin/org/reduxkotlin/namegame/common/ui/SettingsView.kt
+++ b/common/src/commonMain/kotlin/org/reduxkotlin/namegame/common/ui/SettingsView.kt
@@ -13,5 +13,5 @@ interface SettingsView: GameBaseView {
 }
 
 val settingsPresenter = presenter<SettingsView> {{
-    withSingleField({ it.settings }) { showSettings(state.settings.toViewState()) }
+    select { it.settings } then { showSettings(state.settings.toViewState()) }
 }}
diff --git a/common/src/commonMain/kotlin/org/reduxkotlin/namegame/common/ui/StartView.kt b/common/src/commonMain/kotlin/org/reduxkotlin/namegame/common/ui/StartView.kt
index f161ac4..0feacd6 100644
--- a/common/src/commonMain/kotlin/org/reduxkotlin/namegame/common/ui/StartView.kt
+++ b/common/src/commonMain/kotlin/org/reduxkotlin/namegame/common/ui/StartView.kt
@@ -13,16 +13,16 @@ interface StartView : GameBaseView {
     override fun presenter(): Presenter<View, AppState> = startPresenter
 }
 
-val startPresenter = presenter<StartView> {{
-    withSingleField({ it.isLoadingItems }) {
-        if (state.isLoadingItems) {
-            showLoading()
-        } else {
-            hideLoading()
+val startPresenter = presenter<StartView> {
+    {
+        select { state.isLoadingItems } then {
+            if (state.isLoadingItems) {
+                showLoading()
+            } else {
+                hideLoading()
+            }
         }
-    }
 
-    withSingleField({ it.errorLoadingItems }) {
-        showError(state.errorMsg)
+        select { state.errorLoadingItems } then { showError(state.errorMsg) }
     }
-}}
+}
diff --git a/iOS/NameGame/NameGame.xcodeproj/project.pbxproj b/iOS/NameGame/NameGame.xcodeproj/project.pbxproj
index d8778dc..79ec8ba 100644
--- a/iOS/NameGame/NameGame.xcodeproj/project.pbxproj
+++ b/iOS/NameGame/NameGame.xcodeproj/project.pbxproj
@@ -80,7 +80,7 @@
 		1E9D6D3B224EA74E00F5C0B8 /* diamond.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = diamond.png; sourceTree = "<group>"; };
 		1E9D6D3C224EA74E00F5C0B8 /* confetti.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = confetti.png; sourceTree = "<group>"; };
 		1E9D6D3D224EA74E00F5C0B8 /* star.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = star.png; sourceTree = "<group>"; };
-		1E9ED1E122550E7E000D7C69 /* willowtree_banner.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = willowtree_banner.png; path = ../../../android/src/main/res/drawable/willowtree_banner.png; sourceTree = "<group>"; };
+		1E9ED1E122550E7E000D7C69 /* willowtree_banner.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = willowtree_banner.png; sourceTree = "<group>"; };
 		1EB9EA7B2238071A008AF004 /* NameGame.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = NameGame.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		1EB9EA7E2238071A008AF004 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		1EB9EA832238071A008AF004 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
diff --git a/iOS/NameGame/NameGame/willowtree_banner.png b/iOS/NameGame/NameGame/willowtree_banner.png
new file mode 100644
index 0000000..1d2e524
Binary files /dev/null and b/iOS/NameGame/NameGame/willowtree_banner.png differ