Rebuild structure of project. Improved some details with comments and dialogs