+ Changes due to refactoring in modules
+ Better package structure