First refactoring commit

Moved all static definition to a separate configuration class
Update
Last refactoring commit

Code should be adaptable enough now