Refactored configuration classes into own package