diff --git a/src/main/java/guru/springframework/config/GreetingServiceConfig.java b/src/main/java/guru/springframework/config/GreetingServiceConfig.java
new file mode 100644
index 00000000..7d613008
--- /dev/null
+++ b/src/main/java/guru/springframework/config/GreetingServiceConfig.java
@@ -0,0 +1,2 @@
+package guru.springframework.config;public class GreetingServiceConfig {
+}
diff --git a/src/main/java/guru/springframework/config/PropertyConfig.java b/src/main/java/guru/springframework/config/PropertyConfig.java
new file mode 100644
index 00000000..e00844c3
--- /dev/null
+++ b/src/main/java/guru/springframework/config/PropertyConfig.java
@@ -0,0 +1,2 @@
+package guru.springframework.config;public class PropertyConfig {
+}
diff --git a/src/main/java/guru/springframework/examplebeans/FakeDataSource.java b/src/main/java/guru/springframework/examplebeans/FakeDataSource.java
new file mode 100644
index 00000000..a36db105
--- /dev/null
+++ b/src/main/java/guru/springframework/examplebeans/FakeDataSource.java
@@ -0,0 +1,2 @@
+package guru.springframework.examplebeans;public class FakeDataSource {
+}
diff --git a/src/main/java/guru/services/ConstructorGreetingService.java b/src/main/java/guru/springframework/services/ConstructorGreetingService.java
similarity index 100%
rename from src/main/java/guru/services/ConstructorGreetingService.java
rename to src/main/java/guru/springframework/services/ConstructorGreetingService.java
diff --git a/src/main/java/guru/services/GetterGreetingService.java b/src/main/java/guru/springframework/services/GetterGreetingService.java
similarity index 100%
rename from src/main/java/guru/services/GetterGreetingService.java
rename to src/main/java/guru/springframework/services/GetterGreetingService.java
diff --git a/src/main/java/guru/services/GreetingRepository.java b/src/main/java/guru/springframework/services/GreetingRepository.java
similarity index 100%
rename from src/main/java/guru/services/GreetingRepository.java
rename to src/main/java/guru/springframework/services/GreetingRepository.java
diff --git a/src/main/java/guru/services/GreetingRepositoryImpl.java b/src/main/java/guru/springframework/services/GreetingRepositoryImpl.java
similarity index 100%
rename from src/main/java/guru/services/GreetingRepositoryImpl.java
rename to src/main/java/guru/springframework/services/GreetingRepositoryImpl.java
diff --git a/src/main/java/guru/services/GreetingService.java b/src/main/java/guru/springframework/services/GreetingService.java
similarity index 100%
rename from src/main/java/guru/services/GreetingService.java
rename to src/main/java/guru/springframework/services/GreetingService.java
diff --git a/src/main/java/guru/springframework/services/GreetingServiceFactory.java b/src/main/java/guru/springframework/services/GreetingServiceFactory.java
new file mode 100644
index 00000000..0ae98e4d
--- /dev/null
+++ b/src/main/java/guru/springframework/services/GreetingServiceFactory.java
@@ -0,0 +1,23 @@
+package guru.services;
+
+public class GreetingServiceFactory {
+
+    private GreetingRepository greetingRepository;
+
+    public GreetingServiceFactory(GreetingRepository greetingRepository) {
+        this.greetingRepository = greetingRepository;
+    }
+
+    public GreetingService createGreetingService(String lang){
+        switch (lang){
+            case "en":
+                return new PrimaryGreetingService(greetingRepository);
+            case "de":
+                return new PrimaryGermanGreetingService(greetingRepository);
+            case "es":
+                return new PrimarySpanishGreetingService(greetingRepository);
+            default:
+                return new PrimaryGreetingService(greetingRepository);
+        }
+    }
+}
diff --git a/src/main/java/guru/services/GreetingServiceImpl.java b/src/main/java/guru/springframework/services/GreetingServiceImpl.java
similarity index 100%
rename from src/main/java/guru/services/GreetingServiceImpl.java
rename to src/main/java/guru/springframework/services/GreetingServiceImpl.java
diff --git a/src/main/java/guru/services/PrimaryGermanGreetingService.java b/src/main/java/guru/springframework/services/PrimaryGermanGreetingService.java
similarity index 100%
rename from src/main/java/guru/services/PrimaryGermanGreetingService.java
rename to src/main/java/guru/springframework/services/PrimaryGermanGreetingService.java
diff --git a/src/main/java/guru/services/PrimaryGreetingService.java b/src/main/java/guru/springframework/services/PrimaryGreetingService.java
similarity index 100%
rename from src/main/java/guru/services/PrimaryGreetingService.java
rename to src/main/java/guru/springframework/services/PrimaryGreetingService.java
diff --git a/src/main/java/guru/services/PrimarySpanishGreetingService.java b/src/main/java/guru/springframework/services/PrimarySpanishGreetingService.java
similarity index 100%
rename from src/main/java/guru/services/PrimarySpanishGreetingService.java
rename to src/main/java/guru/springframework/services/PrimarySpanishGreetingService.java
diff --git a/src/main/resources/datasource.properties b/src/main/resources/datasource.properties
new file mode 100644
index 00000000..e69de29b