restructuring of the project
Merge branch 'part03'