Move around some files to more logical places