Project structure has been improved.