Update project configuration
Use new package hierarchy