more restructuring :)