Structure all properly