diff --git a/app/src/main/java/eu/depau/etchdroid/StateKeeper.kt b/app/src/main/java/eu/depau/etchdroid/StateKeeper.kt
index 0832f05..be2622b 100644
--- a/app/src/main/java/eu/depau/etchdroid/StateKeeper.kt
+++ b/app/src/main/java/eu/depau/etchdroid/StateKeeper.kt
@@ -3,7 +3,7 @@ package eu.depau.etchdroid
 import android.hardware.usb.UsbDevice
 import android.net.Uri
 import com.github.mjdev.libaums.UsbMassStorageDevice
-import eu.depau.etchdroid.abc.WizardFragment
+import eu.depau.etchdroid.fragments.WizardFragment
 import eu.depau.etchdroid.enums.FlashMethod
 import eu.depau.etchdroid.enums.ImageLocation
 import eu.depau.etchdroid.enums.WizardStep
diff --git a/app/src/main/java/eu/depau/etchdroid/activities/MainActivity.kt b/app/src/main/java/eu/depau/etchdroid/activities/MainActivity.kt
index ec2971a..b4c94e8 100644
--- a/app/src/main/java/eu/depau/etchdroid/activities/MainActivity.kt
+++ b/app/src/main/java/eu/depau/etchdroid/activities/MainActivity.kt
@@ -12,8 +12,7 @@ import android.view.Menu
 import android.view.MenuItem
 import eu.depau.etchdroid.R
 import eu.depau.etchdroid.StateKeeper
-import eu.depau.etchdroid.abc.WizardActivity
-import eu.depau.etchdroid.abc.WizardFragment
+import eu.depau.etchdroid.fragments.WizardFragment
 import eu.depau.etchdroid.fragments.FlashMethodFragment
 import eu.depau.etchdroid.fragments.UsbDriveFragment
 import kotlinx.android.synthetic.main.activity_main.*
diff --git a/app/src/main/java/eu/depau/etchdroid/abc/WizardActivity.kt b/app/src/main/java/eu/depau/etchdroid/activities/WizardActivity.kt
similarity index 95%
rename from app/src/main/java/eu/depau/etchdroid/abc/WizardActivity.kt
rename to app/src/main/java/eu/depau/etchdroid/activities/WizardActivity.kt
index 50d00c1..e0a695d 100644
--- a/app/src/main/java/eu/depau/etchdroid/abc/WizardActivity.kt
+++ b/app/src/main/java/eu/depau/etchdroid/activities/WizardActivity.kt
@@ -1,4 +1,4 @@
-package eu.depau.etchdroid.abc
+package eu.depau.etchdroid.activities
 
 import android.content.Intent
 import android.os.Bundle
@@ -6,6 +6,7 @@ import android.support.v7.app.AppCompatActivity
 import android.view.View
 import com.github.isabsent.filepicker.SimpleFilePickerDialog
 import eu.depau.etchdroid.StateKeeper
