Cleaned directory structer + cabal file