diff --git a/cmd/cosmos-sdk-cli/cmd/init.go b/cmd/cosmos-sdk-cli/cmd/init.go
index f5ded2215a..17b048c2b3 100644
--- a/cmd/cosmos-sdk-cli/cmd/init.go
+++ b/cmd/cosmos-sdk-cli/cmd/init.go
@@ -53,7 +53,7 @@ var initCmd = &cobra.Command{
 		fmt.Print("configuring the project in " + projectPath + "\n\n")
 		time.Sleep(2 * time.Second)
 		box := packr.NewBox("../template")
-		var replacer = strings.NewReplacer("MyAwesomeProject", capitalizedProjectName, "myawesomeproject", shortProjectName, "github.com/cosmos/cosmos-sdk/cmd/cosmos-sdk-cli", remoteProjectPath)
+		var replacer = strings.NewReplacer("MyAwesomeProject", capitalizedProjectName, "myawesomeproject", shortProjectName, "github.com/cosmos/cosmos-sdk/cmd/cosmos-sdk-cli/template", remoteProjectPath)
 		box.Walk(func(path string, file packr.File) error {
 			actualPath := replacer.Replace(path)
 			fmt.Println("Creating file: " + actualPath)
diff --git a/cmd/cosmos-sdk-cli/template/Makefile b/cmd/cosmos-sdk-cli/template/Makefile
index 77e62de8ed..87a3d7abe2 100644
--- a/cmd/cosmos-sdk-cli/template/Makefile
+++ b/cmd/cosmos-sdk-cli/template/Makefile
@@ -1,5 +1,5 @@
 PACKAGES=$(shell go list ./... | grep -v '/vendor/')
-#BUILD_FLAGS = -ldflags "-X github.com/cosmos/cosmos-sdk/cmd/cosmos-sdk-cli/version.GitCommit=`git rev-parse --short HEAD`"
+#BUILD_FLAGS = -ldflags "-X github.com/cosmos/cosmos-sdk/cmd/cosmos-sdk-cli/template/version.GitCommit=`git rev-parse --short HEAD`"
 
 all: get_tools get_vendor_deps build test
 
diff --git a/cmd/cosmos-sdk-cli/template/app/app.go b/cmd/cosmos-sdk-cli/template/app/app.go
index d73d7df340..da78acf409 100644
--- a/cmd/cosmos-sdk-cli/template/app/app.go
+++ b/cmd/cosmos-sdk-cli/template/app/app.go
@@ -15,7 +15,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/auth"
 	"github.com/cosmos/cosmos-sdk/x/bank"
 
-	"github.com/cosmos/cosmos-sdk/cmd/cosmos-sdk-cli/types"
+	"github.com/cosmos/cosmos-sdk/cmd/cosmos-sdk-cli/template/types"
 )
 
 const (
diff --git a/cmd/cosmos-sdk-cli/template/cmd/cli/main.go b/cmd/cosmos-sdk-cli/template/cmd/cli/main.go
index 33a888f3ba..9ce51c9990 100644
--- a/cmd/cosmos-sdk-cli/template/cmd/cli/main.go
+++ b/cmd/cosmos-sdk-cli/template/cmd/cli/main.go
@@ -17,8 +17,8 @@ import (
 	authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli"
 	bankcmd "github.com/cosmos/cosmos-sdk/x/bank/client/cli"
 
-	"github.com/cosmos/cosmos-sdk/cmd/cosmos-sdk-cli/app"
-	"github.com/cosmos/cosmos-sdk/cmd/cosmos-sdk-cli/types"
+	"github.com/cosmos/cosmos-sdk/cmd/cosmos-sdk-cli/template/app"
+	"github.com/cosmos/cosmos-sdk/cmd/cosmos-sdk-cli/template/types"
 )
 
 // rootCmd is the entry point for this binary
diff --git a/cmd/cosmos-sdk-cli/template/cmd/node/main.go b/cmd/cosmos-sdk-cli/template/cmd/node/main.go
index 79722ae20f..f9f7a5ffe0 100644
--- a/cmd/cosmos-sdk-cli/template/cmd/node/main.go
+++ b/cmd/cosmos-sdk-cli/template/cmd/node/main.go
@@ -12,7 +12,7 @@ import (
 	"github.com/tendermint/tendermint/libs/log"
 	tmtypes "github.com/tendermint/tendermint/types"
 
-	"github.com/cosmos/cosmos-sdk/cmd/cosmos-sdk-cli/app"
+	"github.com/cosmos/cosmos-sdk/cmd/cosmos-sdk-cli/template/app"
 
 	"github.com/cosmos/cosmos-sdk/server"
 	"github.com/cosmos/cosmos-sdk/wire"