Project structure fine tunings.