Moved a bunch of files to a better place