Moved some files around and removed some other stuff