More refactoring of the project based on the spec
Merge branch 'develop' of github.com:edgarRd/jacinto into develop