updated config structure
some changes