Consolidate into single cabal project