From 15bc7ca064e9ce29f6be63277a20d3ccedd07962 Mon Sep 17 00:00:00 2001
From: dtookey <dtookey@jdsfaulkner.com>
Date: Sun, 11 Oct 2020 18:50:56 -0400
Subject: [PATCH] Cleaned up base directory

---
 app/src/main/java/com/gc/necrogame/game/PurchaseQuantity.kt   | 2 --
 app/src/main/java/com/gc/necrogame/{ => game}/Purchaseable.kt | 2 +-
 .../main/java/com/gc/necrogame/{ => game}/StateComponent.kt   | 2 +-
 app/src/main/java/com/gc/necrogame/game/resources/Soul.kt     | 2 +-
 app/src/main/java/com/gc/necrogame/game/workers/Shade.kt      | 4 ++--
 5 files changed, 5 insertions(+), 7 deletions(-)
 rename app/src/main/java/com/gc/necrogame/{ => game}/Purchaseable.kt (95%)
 rename app/src/main/java/com/gc/necrogame/{ => game}/StateComponent.kt (84%)

diff --git a/app/src/main/java/com/gc/necrogame/game/PurchaseQuantity.kt b/app/src/main/java/com/gc/necrogame/game/PurchaseQuantity.kt
index c875faa..b03e025 100644
--- a/app/src/main/java/com/gc/necrogame/game/PurchaseQuantity.kt
+++ b/app/src/main/java/com/gc/necrogame/game/PurchaseQuantity.kt
@@ -1,7 +1,5 @@
 package com.gc.necrogame.game
 
-import com.gc.necrogame.Purchasable
-
 enum class PurchaseQuantity {
     ONE,
     TEN,
diff --git a/app/src/main/java/com/gc/necrogame/Purchaseable.kt b/app/src/main/java/com/gc/necrogame/game/Purchaseable.kt
similarity index 95%
rename from app/src/main/java/com/gc/necrogame/Purchaseable.kt
rename to app/src/main/java/com/gc/necrogame/game/Purchaseable.kt
index c0abadb..fcadaae 100644
--- a/app/src/main/java/com/gc/necrogame/Purchaseable.kt
+++ b/app/src/main/java/com/gc/necrogame/game/Purchaseable.kt
@@ -1,4 +1,4 @@
-package com.gc.necrogame
+package com.gc.necrogame.game
 
 import com.gc.necrogame.game.GameModel
 import com.gc.necrogame.game.Resources
diff --git a/app/src/main/java/com/gc/necrogame/StateComponent.kt b/app/src/main/java/com/gc/necrogame/game/StateComponent.kt
similarity index 84%
rename from app/src/main/java/com/gc/necrogame/StateComponent.kt
rename to app/src/main/java/com/gc/necrogame/game/StateComponent.kt
index c044ca6..78b1372 100644
--- a/app/src/main/java/com/gc/necrogame/StateComponent.kt
+++ b/app/src/main/java/com/gc/necrogame/game/StateComponent.kt
@@ -1,4 +1,4 @@
-package com.gc.necrogame
+package com.gc.necrogame.game
 
 import com.gc.necrogame.game.GameModel
 
diff --git a/app/src/main/java/com/gc/necrogame/game/resources/Soul.kt b/app/src/main/java/com/gc/necrogame/game/resources/Soul.kt
index c0143d9..f53a4a1 100644
--- a/app/src/main/java/com/gc/necrogame/game/resources/Soul.kt
+++ b/app/src/main/java/com/gc/necrogame/game/resources/Soul.kt
@@ -1,6 +1,6 @@
 package com.gc.necrogame.game.resources
 
-import com.gc.necrogame.StateComponent
+import com.gc.necrogame.game.StateComponent
 import com.gc.necrogame.game.GameModel
 import com.gc.necrogame.game.GameStateUpdateable
 import java.time.Instant
diff --git a/app/src/main/java/com/gc/necrogame/game/workers/Shade.kt b/app/src/main/java/com/gc/necrogame/game/workers/Shade.kt
index d975027..3ac6101 100644
--- a/app/src/main/java/com/gc/necrogame/game/workers/Shade.kt
+++ b/app/src/main/java/com/gc/necrogame/game/workers/Shade.kt
@@ -1,7 +1,7 @@
 package com.gc.necrogame.game.workers
 
-import com.gc.necrogame.Purchasable
-import com.gc.necrogame.StateComponent
+import com.gc.necrogame.game.Purchasable
+import com.gc.necrogame.game.StateComponent
 import com.gc.necrogame.game.*
 import com.gc.necrogame.game.resources.Soul
 import java.time.Instant