Project structure shakeup.