Project structure fixes.