diff --git a/app/src/main/java/eu/konggdev/strikemaps/map/MapComponent.java b/app/src/main/java/eu/konggdev/strikemaps/map/MapComponent.java
index 0d807fd..37c7a7b 100644
--- a/app/src/main/java/eu/konggdev/strikemaps/map/MapComponent.java
+++ b/app/src/main/java/eu/konggdev/strikemaps/map/MapComponent.java
@@ -2,7 +2,7 @@ package eu.konggdev.strikemaps.map;
 
 import java.util.*;
 import eu.konggdev.strikemaps.Component;
-import eu.konggdev.strikemaps.factory.AlertDialogFactory;
+import eu.konggdev.strikemaps.ui.factory.AlertDialogFactory;
 import eu.konggdev.strikemaps.helper.UserPrefsHelper;
 import eu.konggdev.strikemaps.map.renderer.implementation.VtmRenderer;
 import eu.konggdev.strikemaps.map.style.MapStyle;
diff --git a/app/src/main/java/eu/konggdev/strikemaps/factory/AlertDialogFactory.java b/app/src/main/java/eu/konggdev/strikemaps/ui/factory/AlertDialogFactory.java
similarity index 97%
rename from app/src/main/java/eu/konggdev/strikemaps/factory/AlertDialogFactory.java
rename to app/src/main/java/eu/konggdev/strikemaps/ui/factory/AlertDialogFactory.java
index b55c015..f0f0169 100644
--- a/app/src/main/java/eu/konggdev/strikemaps/factory/AlertDialogFactory.java
+++ b/app/src/main/java/eu/konggdev/strikemaps/ui/factory/AlertDialogFactory.java
@@ -1,4 +1,4 @@
-package eu.konggdev.strikemaps.factory;
+package eu.konggdev.strikemaps.ui.factory;
 
 import android.app.AlertDialog;
 import android.graphics.Color;
diff --git a/app/src/main/java/eu/konggdev/strikemaps/ui/fragment/popup/FragmentMapChangePopup.java b/app/src/main/java/eu/konggdev/strikemaps/ui/fragment/popup/FragmentMapChangePopup.java
index 7e28898..0c070b3 100644
--- a/app/src/main/java/eu/konggdev/strikemaps/ui/fragment/popup/FragmentMapChangePopup.java
+++ b/app/src/main/java/eu/konggdev/strikemaps/ui/fragment/popup/FragmentMapChangePopup.java
@@ -10,13 +10,11 @@ import android.widget.LinearLayout;
 import eu.konggdev.strikemaps.R;
 import eu.konggdev.strikemaps.app.AppController;
 import eu.konggdev.strikemaps.helper.FileHelper;
-import eu.konggdev.strikemaps.factory.AlertDialogFactory;
 import eu.konggdev.strikemaps.map.MapComponent;
 
 import eu.konggdev.strikemaps.map.style.MapStyle;
 import eu.konggdev.strikemaps.ui.UIComponent;
 import eu.konggdev.strikemaps.ui.element.item.GenericItem;
-import org.apache.commons.lang3.ArrayUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;