- Create a new project structure in order to make building easier
- Applied some changes suggested by code inspection (more to be done)