diff --git a/layers/src/main/java/com/iluwatar/layers/App.java b/layers/src/main/java/com/iluwatar/layers/App.java
index 6f939e4c3..dc1595b3d 100644
--- a/layers/src/main/java/com/iluwatar/layers/App.java
+++ b/layers/src/main/java/com/iluwatar/layers/App.java
@@ -11,40 +11,6 @@ public class App {
 		CakeLayerDao cakeLayerDao = context.getBean(CakeLayerDao.class);
 		cakeLayerDao.save(new CakeLayer("strawberry", 1200));
 		System.out.println("Count CakeLayer records: " + cakeLayerDao.count());
-		
-//		PersonDao dao = context.getBean(PersonDao.class);
-//
-//		Person peter = new Person("Peter", "Sagan");
-//		Person nasta = new Person("Nasta", "Kuzminova");
-//
-//		// Add new Person records
-//		dao.save(peter);
-//		dao.save(nasta);
-//
-//		// Count Person records
-//		System.out.println("Count Person records: " + dao.count());
-//
-//		// Print all records
-//		List<Person> persons = (List<Person>) dao.findAll();
-//		for (Person person : persons) {
-//			System.out.println(person);
-//		}
-//
-//		// Find Person by surname
-//		System.out.println("Find by surname 'Sagan': "	+ dao.findBySurname("Sagan"));
-//
-//		// Update Person
-//		nasta.setName("Barbora");
-//		nasta.setSurname("Spotakova");
-//		dao.save(nasta);
-//
-//		System.out.println("Find by id 2: " + dao.findOne(2L));
-//
-//		// Remove record from Person
-//		dao.delete(2L);
-//
-//		// And finally count records
-//		System.out.println("Count Person records: " + dao.count());
 
 		context.close();
 	}
diff --git a/layers/src/main/java/com/iluwatar/layers/CakeBakingService.java b/layers/src/main/java/com/iluwatar/layers/CakeBakingService.java
new file mode 100644
index 000000000..08902bf11
--- /dev/null
+++ b/layers/src/main/java/com/iluwatar/layers/CakeBakingService.java
@@ -0,0 +1,10 @@
+package com.iluwatar.layers;
+
+public interface CakeBakingService {
+	
+	void bakeNewCake(String topping, String layer1, String layer2, String layer3);
+
+	void addNewTopping(CakeTopping topping);
+	
+	void addNewLayer(CakeLayer layer);
+}
diff --git a/layers/src/main/java/com/iluwatar/layers/CakeBakingServiceImpl.java b/layers/src/main/java/com/iluwatar/layers/CakeBakingServiceImpl.java
new file mode 100644
index 000000000..f2d457437
--- /dev/null
+++ b/layers/src/main/java/com/iluwatar/layers/CakeBakingServiceImpl.java
@@ -0,0 +1,20 @@
+package com.iluwatar.layers;
+
+public class CakeBakingServiceImpl implements CakeBakingService {
+
+	@Override
+	public void bakeNewCake(String topping, String layer1, String layer2, String layer3) {
+	}
+
+	@Override
+	public void addNewTopping(CakeTopping topping) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void addNewLayer(CakeLayer layer) {
+		// TODO Auto-generated method stub
+		
+	}
+}
diff --git a/layers/src/main/java/com/iluwatar/layers/CakeInfo.java b/layers/src/main/java/com/iluwatar/layers/CakeInfo.java
new file mode 100644
index 000000000..797bb24a1
--- /dev/null
+++ b/layers/src/main/java/com/iluwatar/layers/CakeInfo.java
@@ -0,0 +1,5 @@
+package com.iluwatar.layers;
+
+public class CakeInfo {
+
+}
diff --git a/layers/src/main/java/com/iluwatar/layers/CakeLayerInfo.java b/layers/src/main/java/com/iluwatar/layers/CakeLayerInfo.java
new file mode 100644
index 000000000..fa74cd5f4
--- /dev/null
+++ b/layers/src/main/java/com/iluwatar/layers/CakeLayerInfo.java
@@ -0,0 +1,5 @@
+package com.iluwatar.layers;
+
+public class CakeLayerInfo {
+
+}
diff --git a/layers/src/main/java/com/iluwatar/layers/CakeToppingInfo.java b/layers/src/main/java/com/iluwatar/layers/CakeToppingInfo.java
new file mode 100644
index 000000000..32aa690cf
--- /dev/null
+++ b/layers/src/main/java/com/iluwatar/layers/CakeToppingInfo.java
@@ -0,0 +1,5 @@
+package com.iluwatar.layers;
+
+public class CakeToppingInfo {
+
+}