moving_around

Changing files so they will work with the new layout.