Moving around files, fixing configs