added new structs and adapted existing structs to fit new configuration structure