reorganize configuration definitions into separate class container