Housekeeping

Moved things around