Housekeeping

Rearranging stuff, housekeeping