Working on making a module
Fixing layout of files for maintainability