Huge reorganisation of files to make project easier to work on.