Moved Configuration class to Components