Architecture updates
Merge branch 'newgen' of https://github.com/d3scomp/JDEECo.git into newgen