refactoring #imports in preparation for exposing framework-style catch-all header
more work on framework-style headers

name module class with 'Module' suffix to avoid clashing with catch-all header name for public classes in module