massive re-org, start cleanup