move to updated extension structure