Move Depends packages to Imports