diff --git a/.gitignore b/.gitignore
index 9ea392c..a3bd716 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,12 @@
spring-boot-generate/target/
+spring-boot-generate/*.iml
spring-scaffold-cli/target/
+spring-scaffold-cli/*.iml
+generator-core/target/
+generator-core/*.iml
+templates-java/target/
+templates-java/*.iml
+
+*.iml
+.idea/
+
diff --git a/README.md b/README.md
index 36212c6..707db90 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ And install the Spring Scaffold plugin
$ git clone https://github.com/NetoDevel/cli-spring-boot-scaffold.git
$ cd cli-spring-boot-scaffold
$ mvn install
- $ spring install br.com.netodevel:spring-scaffold-cli:0.0.1-SNAPSHOT
+ $ spring install br.com.netodevel:spring-scaffold-cli:{LATEST_RELEASE}
# Usage
diff --git a/spring-boot-generate/src/test/java/br/com/netodevel/generate/test/ControllerGenerateTest.java b/spring-boot-generate/src/test/java/br/com/generate/test/ControllerGenerateTest.java
similarity index 88%
rename from spring-boot-generate/src/test/java/br/com/netodevel/generate/test/ControllerGenerateTest.java
rename to spring-boot-generate/src/test/java/br/com/generate/test/ControllerGenerateTest.java
index 40736b8..955d3c0 100644
--- a/spring-boot-generate/src/test/java/br/com/netodevel/generate/test/ControllerGenerateTest.java
+++ b/spring-boot-generate/src/test/java/br/com/generate/test/ControllerGenerateTest.java
@@ -1,8 +1,8 @@
-package br.com.netodevel.generate.test;
+package br.com.generate.test;
import br.com.generate.Layers;
import br.com.generate.source.controller.ControllerGenerator;
-import br.com.netodevel.generate.utils.LoadTemplateHelper;
+import br.com.generate.utils.LoadTemplateHelper;
import org.junit.Test;
import java.io.IOException;
diff --git a/spring-boot-generate/src/test/java/br/com/netodevel/generate/test/RepositoryCleanGeneratorBoundaryTest.java b/spring-boot-generate/src/test/java/br/com/generate/test/RepositoryCleanGeneratorBoundaryTest.java
similarity index 88%
rename from spring-boot-generate/src/test/java/br/com/netodevel/generate/test/RepositoryCleanGeneratorBoundaryTest.java
rename to spring-boot-generate/src/test/java/br/com/generate/test/RepositoryCleanGeneratorBoundaryTest.java
index f938d33..303b27e 100644
--- a/spring-boot-generate/src/test/java/br/com/netodevel/generate/test/RepositoryCleanGeneratorBoundaryTest.java
+++ b/spring-boot-generate/src/test/java/br/com/generate/test/RepositoryCleanGeneratorBoundaryTest.java
@@ -1,8 +1,8 @@
-package br.com.netodevel.generate.test;
+package br.com.generate.test;
import br.com.generate.Layers;
import br.com.generate.source.repository.RepositoryCleanGenerator;
-import br.com.netodevel.generate.utils.LoadTemplateHelper;
+import br.com.generate.utils.LoadTemplateHelper;
import org.junit.Test;
import java.io.IOException;
diff --git a/spring-boot-generate/src/test/java/br/com/netodevel/generate/test/RepositoryGenerateTest.java b/spring-boot-generate/src/test/java/br/com/generate/test/RepositoryGenerateTest.java
similarity index 88%
rename from spring-boot-generate/src/test/java/br/com/netodevel/generate/test/RepositoryGenerateTest.java
rename to spring-boot-generate/src/test/java/br/com/generate/test/RepositoryGenerateTest.java
index 4bdfe61..0f6087b 100644
--- a/spring-boot-generate/src/test/java/br/com/netodevel/generate/test/RepositoryGenerateTest.java
+++ b/spring-boot-generate/src/test/java/br/com/generate/test/RepositoryGenerateTest.java
@@ -1,8 +1,8 @@
-package br.com.netodevel.generate.test;
+package br.com.generate.test;
import br.com.generate.Layers;
import br.com.generate.source.repository.RepositoryGenerator;
-import br.com.netodevel.generate.utils.LoadTemplateHelper;
+import br.com.generate.utils.LoadTemplateHelper;
import org.junit.Test;
import java.io.IOException;
diff --git a/spring-boot-generate/src/test/java/br/com/netodevel/generate/test/ServiceGenerateTest.java b/spring-boot-generate/src/test/java/br/com/generate/test/ServiceGenerateTest.java
similarity index 87%
rename from spring-boot-generate/src/test/java/br/com/netodevel/generate/test/ServiceGenerateTest.java
rename to spring-boot-generate/src/test/java/br/com/generate/test/ServiceGenerateTest.java
index 55ef96c..c95cba4 100644
--- a/spring-boot-generate/src/test/java/br/com/netodevel/generate/test/ServiceGenerateTest.java
+++ b/spring-boot-generate/src/test/java/br/com/generate/test/ServiceGenerateTest.java
@@ -1,8 +1,8 @@
-package br.com.netodevel.generate.test;
+package br.com.generate.test;
import br.com.generate.Layers;
import br.com.generate.source.service.ServiceGenerator;
-import br.com.netodevel.generate.utils.LoadTemplateHelper;
+import br.com.generate.utils.LoadTemplateHelper;
import org.junit.Test;
import java.io.IOException;
diff --git a/spring-boot-generate/src/test/java/br/com/netodevel/generate/utils/FileGeneratorTestUtils.java b/spring-boot-generate/src/test/java/br/com/generate/utils/FileGeneratorTestUtils.java
similarity index 95%
rename from spring-boot-generate/src/test/java/br/com/netodevel/generate/utils/FileGeneratorTestUtils.java
rename to spring-boot-generate/src/test/java/br/com/generate/utils/FileGeneratorTestUtils.java
index 3c4e638..b5df39a 100644
--- a/spring-boot-generate/src/test/java/br/com/netodevel/generate/utils/FileGeneratorTestUtils.java
+++ b/spring-boot-generate/src/test/java/br/com/generate/utils/FileGeneratorTestUtils.java
@@ -1,4 +1,4 @@
-package br.com.netodevel.generate.utils;
+package br.com.generate.utils;
import java.io.File;
import java.io.FileInputStream;
diff --git a/spring-boot-generate/src/test/java/br/com/netodevel/generate/utils/LoadTemplateHelper.java b/spring-boot-generate/src/test/java/br/com/generate/utils/LoadTemplateHelper.java
similarity index 91%
rename from spring-boot-generate/src/test/java/br/com/netodevel/generate/utils/LoadTemplateHelper.java
rename to spring-boot-generate/src/test/java/br/com/generate/utils/LoadTemplateHelper.java
index 5165bea..680605c 100644
--- a/spring-boot-generate/src/test/java/br/com/netodevel/generate/utils/LoadTemplateHelper.java
+++ b/spring-boot-generate/src/test/java/br/com/generate/utils/LoadTemplateHelper.java
@@ -1,4 +1,4 @@
-package br.com.netodevel.generate.utils;
+package br.com.generate.utils;
import org.apache.commons.io.IOUtils;
diff --git a/spring-scaffold-cli/pom.xml b/spring-scaffold-cli/pom.xml
index 3b84a17..ffa6972 100644
--- a/spring-scaffold-cli/pom.xml
+++ b/spring-scaffold-cli/pom.xml
@@ -1,45 +1,45 @@
- 4.0.0
- br.com.netodevel
- spring-scaffold-cli
- 0.0.2-SNAPSHOT
-
-
- org.springframework.boot
- spring-boot-starter-parent
- 2.1.3.RELEASE
-
-
-
-
- org.springframework.boot
- spring-boot-cli
- 2.1.3.RELEASE
-
-
-
- junit
- junit
-
-
-
- br.com
- spring-boot-generate
- 0.0.2-SNAPSHOT
-
-
-
- br.com.netodevel
- templates-java
- 0.0.1.BUILD-SNAPSHOT
-
-
-
- org.springframework.boot
- spring-boot-starter-test
-
-
-
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ 4.0.0
+ br.com.netodevel
+ spring-scaffold-cli
+ 0.0.2-SNAPSHOT
+
+
+ org.springframework.boot
+ spring-boot-starter-parent
+ 2.1.3.RELEASE
+
+
+
+
+ org.springframework.boot
+ spring-boot-cli
+ 2.1.3.RELEASE
+
+
+
+ junit
+ junit
+
+
+
+ br.com
+ spring-boot-generate
+ 0.0.2-SNAPSHOT
+
+
+
+ br.com.netodevel
+ templates-java
+ 0.0.2.BUILD-SNAPSHOT
+
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+
+
+
\ No newline at end of file
diff --git a/spring-scaffold-cli/src/main/java/br/com/netodevel/command/ScaffoldFactoryCommands.java b/spring-scaffold-cli/src/main/java/br/com/command/ScaffoldFactoryCommands.java
similarity index 57%
rename from spring-scaffold-cli/src/main/java/br/com/netodevel/command/ScaffoldFactoryCommands.java
rename to spring-scaffold-cli/src/main/java/br/com/command/ScaffoldFactoryCommands.java
index 6210296..43c4324 100644
--- a/spring-scaffold-cli/src/main/java/br/com/netodevel/command/ScaffoldFactoryCommands.java
+++ b/spring-scaffold-cli/src/main/java/br/com/command/ScaffoldFactoryCommands.java
@@ -1,20 +1,20 @@
-package br.com.netodevel.command;
+package br.com.command;
+import br.com.command.model.ModelHandler;
import br.com.generate.helpers.ScaffoldInfoHelper;
-import br.com.netodevel.command.controller.ControllerCommand;
-import br.com.netodevel.command.controller.ControllerHandler;
-import br.com.netodevel.command.model.ModelCommand;
-import br.com.netodevel.command.model.ModelHandler;
-import br.com.netodevel.command.repository.RepositoryCommand;
-import br.com.netodevel.command.repository.RepositoryHandler;
-import br.com.netodevel.command.scaffold.ScaffoldCommand;
-import br.com.netodevel.command.scaffold.ScaffoldHandler;
-import br.com.netodevel.command.service.ServiceCommand;
-import br.com.netodevel.command.service.ServiceHandler;
-import br.com.netodevel.command.setup.SetupScaffoldCommand;
-import br.com.netodevel.command.setup.SetupScaffoldHandler;
-import br.com.netodevel.command.template.TemplateCommand;
-import br.com.netodevel.command.template.TemplateHandler;
+import br.com.command.controller.ControllerCommand;
+import br.com.command.controller.ControllerHandler;
+import br.com.command.model.ModelCommand;
+import br.com.command.repository.RepositoryCommand;
+import br.com.command.repository.RepositoryHandler;
+import br.com.command.scaffold.ScaffoldCommand;
+import br.com.command.scaffold.ScaffoldHandler;
+import br.com.command.service.ServiceCommand;
+import br.com.command.service.ServiceHandler;
+import br.com.command.setup.SetupScaffoldCommand;
+import br.com.command.setup.SetupScaffoldHandler;
+import br.com.command.template.TemplateCommand;
+import br.com.command.template.TemplateHandler;
import org.springframework.boot.cli.command.Command;
import org.springframework.boot.cli.command.CommandFactory;
diff --git a/spring-scaffold-cli/src/main/java/br/com/netodevel/command/controller/ControllerCommand.java b/spring-scaffold-cli/src/main/java/br/com/command/controller/ControllerCommand.java
similarity index 95%
rename from spring-scaffold-cli/src/main/java/br/com/netodevel/command/controller/ControllerCommand.java
rename to spring-scaffold-cli/src/main/java/br/com/command/controller/ControllerCommand.java
index 1c8d1e9..629828f 100644
--- a/spring-scaffold-cli/src/main/java/br/com/netodevel/command/controller/ControllerCommand.java
+++ b/spring-scaffold-cli/src/main/java/br/com/command/controller/ControllerCommand.java
@@ -1,4 +1,4 @@
-package br.com.netodevel.command.controller;
+package br.com.command.controller;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/spring-scaffold-cli/src/main/java/br/com/netodevel/command/controller/ControllerHandler.java b/spring-scaffold-cli/src/main/java/br/com/command/controller/ControllerHandler.java
similarity index 96%
rename from spring-scaffold-cli/src/main/java/br/com/netodevel/command/controller/ControllerHandler.java
rename to spring-scaffold-cli/src/main/java/br/com/command/controller/ControllerHandler.java
index 2f4134f..4d73a1d 100644
--- a/spring-scaffold-cli/src/main/java/br/com/netodevel/command/controller/ControllerHandler.java
+++ b/spring-scaffold-cli/src/main/java/br/com/command/controller/ControllerHandler.java
@@ -1,4 +1,4 @@
-package br.com.netodevel.command.controller;
+package br.com.command.controller;
import java.io.IOException;
import java.util.Arrays;
diff --git a/spring-scaffold-cli/src/main/java/br/com/netodevel/command/model/ModelCommand.java b/spring-scaffold-cli/src/main/java/br/com/command/model/ModelCommand.java
similarity index 96%
rename from spring-scaffold-cli/src/main/java/br/com/netodevel/command/model/ModelCommand.java
rename to spring-scaffold-cli/src/main/java/br/com/command/model/ModelCommand.java
index 536dbe8..3ef3aae 100644
--- a/spring-scaffold-cli/src/main/java/br/com/netodevel/command/model/ModelCommand.java
+++ b/spring-scaffold-cli/src/main/java/br/com/command/model/ModelCommand.java
@@ -1,4 +1,4 @@
-package br.com.netodevel.command.model;
+package br.com.command.model;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/spring-scaffold-cli/src/main/java/br/com/netodevel/command/model/ModelHandler.java b/spring-scaffold-cli/src/main/java/br/com/command/model/ModelHandler.java
similarity index 96%
rename from spring-scaffold-cli/src/main/java/br/com/netodevel/command/model/ModelHandler.java
rename to spring-scaffold-cli/src/main/java/br/com/command/model/ModelHandler.java
index 4bcec90..ae6baa8 100644
--- a/spring-scaffold-cli/src/main/java/br/com/netodevel/command/model/ModelHandler.java
+++ b/spring-scaffold-cli/src/main/java/br/com/command/model/ModelHandler.java
@@ -1,4 +1,4 @@
-package br.com.netodevel.command.model;
+package br.com.command.model;
import java.io.IOException;
import java.util.Arrays;
diff --git a/spring-scaffold-cli/src/main/java/br/com/netodevel/command/repository/RepositoryCommand.java b/spring-scaffold-cli/src/main/java/br/com/command/repository/RepositoryCommand.java
similarity index 95%
rename from spring-scaffold-cli/src/main/java/br/com/netodevel/command/repository/RepositoryCommand.java
rename to spring-scaffold-cli/src/main/java/br/com/command/repository/RepositoryCommand.java
index e29e9bf..7fa33d3 100644
--- a/spring-scaffold-cli/src/main/java/br/com/netodevel/command/repository/RepositoryCommand.java
+++ b/spring-scaffold-cli/src/main/java/br/com/command/repository/RepositoryCommand.java
@@ -1,4 +1,4 @@
-package br.com.netodevel.command.repository;
+package br.com.command.repository;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/spring-scaffold-cli/src/main/java/br/com/netodevel/command/repository/RepositoryHandler.java b/spring-scaffold-cli/src/main/java/br/com/command/repository/RepositoryHandler.java
similarity index 95%
rename from spring-scaffold-cli/src/main/java/br/com/netodevel/command/repository/RepositoryHandler.java
rename to spring-scaffold-cli/src/main/java/br/com/command/repository/RepositoryHandler.java
index af71c60..fc2c9d9 100644
--- a/spring-scaffold-cli/src/main/java/br/com/netodevel/command/repository/RepositoryHandler.java
+++ b/spring-scaffold-cli/src/main/java/br/com/command/repository/RepositoryHandler.java
@@ -1,4 +1,4 @@
-package br.com.netodevel.command.repository;
+package br.com.command.repository;
import java.io.IOException;
import java.util.Arrays;
diff --git a/spring-scaffold-cli/src/main/java/br/com/netodevel/command/scaffold/ScaffoldCommand.java b/spring-scaffold-cli/src/main/java/br/com/command/scaffold/ScaffoldCommand.java
similarity index 94%
rename from spring-scaffold-cli/src/main/java/br/com/netodevel/command/scaffold/ScaffoldCommand.java
rename to spring-scaffold-cli/src/main/java/br/com/command/scaffold/ScaffoldCommand.java
index 3978059..ac121c0 100644
--- a/spring-scaffold-cli/src/main/java/br/com/netodevel/command/scaffold/ScaffoldCommand.java
+++ b/spring-scaffold-cli/src/main/java/br/com/command/scaffold/ScaffoldCommand.java
@@ -1,4 +1,4 @@
-package br.com.netodevel.command.scaffold;
+package br.com.command.scaffold;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/spring-scaffold-cli/src/main/java/br/com/netodevel/command/scaffold/ScaffoldHandler.java b/spring-scaffold-cli/src/main/java/br/com/command/scaffold/ScaffoldHandler.java
similarity index 98%
rename from spring-scaffold-cli/src/main/java/br/com/netodevel/command/scaffold/ScaffoldHandler.java
rename to spring-scaffold-cli/src/main/java/br/com/command/scaffold/ScaffoldHandler.java
index a309694..e48f618 100644
--- a/spring-scaffold-cli/src/main/java/br/com/netodevel/command/scaffold/ScaffoldHandler.java
+++ b/spring-scaffold-cli/src/main/java/br/com/command/scaffold/ScaffoldHandler.java
@@ -1,4 +1,4 @@
-package br.com.netodevel.command.scaffold;
+package br.com.command.scaffold;
import java.io.IOException;
import java.util.Arrays;
diff --git a/spring-scaffold-cli/src/main/java/br/com/netodevel/command/service/ServiceCommand.java b/spring-scaffold-cli/src/main/java/br/com/command/service/ServiceCommand.java
similarity index 95%
rename from spring-scaffold-cli/src/main/java/br/com/netodevel/command/service/ServiceCommand.java
rename to spring-scaffold-cli/src/main/java/br/com/command/service/ServiceCommand.java
index cc36c21..8cff9a3 100644
--- a/spring-scaffold-cli/src/main/java/br/com/netodevel/command/service/ServiceCommand.java
+++ b/spring-scaffold-cli/src/main/java/br/com/command/service/ServiceCommand.java
@@ -1,4 +1,4 @@
-package br.com.netodevel.command.service;
+package br.com.command.service;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/spring-scaffold-cli/src/main/java/br/com/netodevel/command/service/ServiceHandler.java b/spring-scaffold-cli/src/main/java/br/com/command/service/ServiceHandler.java
similarity index 95%
rename from spring-scaffold-cli/src/main/java/br/com/netodevel/command/service/ServiceHandler.java
rename to spring-scaffold-cli/src/main/java/br/com/command/service/ServiceHandler.java
index 9dfe731..ef813f1 100644
--- a/spring-scaffold-cli/src/main/java/br/com/netodevel/command/service/ServiceHandler.java
+++ b/spring-scaffold-cli/src/main/java/br/com/command/service/ServiceHandler.java
@@ -1,4 +1,4 @@
-package br.com.netodevel.command.service;
+package br.com.command.service;
import java.io.IOException;
import java.util.Arrays;
diff --git a/spring-scaffold-cli/src/main/java/br/com/netodevel/command/setup/SetupScaffoldCommand.java b/spring-scaffold-cli/src/main/java/br/com/command/setup/SetupScaffoldCommand.java
similarity index 95%
rename from spring-scaffold-cli/src/main/java/br/com/netodevel/command/setup/SetupScaffoldCommand.java
rename to spring-scaffold-cli/src/main/java/br/com/command/setup/SetupScaffoldCommand.java
index c125d3c..120cb21 100644
--- a/spring-scaffold-cli/src/main/java/br/com/netodevel/command/setup/SetupScaffoldCommand.java
+++ b/spring-scaffold-cli/src/main/java/br/com/command/setup/SetupScaffoldCommand.java
@@ -1,4 +1,4 @@
-package br.com.netodevel.command.setup;
+package br.com.command.setup;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/spring-scaffold-cli/src/main/java/br/com/netodevel/command/setup/SetupScaffoldHandler.java b/spring-scaffold-cli/src/main/java/br/com/command/setup/SetupScaffoldHandler.java
similarity index 98%
rename from spring-scaffold-cli/src/main/java/br/com/netodevel/command/setup/SetupScaffoldHandler.java
rename to spring-scaffold-cli/src/main/java/br/com/command/setup/SetupScaffoldHandler.java
index c513d55..412b1af 100644
--- a/spring-scaffold-cli/src/main/java/br/com/netodevel/command/setup/SetupScaffoldHandler.java
+++ b/spring-scaffold-cli/src/main/java/br/com/command/setup/SetupScaffoldHandler.java
@@ -1,4 +1,4 @@
-package br.com.netodevel.command.setup;
+package br.com.command.setup;
import java.util.Arrays;
diff --git a/spring-scaffold-cli/src/main/java/br/com/netodevel/command/template/TemplateCommand.java b/spring-scaffold-cli/src/main/java/br/com/command/template/TemplateCommand.java
similarity index 90%
rename from spring-scaffold-cli/src/main/java/br/com/netodevel/command/template/TemplateCommand.java
rename to spring-scaffold-cli/src/main/java/br/com/command/template/TemplateCommand.java
index 01fb400..6e555d5 100644
--- a/spring-scaffold-cli/src/main/java/br/com/netodevel/command/template/TemplateCommand.java
+++ b/spring-scaffold-cli/src/main/java/br/com/command/template/TemplateCommand.java
@@ -1,4 +1,4 @@
-package br.com.netodevel.command.template;
+package br.com.command.template;
import org.springframework.boot.cli.command.OptionParsingCommand;
import org.springframework.boot.cli.command.options.OptionHandler;
diff --git a/spring-scaffold-cli/src/main/java/br/com/netodevel/command/template/TemplateHandler.java b/spring-scaffold-cli/src/main/java/br/com/command/template/TemplateHandler.java
similarity index 98%
rename from spring-scaffold-cli/src/main/java/br/com/netodevel/command/template/TemplateHandler.java
rename to spring-scaffold-cli/src/main/java/br/com/command/template/TemplateHandler.java
index c078d9f..9d2f0cf 100644
--- a/spring-scaffold-cli/src/main/java/br/com/netodevel/command/template/TemplateHandler.java
+++ b/spring-scaffold-cli/src/main/java/br/com/command/template/TemplateHandler.java
@@ -1,4 +1,4 @@
-package br.com.netodevel.command.template;
+package br.com.command.template;
import br.com.generate.helpers.ScaffoldInfoHelper;
import br.com.generator.core.GeneratorOptions;
diff --git a/spring-scaffold-cli/src/main/java/br/com/netodevel/exceptions/ValidatorException.java b/spring-scaffold-cli/src/main/java/br/com/netodevel/exceptions/ValidatorException.java
deleted file mode 100644
index 85a59eb..0000000
--- a/spring-scaffold-cli/src/main/java/br/com/netodevel/exceptions/ValidatorException.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package br.com.netodevel.exceptions;
-
-public class ValidatorException extends RuntimeException {
-
- public ValidatorException(String msg) {
- super(msg);
- }
-}
diff --git a/spring-scaffold-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.command.CommandFactory b/spring-scaffold-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.command.CommandFactory
index afb27bd..a1ce556 100644
--- a/spring-scaffold-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.command.CommandFactory
+++ b/spring-scaffold-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.command.CommandFactory
@@ -1 +1 @@
-br.com.netodevel.command.ScaffoldFactoryCommands
\ No newline at end of file
+br.com.command.ScaffoldFactoryCommands
\ No newline at end of file
diff --git a/spring-scaffold-cli/src/test/java/br/com/netodevel/command/template/TemplateHandlerTest.java b/spring-scaffold-cli/src/test/java/br/com/command/template/TemplateHandlerTest.java
similarity index 98%
rename from spring-scaffold-cli/src/test/java/br/com/netodevel/command/template/TemplateHandlerTest.java
rename to spring-scaffold-cli/src/test/java/br/com/command/template/TemplateHandlerTest.java
index 54e9bb5..e0c6adf 100644
--- a/spring-scaffold-cli/src/test/java/br/com/netodevel/command/template/TemplateHandlerTest.java
+++ b/spring-scaffold-cli/src/test/java/br/com/command/template/TemplateHandlerTest.java
@@ -1,4 +1,4 @@
-package br.com.netodevel.command.template;
+package br.com.command.template;
import br.com.generate.helpers.ScaffoldInfoHelper;
import org.junit.Before;
diff --git a/templates-java/pom.xml b/templates-java/pom.xml
index 89cffb2..2ca0ff8 100644
--- a/templates-java/pom.xml
+++ b/templates-java/pom.xml
@@ -8,8 +8,8 @@
0.0.2.BUILD-SNAPSHOT
4.0.0
-
templates-java
+
@@ -26,7 +26,7 @@
br.com.netodevel
generator-core
- 0.0.1.BUILD-SNAPSHOT
+ 0.0.2.BUILD-SNAPSHOT
compile