Remove a bunch of unused files and reorganize project