Moved some files around so that everything works