Shifted some files around