Removed extraneous .mod file

- Also rearranged the file structure