Moved a few packages from Depends to Imports