Moved configuration related class into own package