better structure, fixed default-config