SPLEVO-340
If-Else Refactoring With Static Configuration Class

- refactorings package changes
- bugfixes
- test references updated