Major organization and cleanup