Project structure corrections.