Major overhaul, moved all files to a new location in order to support a more modular file structure