Move components of NSE to be children of NSE