[DF-5048] refactoring loading packages
[DF-5048] refactoring loading packages
[DF-5048] refactoring loading packages
[DF-5048] refactoring properties model
[DF-5048] working on properties model
[DF-5048] working on properties model
[DF-5048] working on properties model
merge