Refactoring, modelling
Refactoring
Refactoring, public fields made private * wrapped in getters / setters
Required files update
Module loading fix
Exception handling fix