remake angular structure