diff --git a/cmd/fetch.go b/cmd/fetch.go
index 738b8d1..d475ab8 100644
--- a/cmd/fetch.go
+++ b/cmd/fetch.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/OpenCHAMI/configurator/internal/util"
+	"github.com/OpenCHAMI/configurator/pkg/util"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
diff --git a/pkg/generator/plugins/coredhcp/coredhcp.go b/pkg/generator/plugins/coredhcp/coredhcp.go
index eac6359..8f0af9b 100644
--- a/pkg/generator/plugins/coredhcp/coredhcp.go
+++ b/pkg/generator/plugins/coredhcp/coredhcp.go
@@ -3,9 +3,9 @@ package main
 import (
 	"fmt"
 
-	configurator "github.com/OpenCHAMI/configurator/internal"
-	"github.com/OpenCHAMI/configurator/internal/generator"
-	"github.com/OpenCHAMI/configurator/internal/util"
+	configurator "github.com/OpenCHAMI/configurator/pkg"
+	"github.com/OpenCHAMI/configurator/pkg/generator"
+	"github.com/OpenCHAMI/configurator/pkg/util"
 )
 
 type CoreDhcp struct{}
diff --git a/pkg/generator/plugins/dhcpd/dhcpd.go b/pkg/generator/plugins/dhcpd/dhcpd.go
index 49c32e8..a736064 100644
--- a/pkg/generator/plugins/dhcpd/dhcpd.go
+++ b/pkg/generator/plugins/dhcpd/dhcpd.go
@@ -3,9 +3,9 @@ package main
 import (
 	"fmt"
 
-	configurator "github.com/OpenCHAMI/configurator/internal"
-	"github.com/OpenCHAMI/configurator/internal/generator"
-	"github.com/OpenCHAMI/configurator/internal/util"
+	configurator "github.com/OpenCHAMI/configurator/pkg"
+	"github.com/OpenCHAMI/configurator/pkg/generator"
+	"github.com/OpenCHAMI/configurator/pkg/util"
 )
 
 type Dhcpd struct{}
@@ -70,7 +70,7 @@ func (g *Dhcpd) Generate(config *configurator.Config, opts ...util.Option) (gene
 		"plugin_description": g.GetDescription(),
 		"compute_nodes":      compute_nodes,
 		"node_entries":       "",
-	}, target.Templates...)
+	}, target.TemplatePaths...)
 }
 
 var Generator Dhcpd
diff --git a/pkg/generator/plugins/hostfile/hostfile.go b/pkg/generator/plugins/hostfile/hostfile.go
index f77e008..4c611f4 100644
--- a/pkg/generator/plugins/hostfile/hostfile.go
+++ b/pkg/generator/plugins/hostfile/hostfile.go
@@ -3,9 +3,9 @@ package main
 import (
 	"fmt"
 
-	configurator "github.com/OpenCHAMI/configurator/internal"
-	"github.com/OpenCHAMI/configurator/internal/generator"
-	"github.com/OpenCHAMI/configurator/internal/util"
+	configurator "github.com/OpenCHAMI/configurator/pkg"
+	"github.com/OpenCHAMI/configurator/pkg/generator"
+	"github.com/OpenCHAMI/configurator/pkg/util"
 )
 
 type Hostfile struct{}
diff --git a/pkg/generator/plugins/powerman/powerman.go b/pkg/generator/plugins/powerman/powerman.go
index 40246f3..1dca29e 100644
--- a/pkg/generator/plugins/powerman/powerman.go
+++ b/pkg/generator/plugins/powerman/powerman.go
@@ -3,9 +3,9 @@ package main
 import (
 	"fmt"
 
-	configurator "github.com/OpenCHAMI/configurator/internal"
-	"github.com/OpenCHAMI/configurator/internal/generator"
-	"github.com/OpenCHAMI/configurator/internal/util"
+	configurator "github.com/OpenCHAMI/configurator/pkg"
+	"github.com/OpenCHAMI/configurator/pkg/generator"
+	"github.com/OpenCHAMI/configurator/pkg/util"
 )
 
 type Powerman struct{}
diff --git a/pkg/generator/plugins/syslog/syslog.go b/pkg/generator/plugins/syslog/syslog.go
index e2309dc..94ea295 100644
--- a/pkg/generator/plugins/syslog/syslog.go
+++ b/pkg/generator/plugins/syslog/syslog.go
@@ -3,9 +3,9 @@ package main
 import (
 	"fmt"
 
-	configurator "github.com/OpenCHAMI/configurator/internal"
-	"github.com/OpenCHAMI/configurator/internal/generator"
-	"github.com/OpenCHAMI/configurator/internal/util"
+	configurator "github.com/OpenCHAMI/configurator/pkg"
+	"github.com/OpenCHAMI/configurator/pkg/generator"
+	"github.com/OpenCHAMI/configurator/pkg/util"
 )
 
 type Syslog struct{}