Switch to cabal structure
Changed import names