Require shouldn't have been in modules, moved it to top-level, with some refactoring
Removed extraneous directories