diff --git a/flux/src/main/java/com/iluwatar/Action.java b/flux/src/main/java/com/iluwatar/action/Action.java
similarity index 85%
rename from flux/src/main/java/com/iluwatar/Action.java
rename to flux/src/main/java/com/iluwatar/action/Action.java
index 8340d9724..899558488 100644
--- a/flux/src/main/java/com/iluwatar/Action.java
+++ b/flux/src/main/java/com/iluwatar/action/Action.java
@@ -1,4 +1,5 @@
-package com.iluwatar;
+package com.iluwatar.action;
+
 
 public abstract class Action {
 
diff --git a/flux/src/main/java/com/iluwatar/ActionType.java b/flux/src/main/java/com/iluwatar/action/ActionType.java
similarity index 70%
rename from flux/src/main/java/com/iluwatar/ActionType.java
rename to flux/src/main/java/com/iluwatar/action/ActionType.java
index 4bbd44ebb..c61a33fc7 100644
--- a/flux/src/main/java/com/iluwatar/ActionType.java
+++ b/flux/src/main/java/com/iluwatar/action/ActionType.java
@@ -1,4 +1,4 @@
-package com.iluwatar;
+package com.iluwatar.action;
 
 public enum ActionType {
 
diff --git a/flux/src/main/java/com/iluwatar/Content.java b/flux/src/main/java/com/iluwatar/action/Content.java
similarity index 91%
rename from flux/src/main/java/com/iluwatar/Content.java
rename to flux/src/main/java/com/iluwatar/action/Content.java
index f86e476cb..32a16876d 100644
--- a/flux/src/main/java/com/iluwatar/Content.java
+++ b/flux/src/main/java/com/iluwatar/action/Content.java
@@ -1,4 +1,4 @@
-package com.iluwatar;
+package com.iluwatar.action;
 
 public enum Content {
 	
diff --git a/flux/src/main/java/com/iluwatar/ContentAction.java b/flux/src/main/java/com/iluwatar/action/ContentAction.java
similarity index 88%
rename from flux/src/main/java/com/iluwatar/ContentAction.java
rename to flux/src/main/java/com/iluwatar/action/ContentAction.java
index 25de55d32..78534aa35 100644
--- a/flux/src/main/java/com/iluwatar/ContentAction.java
+++ b/flux/src/main/java/com/iluwatar/action/ContentAction.java
@@ -1,4 +1,5 @@
-package com.iluwatar;
+package com.iluwatar.action;
+
 
 public class ContentAction extends Action {
 
diff --git a/flux/src/main/java/com/iluwatar/MenuAction.java b/flux/src/main/java/com/iluwatar/action/MenuAction.java
similarity index 89%
rename from flux/src/main/java/com/iluwatar/MenuAction.java
rename to flux/src/main/java/com/iluwatar/action/MenuAction.java
index 49cfac37a..64a3b1422 100644
--- a/flux/src/main/java/com/iluwatar/MenuAction.java
+++ b/flux/src/main/java/com/iluwatar/action/MenuAction.java
@@ -1,4 +1,5 @@
-package com.iluwatar;
+package com.iluwatar.action;
+
 
 public class MenuAction extends Action {
 
diff --git a/flux/src/main/java/com/iluwatar/MenuItem.java b/flux/src/main/java/com/iluwatar/action/MenuItem.java
similarity index 88%
rename from flux/src/main/java/com/iluwatar/MenuItem.java
rename to flux/src/main/java/com/iluwatar/action/MenuItem.java
index b313a6c54..bc4057136 100644
--- a/flux/src/main/java/com/iluwatar/MenuItem.java
+++ b/flux/src/main/java/com/iluwatar/action/MenuItem.java
@@ -1,4 +1,4 @@
-package com.iluwatar;
+package com.iluwatar.action;
 
 public enum MenuItem {
 	
diff --git a/flux/src/main/java/com/iluwatar/App.java b/flux/src/main/java/com/iluwatar/app/App.java
similarity index 74%
rename from flux/src/main/java/com/iluwatar/App.java
rename to flux/src/main/java/com/iluwatar/app/App.java
index 5aac9bbca..ac6366e67 100644
--- a/flux/src/main/java/com/iluwatar/App.java
+++ b/flux/src/main/java/com/iluwatar/app/App.java
@@ -1,4 +1,11 @@
-package com.iluwatar;
+package com.iluwatar.app;
+
+import com.iluwatar.action.MenuItem;
+import com.iluwatar.dispatcher.Dispatcher;
+import com.iluwatar.store.ContentStore;
+import com.iluwatar.store.MenuStore;
+import com.iluwatar.view.ContentView;
+import com.iluwatar.view.MenuView;
 
 public class App {
 	
diff --git a/flux/src/main/java/com/iluwatar/Dispatcher.java b/flux/src/main/java/com/iluwatar/dispatcher/Dispatcher.java
similarity index 75%
rename from flux/src/main/java/com/iluwatar/Dispatcher.java
rename to flux/src/main/java/com/iluwatar/dispatcher/Dispatcher.java
index 3790470e9..d58d8baaa 100644
--- a/flux/src/main/java/com/iluwatar/Dispatcher.java
+++ b/flux/src/main/java/com/iluwatar/dispatcher/Dispatcher.java
@@ -1,8 +1,15 @@
-package com.iluwatar;
+package com.iluwatar.dispatcher;
 
 import java.util.LinkedList;
 import java.util.List;
 
+import com.iluwatar.action.Action;
+import com.iluwatar.action.Content;
+import com.iluwatar.action.ContentAction;
+import com.iluwatar.action.MenuAction;
+import com.iluwatar.action.MenuItem;
+import com.iluwatar.store.Store;
+
 public class Dispatcher {
 	
 	private static Dispatcher instance = new Dispatcher();
diff --git a/flux/src/main/java/com/iluwatar/ContentStore.java b/flux/src/main/java/com/iluwatar/store/ContentStore.java
similarity index 67%
rename from flux/src/main/java/com/iluwatar/ContentStore.java
rename to flux/src/main/java/com/iluwatar/store/ContentStore.java
index 6aa7ec733..636a88abd 100644
--- a/flux/src/main/java/com/iluwatar/ContentStore.java
+++ b/flux/src/main/java/com/iluwatar/store/ContentStore.java
@@ -1,4 +1,9 @@
-package com.iluwatar;
+package com.iluwatar.store;
+
+import com.iluwatar.action.Action;
+import com.iluwatar.action.ActionType;
+import com.iluwatar.action.Content;
+import com.iluwatar.action.ContentAction;
 
 public class ContentStore extends Store {
 
diff --git a/flux/src/main/java/com/iluwatar/MenuStore.java b/flux/src/main/java/com/iluwatar/store/MenuStore.java
similarity index 67%
rename from flux/src/main/java/com/iluwatar/MenuStore.java
rename to flux/src/main/java/com/iluwatar/store/MenuStore.java
index 1647554f0..057b74bf0 100644
--- a/flux/src/main/java/com/iluwatar/MenuStore.java
+++ b/flux/src/main/java/com/iluwatar/store/MenuStore.java
@@ -1,4 +1,9 @@
-package com.iluwatar;
+package com.iluwatar.store;
+
+import com.iluwatar.action.Action;
+import com.iluwatar.action.ActionType;
+import com.iluwatar.action.MenuAction;
+import com.iluwatar.action.MenuItem;
 
 public class MenuStore extends Store {
 
diff --git a/flux/src/main/java/com/iluwatar/Store.java b/flux/src/main/java/com/iluwatar/store/Store.java
similarity index 78%
rename from flux/src/main/java/com/iluwatar/Store.java
rename to flux/src/main/java/com/iluwatar/store/Store.java
index d6d63407a..c14d171fa 100644
--- a/flux/src/main/java/com/iluwatar/Store.java
+++ b/flux/src/main/java/com/iluwatar/store/Store.java
@@ -1,8 +1,11 @@
-package com.iluwatar;
+package com.iluwatar.store;
 
 import java.util.LinkedList;
 import java.util.List;
 
+import com.iluwatar.action.Action;
+import com.iluwatar.view.View;
+
 public abstract class Store {
 	
 	private List<View> views = new LinkedList<>();
diff --git a/flux/src/main/java/com/iluwatar/ContentView.java b/flux/src/main/java/com/iluwatar/view/ContentView.java
similarity index 70%
rename from flux/src/main/java/com/iluwatar/ContentView.java
rename to flux/src/main/java/com/iluwatar/view/ContentView.java
index 6bfc86470..bba723f9d 100644
--- a/flux/src/main/java/com/iluwatar/ContentView.java
+++ b/flux/src/main/java/com/iluwatar/view/ContentView.java
@@ -1,4 +1,8 @@
-package com.iluwatar;
+package com.iluwatar.view;
+
+import com.iluwatar.action.Content;
+import com.iluwatar.store.ContentStore;
+import com.iluwatar.store.Store;
 
 public class ContentView implements View {
 
diff --git a/flux/src/main/java/com/iluwatar/MenuView.java b/flux/src/main/java/com/iluwatar/view/MenuView.java
similarity index 76%
rename from flux/src/main/java/com/iluwatar/MenuView.java
rename to flux/src/main/java/com/iluwatar/view/MenuView.java
index 3bbb67f7f..6e5ad0ba3 100644
--- a/flux/src/main/java/com/iluwatar/MenuView.java
+++ b/flux/src/main/java/com/iluwatar/view/MenuView.java
@@ -1,4 +1,9 @@
-package com.iluwatar;
+package com.iluwatar.view;
+
+import com.iluwatar.action.MenuItem;
+import com.iluwatar.dispatcher.Dispatcher;
+import com.iluwatar.store.MenuStore;
+import com.iluwatar.store.Store;
 
 public class MenuView implements View {
 
diff --git a/flux/src/main/java/com/iluwatar/View.java b/flux/src/main/java/com/iluwatar/view/View.java
similarity index 60%
rename from flux/src/main/java/com/iluwatar/View.java
rename to flux/src/main/java/com/iluwatar/view/View.java
index f00b15dc5..d9868a2ad 100644
--- a/flux/src/main/java/com/iluwatar/View.java
+++ b/flux/src/main/java/com/iluwatar/view/View.java
@@ -1,4 +1,6 @@
-package com.iluwatar;
+package com.iluwatar.view;
+
+import com.iluwatar.store.Store;
 
 public interface View {
 
diff --git a/flux/src/test/java/com/iluwatar/AppTest.java b/flux/src/test/java/com/iluwatar/AppTest.java
index b81f7499d..ecb0b77b7 100644
--- a/flux/src/test/java/com/iluwatar/AppTest.java
+++ b/flux/src/test/java/com/iluwatar/AppTest.java
@@ -2,6 +2,8 @@ package com.iluwatar;
 
 import org.junit.Test;
 
+import com.iluwatar.app.App;
+
 public class AppTest {
 	
 	@Test