Restructure Algorithms subdir and module names

No subdirs in Algorithms, just the module files

Algorithms/GrahamScan.hs

@@ -1,6 +1,6 @@
 {-# OPTIONS_HADDOCK ignore-exports #-}
 
-module Algorithms.ConvexHull.GrahamScan where
+module Algorithms.GrahamScan where
 
 import Algebra.Vector
 import Algebra.VectorTypes

Algorithms/KDTree.hs

@@ -1,18 +1,18 @@
 {-# OPTIONS_HADDOCK ignore-exports #-}
 
-module Algorithms.KDTree.KDTree (kdTree
-                                 , kdFoldl
-                                 , kdFoldr
-                                 , kdTreeToRoseTree
-                                 , rangeSearch
-                                 , getValS
-                                 , isLeaf
-                                 , getVal
-                                 , getDirection
-                                 , goLeft
-                                 , goRight
-                                 , Direction(Vertical, Horizontal)
-                                 , KDTree(KTNil, KTNode))
+module Algorithms.KDTree (kdTree
+                         , kdFoldl
+                         , kdFoldr
+                         , kdTreeToRoseTree
+                         , rangeSearch
+                         , getValS
+                         , isLeaf
+                         , getVal
+                         , getDirection
+                         , goLeft
+                         , goRight
+                         , Direction(Vertical, Horizontal)
+                         , KDTree(KTNil, KTNode))
   where
 
 

Algorithms/PolygonIntersection.hs

@@ -1,4 +1,4 @@
-module Algorithms.PolygonIntersection.Core where
+module Algorithms.PolygonIntersection where
 
 
 import           Algebra.Vector

Algorithms/QuadTree.hs

@@ -1,4 +1,4 @@
-module Algorithms.QuadTree.QuadTree
+module Algorithms.QuadTree
     (quadTree,
     quadTreeSquares,
     qtFoldl,

CG2.cabal

@@ -55,10 +55,10 @@ executable Gtk
 
   -- Modules included in this executable, other than Main.
   other-modules:       Algebra.Vector
-                       Algorithms.ConvexHull.GrahamScan
-                       Algorithms.PolygonIntersection.Core
-                       Algorithms.QuadTree.QuadTree
-                       Algorithms.KDTree.KDTree
+                       Algorithms.GrahamScan
+                       Algorithms.PolygonIntersection
+                       Algorithms.QuadTree
+                       Algorithms.KDTree
                        Graphics.Diagram.Gtk
                        Graphics.Diagram.Plotter
                        Graphics.Diagram.Types
@@ -102,10 +102,10 @@ executable Gif
 
   -- Modules included in this executable, other than Main.
   other-modules:       Algebra.Vector
-                       Algorithms.ConvexHull.GrahamScan
-                       Algorithms.PolygonIntersection.Core
-                       Algorithms.QuadTree.QuadTree
-                       Algorithms.KDTree.KDTree
+                       Algorithms.GrahamScan
+                       Algorithms.PolygonIntersection
+                       Algorithms.QuadTree
+                       Algorithms.KDTree
                        Graphics.Diagram.Gif
                        Graphics.Diagram.Plotter
                        Graphics.Diagram.Types

Graphics/Diagram/Gif.hs

@@ -3,7 +3,7 @@
 module Graphics.Diagram.Gif where
 
 import Algebra.VectorTypes
-import Algorithms.ConvexHull.GrahamScan
+import Algorithms.GrahamScan
 import Codec.Picture.Gif
 import qualified Data.ByteString.Char8 as B
 import Data.Monoid

Graphics/Diagram/Plotter.hs

@@ -3,10 +3,10 @@
 module Graphics.Diagram.Plotter where
 
 import Algebra.VectorTypes
-import Algorithms.ConvexHull.GrahamScan
-import Algorithms.QuadTree.QuadTree
-import Algorithms.KDTree.KDTree
-import Algorithms.PolygonIntersection.Core
+import Algorithms.GrahamScan
+import Algorithms.QuadTree
+import Algorithms.KDTree
+import Algorithms.PolygonIntersection
 import Data.Maybe
 import Data.Monoid
 import Data.Tree

Parser/PathParser.hs

@@ -2,7 +2,7 @@
 
 module Parser.PathParser where
 
-import Algorithms.QuadTree.QuadTree (Quad(NW, NE, SW, SE), Orient(North, South, West, East))
+import Algorithms.QuadTree (Quad(NW, NE, SW, SE), Orient(North, South, West, East))
 import Control.Applicative
 import Data.Attoparsec.ByteString.Char8
 import qualified Data.ByteString.Char8 as B

PerformanceTest.hs

@@ -1,4 +1,4 @@
-import Algorithms.ConvexHull.GrahamScan
+import Algorithms.GrahamScan
 import Parser.Meshparser
 import System.Environment
 import System.FileSystem.FileExt