Fix Cabal file and import for removal of Declaration module