restructuring
test config