structure re-organized