added structure and angular