diff --git a/lang/download.go b/lang/download/download.go
similarity index 98%
rename from lang/download.go
rename to lang/download/download.go
index 555e5309..3948ecc4 100644
--- a/lang/download.go
+++ b/lang/download/download.go
@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package lang // TODO: move this into a sub package of lang/$name?
+package download
 
 import (
 	"fmt"
diff --git a/lang/gapi/gapi.go b/lang/gapi/gapi.go
index 20eeaf97..5f4a5dff 100644
--- a/lang/gapi/gapi.go
+++ b/lang/gapi/gapi.go
@@ -25,6 +25,7 @@ import (
 
 	"github.com/purpleidea/mgmt/gapi"
 	"github.com/purpleidea/mgmt/lang"
+	"github.com/purpleidea/mgmt/lang/download"
 	"github.com/purpleidea/mgmt/lang/funcs/vars"
 	"github.com/purpleidea/mgmt/lang/inputs"
 	"github.com/purpleidea/mgmt/lang/interfaces"
@@ -215,7 +216,7 @@ func (obj *GAPI) Cli(cliInfo *gapi.CliInfo) (*gapi.Deploy, error) {
 			},
 		}
 		// this fulfills the interfaces.Downloader interface
-		downloader = &lang.Downloader{
+		downloader = &download.Downloader{
 			Depth: c.Int("depth"), // default of infinite is -1
 			Retry: c.Int("retry"), // infinite is -1
 		}
@@ -686,7 +687,7 @@ func (obj *GAPI) Get(getInfo *gapi.GetInfo) error {
 		},
 	}
 	// this fulfills the interfaces.Downloader interface
-	downloader := &lang.Downloader{
+	downloader := &download.Downloader{
 		Depth: c.Int("depth"), // default of infinite is -1
 		Retry: c.Int("retry"), // infinite is -1
 	}