Added 'Control.Monad.Catch' re-exports
Fixed dependencies
Lots of changes