Project structure fixes