Refactoring
Merge branch 'newgen-kit' of https://github.com/d3scomp/JDEECo into newgen-kit