cleaned up a few files and module name