Refactorted the modules to a seperate folder.