Move terminals to package