diff --git a/cmd/adapters/commander/cli.go b/adapters/commander/cli.go
similarity index 95%
rename from cmd/adapters/commander/cli.go
rename to adapters/commander/cli.go
index a0e0af0..937ca1c 100644
--- a/cmd/adapters/commander/cli.go
+++ b/adapters/commander/cli.go
@@ -4,8 +4,9 @@ package commander
 
 import (
 	"fmt"
-	"github.com/nclsbayona/resume-generator/pkg/core/domain"
-	"github.com/nclsbayona/resume-generator/pkg/core/ports"
+
+	"github.com/nclsbayona/resume-generator/domain"
+	"github.com/nclsbayona/resume-generator/ports"
 )
 
 type CLI struct {
diff --git a/cmd/adapters/commander/config.go b/adapters/commander/config.go
similarity index 93%
rename from cmd/adapters/commander/config.go
rename to adapters/commander/config.go
index 8854b92..59d6457 100644
--- a/cmd/adapters/commander/config.go
+++ b/adapters/commander/config.go
@@ -3,10 +3,11 @@ package commander
 // Options: properties_file_name (File to read the properties from)
 
 import (
-	"github.com/nclsbayona/resume-generator/pkg/core/domain"
-	"github.com/nclsbayona/resume-generator/pkg/core/ports"
-	"gopkg.in/yaml.v3"
 	"os"
+
+	"github.com/nclsbayona/resume-generator/domain"
+	"github.com/nclsbayona/resume-generator/ports"
+	"gopkg.in/yaml.v3"
 )
 
 type sProperties struct {
diff --git a/cmd/adapters/generator/html.go b/adapters/generator/html.go
similarity index 98%
rename from cmd/adapters/generator/html.go
rename to adapters/generator/html.go
index f959ec5..58165b8 100644
--- a/cmd/adapters/generator/html.go
+++ b/adapters/generator/html.go
@@ -3,10 +3,11 @@ package generator
 // Options: template (Template directory to use)
 
 import (
-	"github.com/nclsbayona/resume-generator/pkg/core/domain"
-	"github.com/nclsbayona/resume-generator/pkg/core/ports"
 	"os"
 	"text/template"
+
+	"github.com/nclsbayona/resume-generator/domain"
+	"github.com/nclsbayona/resume-generator/ports"
 )
 
 type AuxiliaryWriter struct {
diff --git a/cmd/adapters/injector/yaml.go b/adapters/injector/yaml.go
similarity index 97%
rename from cmd/adapters/injector/yaml.go
rename to adapters/injector/yaml.go
index e13ed75..1291be1 100644
--- a/cmd/adapters/injector/yaml.go
+++ b/adapters/injector/yaml.go
@@ -3,10 +3,11 @@ package injector
 // Options: input_reading (File to read the resume from)
 
 import (
-	"github.com/nclsbayona/resume-generator/pkg/core/domain"
-	"github.com/nclsbayona/resume-generator/pkg/core/ports"
-	"gopkg.in/yaml.v3"
 	"os"
+
+	"github.com/nclsbayona/resume-generator/domain"
+	"github.com/nclsbayona/resume-generator/ports"
+	"gopkg.in/yaml.v3"
 )
 
 type sAchievement string
diff --git a/pkg/core/domain/continous_education.go b/domain/continous_education.go
similarity index 100%
rename from pkg/core/domain/continous_education.go
rename to domain/continous_education.go
diff --git a/pkg/core/domain/continous_education_test.go b/domain/continous_education_test.go
similarity index 100%
rename from pkg/core/domain/continous_education_test.go
rename to domain/continous_education_test.go
diff --git a/pkg/core/domain/education.go b/domain/education.go
similarity index 100%
rename from pkg/core/domain/education.go
rename to domain/education.go
diff --git a/pkg/core/domain/education_test.go b/domain/education_test.go
similarity index 100%
rename from pkg/core/domain/education_test.go
rename to domain/education_test.go
diff --git a/pkg/core/domain/experience.go b/domain/experience.go
similarity index 100%
rename from pkg/core/domain/experience.go
rename to domain/experience.go
diff --git a/pkg/core/domain/experience_test.go b/domain/experience_test.go
similarity index 100%
rename from pkg/core/domain/experience_test.go
rename to domain/experience_test.go
diff --git a/pkg/core/domain/extra_info.go b/domain/extra_info.go
similarity index 100%
rename from pkg/core/domain/extra_info.go
rename to domain/extra_info.go
diff --git a/pkg/core/domain/extra_info_test.go b/domain/extra_info_test.go
similarity index 100%
rename from pkg/core/domain/extra_info_test.go
rename to domain/extra_info_test.go
diff --git a/pkg/core/domain/full.go b/domain/full.go
similarity index 100%
rename from pkg/core/domain/full.go
rename to domain/full.go
diff --git a/pkg/core/domain/full_test.go b/domain/full_test.go
similarity index 100%
rename from pkg/core/domain/full_test.go
rename to domain/full_test.go
diff --git a/pkg/core/domain/logger.go b/domain/logger.go
similarity index 100%
rename from pkg/core/domain/logger.go
rename to domain/logger.go
diff --git a/pkg/core/domain/logger_test.go b/domain/logger_test.go
similarity index 100%
rename from pkg/core/domain/logger_test.go
rename to domain/logger_test.go
diff --git a/cmd/main.go b/examples/main.go
similarity index 90%
rename from cmd/main.go
rename to examples/main.go
index 61fcf10..9e95522 100644
--- a/cmd/main.go
+++ b/examples/main.go
@@ -2,11 +2,11 @@ package main
 
 import (
 	"flag"
-	"github.com/nclsbayona/resume-generator/cmd/adapters/commander"
-	"github.com/nclsbayona/resume-generator/cmd/adapters/generator"
-	"github.com/nclsbayona/resume-generator/cmd/adapters/injector"
-	"github.com/nclsbayona/resume-generator/pkg/core/domain"
-	"github.com/nclsbayona/resume-generator/pkg/core/ports"
+	"github.com/nclsbayona/resume-generator/adapters/commander"
+	"github.com/nclsbayona/resume-generator/adapters/generator"
+	"github.com/nclsbayona/resume-generator/adapters/injector"
+	"github.com/nclsbayona/resume-generator/domain"
+	"github.com/nclsbayona/resume-generator/ports"
 	"os"
 )
 
diff --git a/pkg/core/ports/commander.go b/ports/commander.go
similarity index 77%
rename from pkg/core/ports/commander.go
rename to ports/commander.go
index faf0842..3829679 100644
--- a/pkg/core/ports/commander.go
+++ b/ports/commander.go
@@ -1,7 +1,7 @@
 package ports
 
 import (
-	"github.com/nclsbayona/resume-generator/pkg/core/domain"
+	"github.com/nclsbayona/resume-generator/domain"
 )
 
 type Commander interface {
diff --git a/pkg/core/ports/generator.go b/ports/generator.go
similarity index 75%
rename from pkg/core/ports/generator.go
rename to ports/generator.go
index 563a384..3c68c19 100644
--- a/pkg/core/ports/generator.go
+++ b/ports/generator.go
@@ -1,7 +1,7 @@
 package ports
 
 import (
-	"github.com/nclsbayona/resume-generator/pkg/core/domain"
+	"github.com/nclsbayona/resume-generator/domain"
 )
 
 type Generator interface {
diff --git a/pkg/core/ports/injector.go b/ports/injector.go
similarity index 73%
rename from pkg/core/ports/injector.go
rename to ports/injector.go
index 0e331db..7f97d68 100644
--- a/pkg/core/ports/injector.go
+++ b/ports/injector.go
@@ -1,7 +1,7 @@
 package ports
 
 import (
-	"github.com/nclsbayona/resume-generator/pkg/core/domain"
+	"github.com/nclsbayona/resume-generator/domain"
 )
 
 type Injector interface {
diff --git a/pkg/core/usecase/printresume.go b/usecase/printresume.go
similarity index 92%
rename from pkg/core/usecase/printresume.go
rename to usecase/printresume.go
index e2e9244..cb3c481 100644
--- a/pkg/core/usecase/printresume.go
+++ b/usecase/printresume.go
@@ -1,8 +1,8 @@
 package usecase
 
 import (
-	"github.com/nclsbayona/resume-generator/pkg/core/domain"
-	"github.com/nclsbayona/resume-generator/pkg/core/ports"
+	"github.com/nclsbayona/resume-generator/domain"
+	"github.com/nclsbayona/resume-generator/ports"
 )
 
 type sPrintResume struct {