Architecture better structured
Merge branch 'master' of https://github.com/jzatta/JuAPJJ