3.0 re-org and structure... in progress