Some reorganization
New files for Cabal