housekeeping, moving stuff to appropriate units