Changed the structure of some files around.