Changes towards splitting to 2D and 3D modules. Extracting common parts is hard
Some small changes to namespacing. Bumped cabal file a bit