add package objects and remove pacakge curlies
use NodeBasic in case match