[REFACTORING] Corrected namespaces
Merge branch 'develop' of github.com:monsieurbiz/installer-v2 into develop