major project org refactor