diff --git a/app/src/main/java/eu/depau/etchdroid/StateKeeper.kt b/app/src/main/java/eu/depau/etchdroid/StateKeeper.kt
index 3197dae..0832f05 100644
--- a/app/src/main/java/eu/depau/etchdroid/StateKeeper.kt
+++ b/app/src/main/java/eu/depau/etchdroid/StateKeeper.kt
@@ -4,9 +4,9 @@ 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.values.FlashMethod
-import eu.depau.etchdroid.values.ImageLocation
-import eu.depau.etchdroid.values.WizardStep
+import eu.depau.etchdroid.enums.FlashMethod
+import eu.depau.etchdroid.enums.ImageLocation
+import eu.depau.etchdroid.enums.WizardStep
 
 object StateKeeper {
     var wizardStep: WizardStep = WizardStep.SELECT_FLASH_METHOD
diff --git a/app/src/main/java/eu/depau/etchdroid/values/FlashMethod.kt b/app/src/main/java/eu/depau/etchdroid/enums/FlashMethod.kt
similarity index 73%
rename from app/src/main/java/eu/depau/etchdroid/values/FlashMethod.kt
rename to app/src/main/java/eu/depau/etchdroid/enums/FlashMethod.kt
index 2ee0e8b..42ca9ef 100644
--- a/app/src/main/java/eu/depau/etchdroid/values/FlashMethod.kt
+++ b/app/src/main/java/eu/depau/etchdroid/enums/FlashMethod.kt
@@ -1,4 +1,4 @@
-package eu.depau.etchdroid.values
+package eu.depau.etchdroid.enums
 
 enum class FlashMethod {
     FLASH_API,
diff --git a/app/src/main/java/eu/depau/etchdroid/values/ImageLocation.kt b/app/src/main/java/eu/depau/etchdroid/enums/ImageLocation.kt
similarity index 58%
rename from app/src/main/java/eu/depau/etchdroid/values/ImageLocation.kt
rename to app/src/main/java/eu/depau/etchdroid/enums/ImageLocation.kt
index 4a1de57..aa2c410 100644
--- a/app/src/main/java/eu/depau/etchdroid/values/ImageLocation.kt
+++ b/app/src/main/java/eu/depau/etchdroid/enums/ImageLocation.kt
@@ -1,4 +1,4 @@
-package eu.depau.etchdroid.values
+package eu.depau.etchdroid.enums
 
 enum class ImageLocation {
     REMOTE,
diff --git a/app/src/main/java/eu/depau/etchdroid/values/WizardStep.kt b/app/src/main/java/eu/depau/etchdroid/enums/WizardStep.kt
similarity index 75%
rename from app/src/main/java/eu/depau/etchdroid/values/WizardStep.kt
rename to app/src/main/java/eu/depau/etchdroid/enums/WizardStep.kt
index 4ba058c..645ae36 100644
--- a/app/src/main/java/eu/depau/etchdroid/values/WizardStep.kt
+++ b/app/src/main/java/eu/depau/etchdroid/enums/WizardStep.kt
@@ -1,4 +1,4 @@
-package eu.depau.etchdroid.values
+package eu.depau.etchdroid.enums
 
 enum class WizardStep {
     SELECT_FLASH_METHOD,
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 5b3e735..8b3dc66 100644
--- a/app/src/main/java/eu/depau/etchdroid/fragments/ConfirmInfoFragment.kt
+++ b/app/src/main/java/eu/depau/etchdroid/fragments/ConfirmInfoFragment.kt
@@ -10,8 +10,8 @@ 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.values.FlashMethod
-import eu.depau.etchdroid.values.WizardStep
+import eu.depau.etchdroid.enums.FlashMethod
+import eu.depau.etchdroid.enums.WizardStep
 import kotlinx.android.synthetic.main.fragment_confirminfo.view.*
 import java.io.IOException
 
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 3fa46d0..1fdac5f 100644
--- a/app/src/main/java/eu/depau/etchdroid/fragments/FlashMethodFragment.kt
+++ b/app/src/main/java/eu/depau/etchdroid/fragments/FlashMethodFragment.kt
@@ -9,8 +9,8 @@ import eu.depau.etchdroid.StateKeeper
 import eu.depau.etchdroid.abc.WizardActivity
 import eu.depau.etchdroid.abc.WizardFragment
 import eu.depau.etchdroid.kotlin_exts.snackbar
-import eu.depau.etchdroid.values.FlashMethod
-import eu.depau.etchdroid.values.WizardStep
+import eu.depau.etchdroid.enums.FlashMethod
+import eu.depau.etchdroid.enums.WizardStep
 
 /**
  * A placeholder fragment containing a simple view.
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 87fdfa6..625e0c6 100644
--- a/app/src/main/java/eu/depau/etchdroid/fragments/ImageLocationFragment.kt
+++ b/app/src/main/java/eu/depau/etchdroid/fragments/ImageLocationFragment.kt
@@ -20,9 +20,9 @@ import eu.depau.etchdroid.abc.WizardActivity
 import eu.depau.etchdroid.abc.WizardFragment
 import eu.depau.etchdroid.kotlin_exts.getFileName
 import eu.depau.etchdroid.kotlin_exts.snackbar
-import eu.depau.etchdroid.values.FlashMethod
-import eu.depau.etchdroid.values.ImageLocation
-import eu.depau.etchdroid.values.WizardStep
+import eu.depau.etchdroid.enums.FlashMethod
+import eu.depau.etchdroid.enums.ImageLocation
+import eu.depau.etchdroid.enums.WizardStep
 import kotlinx.android.synthetic.main.activity_main.*
 import kotlinx.android.synthetic.main.fragment_select_location.*
 import java.io.File
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 ab2bbe6..baa24a1 100644
--- a/app/src/main/java/eu/depau/etchdroid/fragments/UsbDriveFragment.kt
+++ b/app/src/main/java/eu/depau/etchdroid/fragments/UsbDriveFragment.kt
@@ -18,7 +18,7 @@ import eu.depau.etchdroid.activities.MainActivity
 import eu.depau.etchdroid.adapters.UsbDrivesRecyclerViewAdapter
 import eu.depau.etchdroid.kotlin_exts.name
 import eu.depau.etchdroid.kotlin_exts.snackbar
-import eu.depau.etchdroid.values.WizardStep
+import eu.depau.etchdroid.enums.WizardStep
 import kotlinx.android.synthetic.main.activity_main.*
 import kotlinx.android.synthetic.main.fragment_select_usb_drive.view.*