changed how configuration properties is organised