diff --git a/CG2.cabal b/CG2.cabal
index dd6a951..3460659 100644
--- a/CG2.cabal
+++ b/CG2.cabal
@@ -54,7 +54,7 @@ executable CG2
   main-is:             Main.hs
 
   -- Modules included in this executable, other than Main.
-  other-modules:       Defaults Diagram Gtk Parser.Meshparser Parser.Core OS.FileExt LinearAlgebra.Vector
+  other-modules:       Diagram Gtk Class.Defaults Parser.Meshparser Parser.Core OS.FileExt LinearAlgebra.Vector
 
   -- LANGUAGE extensions used by modules in this package.
   -- other-extensions:
diff --git a/Defaults.hs b/Class/Defaults.hs
similarity index 84%
rename from Defaults.hs
rename to Class/Defaults.hs
index 4afbfcc..900441e 100644
--- a/Defaults.hs
+++ b/Class/Defaults.hs
@@ -1,6 +1,6 @@
 {-# OPTIONS_HADDOCK ignore-exports #-}
 
-module Defaults where
+module Class.Defaults where
 
 
 -- |Used to create a common interface for default settings of data types.
diff --git a/Diagram.hs b/Diagram.hs
index 2c1e614..241ce17 100644
--- a/Diagram.hs
+++ b/Diagram.hs
@@ -9,7 +9,7 @@ module Diagram (t,
                 diagS,
                 whiteRect) where
 
-import Defaults
+import Class.Defaults
 import Diagrams.Prelude
 import Diagrams.Backend.Cairo
 import LinearAlgebra.Vector
diff --git a/Gtk.hs b/Gtk.hs
index d8bb18f..dff123b 100644
--- a/Gtk.hs
+++ b/Gtk.hs
@@ -3,7 +3,7 @@
 module Gtk (makeGUI) where
 
 import Control.Monad.IO.Class
-import Defaults
+import Class.Defaults
 import Diagram
 import Diagrams.Prelude
 import Diagrams.Backend.Cairo