diff --git a/cmd/action.go b/cmd/action.go
index 4d17a82..cd7b12d 100644
--- a/cmd/action.go
+++ b/cmd/action.go
@@ -249,15 +249,23 @@ var CliAction = func(ctx *cli.Context) error {
 	// of the project is created to repurpose
 	// the project for custom purpose
 	if Generate != "" {
-		err := generate.GenerateNewProject(Generate,"test")
+		var err error
+		// If the module name is provided
+		if Modulename != "" {
+			err = generate.GenerateNewProject(Generate,Modulename)
+		} else {
+			err = generate.GenerateNewProject(Generate,Generate)
+		}
 		if err != nil {
 			fmt.Println(err)
 		} else {
 			fmt.Println("Created new folder: " + Generate)
-			fmt.Println("1. Enter inside " + Generate + "directory")
-			fmt.Println("2. go mod init <name of your module (ex: github.com/akilan1999/lol)>")
-			fmt.Println("3. sh install.sh " + Generate)
-			fmt.Println("4. ./" + Generate + " -h (This is to test if the binary is working")
+			fmt.Println("1. Enter inside " + Generate + " directory")
+			fmt.Println("2. git remote add " + Generate + " <PATH to the github repo>")
+			fmt.Println("3. git push " + Generate + " <PATH to the github repo>")
+			fmt.Println("4. go mod tidy")
+			fmt.Println("5. sh install.sh " + Generate)
+			fmt.Println("6. ./" + Generate + " -h (This is to test if the binary is working)")
 		}
 	}
 	//--------------------------------
diff --git a/cmd/flags.go b/cmd/flags.go
index 07ec2a5..f3e724a 100644
--- a/cmd/flags.go
+++ b/cmd/flags.go
@@ -31,6 +31,7 @@ var (
 	// Generate only allowed in dev release
 	// -- REMOVE ON REGULAR RELEASE --
 	Generate             string
+	Modulename           string
 	//--------------------------------
 )
 
@@ -200,5 +201,12 @@ var AppConfigFlags = []cli.Flag{
 		EnvVars: []string{"GENERATE"},
 		Destination: &Generate,
 	},
+	&cli.StringFlag{
+		Name:        "ModuleName",
+		Aliases: []string{"mod"},
+		Usage:       "New go project module name",
+		EnvVars: []string{"MODULENAME"},
+		Destination: &Modulename,
+	},
 	//--------------------------------
 }
\ No newline at end of file
diff --git a/generate/generate.go b/generate/generate.go
index 7a505d2..e4fb8e4 100644
--- a/generate/generate.go
+++ b/generate/generate.go
@@ -69,7 +69,11 @@ func GenerateNewProject(name string, module string) error {
 	// Action performed:
 	// - Ensuring main.go file exists
 	// - Ensuring generate.go file exists
+	// - Ensuring modifyGenerate.go file exists
+	// - Ensuring generate_test.go file exists
 	// - Ensuring server/server.go file exists
+	// - Ensuring server/gopsutil.go file exists
+	// - Ensuring server/gpu.go file exists
 	// - Ensuring cmd/action.go file exists
 	// - Ensuring cmd/flags.go file exists
 	// - Skipping all .go files apart from the ones listed above
@@ -85,12 +89,24 @@ func GenerateNewProject(name string, module string) error {
 			return false, nil
 		case strings.HasSuffix(src, "generate.go"):
 			return false, nil
+		case strings.HasSuffix(src, "modifyGenerate.go"):
+			return false, nil
+		case strings.HasSuffix(src, "generate_test.go"):
+			return false, nil
 		case strings.HasSuffix(src, "server/server.go"):
 			return false, nil
+		case strings.HasSuffix(src, "server/gopsutil.go"):
+			return false, nil
+		case strings.HasSuffix(src, "server/gpu.go"):
+			return false, nil
 		case strings.HasSuffix(src, "cmd/action.go"):
 			return false, nil
 		case strings.HasSuffix(src, "cmd/flags.go"):
 			return false, nil
+		case strings.HasSuffix(src, "config/config.go"):
+			return false, nil
+		case strings.HasSuffix(src, "config/config_test.go"):
+			return false, nil
 		case strings.HasSuffix(src, ".go"):
 			return true, nil
 		case strings.HasSuffix(src, "go.mod"):
@@ -194,6 +210,7 @@ func (a *NewProject) ChangeImportFiles() error {
 	// Action performed:
 	// Files we would need to modify the imports in
 	// - generate/generate.go -> config module
+	// - generate/generate_test.go -> config module
 	// - cmd/action.go -> config module, server module, generate module
 	// - cmd/flags.go -> config module, server module, generate module
 	// - server/server.go -> config module
@@ -218,6 +235,24 @@ func (a *NewProject) ChangeImportFiles() error {
 	if err != nil {
 		return err
 	}
+	//-----------------------------------------------------------------
+	// 1.1 - generate/generate_test.go -> config module
+	a.FileNameAST = a.NewDir + "generate/generate_test.go"
+	// Get AST information of the file
+	err = a.GetASTGoFile()
+	if err != nil {
+		return err
+	}
+	// Change the appropriate Go file
+	err = a.ChangeImports(a.CurrentModule+"/config", a.Module+"/config")
+	if err != nil {
+		return err
+	}
+	// Writes the change to the appropriate file
+	err = a.WriteGoAst()
+	if err != nil {
+		return err
+	}
 
 	//-----------------------------------------------------------------
 	//-----------------------------------------------------------------