SPLEVO-340
If-Else Refactoring With Static Configuration Class

-minor refactoring and bugfix
-refactorings renamed to match the catalog