Project structure improved.