further file moves and .cabal fixes