Moved some files around to make more sense