Revert to separate rake tasks for packages only