Move packages from Depends to Imports