Project structure minor changes.