+import eu.depau.etchdroid.fragments.WizardFragment
 
 abstract class WizardActivity : AppCompatActivity(), SimpleFilePickerDialog.InteractionListenerString {
     override fun onResult(dialogTag: String, which: Int, extras: Bundle): Boolean {
diff --git a/app/src/main/java/eu/depau/etchdroid/fragments/ConfirmInfoFragment.kt b/app/src/main/java/eu/depau/etchdroid/fragments/ConfirmInfoFragment.kt
index 8b3dc66..7b7d9c7 100644
--- a/app/src/main/java/eu/depau/etchdroid/fragments/ConfirmInfoFragment.kt
+++ b/app/src/main/java/eu/depau/etchdroid/fragments/ConfirmInfoFragment.kt
@@ -7,7 +7,6 @@ import android.view.View
 import android.view.ViewGroup
 import eu.depau.etchdroid.R
 import eu.depau.etchdroid.StateKeeper
-import eu.depau.etchdroid.abc.WizardFragment
 import eu.depau.etchdroid.services.UsbAPIWriteService
 import eu.depau.etchdroid.kotlin_exts.*
 import eu.depau.etchdroid.enums.FlashMethod
diff --git a/app/src/main/java/eu/depau/etchdroid/fragments/FlashMethodFragment.kt b/app/src/main/java/eu/depau/etchdroid/fragments/FlashMethodFragment.kt
index 1fdac5f..3cb7422 100644
--- a/app/src/main/java/eu/depau/etchdroid/fragments/FlashMethodFragment.kt
+++ b/app/src/main/java/eu/depau/etchdroid/fragments/FlashMethodFragment.kt
@@ -6,8 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import eu.depau.etchdroid.R
 import eu.depau.etchdroid.StateKeeper
-import eu.depau.etchdroid.abc.WizardActivity
-import eu.depau.etchdroid.abc.WizardFragment
+import eu.depau.etchdroid.activities.WizardActivity
 import eu.depau.etchdroid.kotlin_exts.snackbar
 import eu.depau.etchdroid.enums.FlashMethod
 import eu.depau.etchdroid.enums.WizardStep
diff --git a/app/src/main/java/eu/depau/etchdroid/fragments/ImageLocationFragment.kt b/app/src/main/java/eu/depau/etchdroid/fragments/ImageLocationFragment.kt
index 625e0c6..345978c 100644
--- a/app/src/main/java/eu/depau/etchdroid/fragments/ImageLocationFragment.kt
+++ b/app/src/main/java/eu/depau/etchdroid/fragments/ImageLocationFragment.kt
@@ -16,8 +16,7 @@ import android.view.ViewGroup
 import com.github.isabsent.filepicker.SimpleFilePickerDialog
 import eu.depau.etchdroid.R
 import eu.depau.etchdroid.StateKeeper
-import eu.depau.etchdroid.abc.WizardActivity
-import eu.depau.etchdroid.abc.WizardFragment
+import eu.depau.etchdroid.activities.WizardActivity
 import eu.depau.etchdroid.kotlin_exts.getFileName
 import eu.depau.etchdroid.kotlin_exts.snackbar
 import eu.depau.etchdroid.enums.FlashMethod
diff --git a/app/src/main/java/eu/depau/etchdroid/fragments/UsbDriveFragment.kt b/app/src/main/java/eu/depau/etchdroid/fragments/UsbDriveFragment.kt
index baa24a1..ec21e99 100644
--- a/app/src/main/java/eu/depau/etchdroid/fragments/UsbDriveFragment.kt
+++ b/app/src/main/java/eu/depau/etchdroid/fragments/UsbDriveFragment.kt
@@ -11,9 +11,8 @@ import android.view.*
 import com.github.mjdev.libaums.UsbMassStorageDevice
 import eu.depau.etchdroid.R
 import eu.depau.etchdroid.StateKeeper
-import eu.depau.etchdroid.abc.ClickListener
-import eu.depau.etchdroid.abc.WizardActivity
-import eu.depau.etchdroid.abc.WizardFragment
+import eu.depau.etchdroid.utils.ClickListener
+import eu.depau.etchdroid.activities.WizardActivity
 import eu.depau.etchdroid.activities.MainActivity
 import eu.depau.etchdroid.adapters.UsbDrivesRecyclerViewAdapter
 import eu.depau.etchdroid.kotlin_exts.name
diff --git a/app/src/main/java/eu/depau/etchdroid/abc/WizardFragment.kt b/app/src/main/java/eu/depau/etchdroid/fragments/WizardFragment.kt
similarity index 88%
rename from app/src/main/java/eu/depau/etchdroid/abc/WizardFragment.kt
rename to app/src/main/java/eu/depau/etchdroid/fragments/WizardFragment.kt
index b7cd24a..85fac52 100644
--- a/app/src/main/java/eu/depau/etchdroid/abc/WizardFragment.kt
+++ b/app/src/main/java/eu/depau/etchdroid/fragments/WizardFragment.kt
@@ -1,8 +1,9 @@
-package eu.depau.etchdroid.abc
+package eu.depau.etchdroid.fragments
 
 import android.content.Intent
 import android.support.v4.app.Fragment
 import android.view.View
+import eu.depau.etchdroid.activities.WizardActivity
 
 abstract class WizardFragment() : Fragment() {
     private lateinit var wizardActivity: WizardActivity
diff --git a/app/src/main/java/eu/depau/etchdroid/services/UsbAPIWriteService.kt b/app/src/main/java/eu/depau/etchdroid/services/UsbAPIWriteService.kt
index e3cf585..2256085 100644
--- a/app/src/main/java/eu/depau/etchdroid/services/UsbAPIWriteService.kt
+++ b/app/src/main/java/eu/depau/etchdroid/services/UsbAPIWriteService.kt
@@ -5,7 +5,6 @@ import android.hardware.usb.UsbDevice
 import android.net.Uri
 import android.util.Log
 import com.github.mjdev.libaums.UsbMassStorageDevice
-import eu.depau.etchdroid.abc.UsbWriteService
 import eu.depau.etchdroid.kotlin_exts.getFileName
 import eu.depau.etchdroid.kotlin_exts.getFileSize
 import eu.depau.etchdroid.kotlin_exts.name
diff --git a/app/src/main/java/eu/depau/etchdroid/abc/UsbWriteService.kt b/app/src/main/java/eu/depau/etchdroid/services/UsbWriteService.kt
similarity index 99%
rename from app/src/main/java/eu/depau/etchdroid/abc/UsbWriteService.kt
rename to app/src/main/java/eu/depau/etchdroid/services/UsbWriteService.kt
index 1b46caa..723220f 100644
--- a/app/src/main/java/eu/depau/etchdroid/abc/UsbWriteService.kt
+++ b/app/src/main/java/eu/depau/etchdroid/services/UsbWriteService.kt
@@ -1,4 +1,4 @@
-package eu.depau.etchdroid.abc
+package eu.depau.etchdroid.services
 
 import android.app.IntentService
 import android.app.Notification
diff --git a/app/src/main/java/eu/depau/etchdroid/abc/ClickListener.kt b/app/src/main/java/eu/depau/etchdroid/utils/ClickListener.kt
similarity index 80%
rename from app/src/main/java/eu/depau/etchdroid/abc/ClickListener.kt
rename to app/src/main/java/eu/depau/etchdroid/utils/ClickListener.kt
index 83da319..835fd9e 100644
--- a/app/src/main/java/eu/depau/etchdroid/abc/ClickListener.kt
+++ b/app/src/main/java/eu/depau/etchdroid/utils/ClickListener.kt
@@ -1,4 +1,4 @@
-package eu.depau.etchdroid.abc
+package eu.depau.etchdroid.utils
 
 import android.view.View