Moving files around

Ready to go, nothing to be changed.