Moved lots of files around and fixed the repo