Cleanup module pathing

src/Dodge/Data/SoundOrigin.hs

@@ -1,11 +1,14 @@
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
-module Dodge.Data.SoundOrigin
-    where
-import Dodge.Data.Material
-import GHC.Generics
+{-# LANGUAGE TemplateHaskell #-}
+
+module Dodge.Data.SoundOrigin where
+
 import Data.Aeson
-data SoundOrigin = InventorySound 
+import Data.Aeson.TH
+import Dodge.Data.Material
+
+data SoundOrigin
+    = InventorySound
     | BackgroundSound
     | OnceSound
     | CrSound Int
@@ -30,7 +33,10 @@ data SoundOrigin = InventorySound
     | LeverSound Int
     | Explosion Int
     | Tap Int
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON SoundOrigin where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON SoundOrigin
+    deriving (Eq, Ord, Show, Read)
+
+instance ToJSONKey SoundOrigin
+
+instance FromJSONKey SoundOrigin
+
+deriveJSON defaultOptions ''SoundOrigin