Major changes to the file structure, all code and new