Minor changes in project structure.
Changes in project structure