diff --git a/model-view-presenter/pom.xml b/model-view-presenter/pom.xml
index 14362e455..d0c73f087 100644
--- a/model-view-presenter/pom.xml
+++ b/model-view-presenter/pom.xml
@@ -15,8 +15,8 @@
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <artifactId>junit-dep</artifactId>
+      <version>4.11</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/model-view-presenter/src/main/java/com/iluwatar/FileLoader.java b/model-view-presenter/src/main/java/com/iluwatar/FileLoader.java
index b89ca9a37..91c45ecca 100644
--- a/model-view-presenter/src/main/java/com/iluwatar/FileLoader.java
+++ b/model-view-presenter/src/main/java/com/iluwatar/FileLoader.java
@@ -1,3 +1,5 @@
+package com.iluwatar;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
@@ -75,4 +77,4 @@ public class FileLoader {
 	public boolean isLoaded() {
 		return this.loaded;
 	}
-}
\ No newline at end of file
+}
diff --git a/model-view-presenter/src/main/java/com/iluwatar/FileSelectorJFrame.java b/model-view-presenter/src/main/java/com/iluwatar/FileSelectorJFrame.java
index 38168512b..231128ca2 100644
--- a/model-view-presenter/src/main/java/com/iluwatar/FileSelectorJFrame.java
+++ b/model-view-presenter/src/main/java/com/iluwatar/FileSelectorJFrame.java
@@ -1,3 +1,5 @@
+package com.iluwatar;
+
 import java.awt.Color;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -195,4 +197,4 @@ public class FileSelectorJFrame extends JFrame implements FileSelectorView, Acti
 	public void displayData(String data) {
 		this.area.setText(data);
 	}
-}
\ No newline at end of file
+}
diff --git a/model-view-presenter/src/main/java/com/iluwatar/FileSelectorPresenter.java b/model-view-presenter/src/main/java/com/iluwatar/FileSelectorPresenter.java
index d9d5d8bb3..3d1a22010 100644
--- a/model-view-presenter/src/main/java/com/iluwatar/FileSelectorPresenter.java
+++ b/model-view-presenter/src/main/java/com/iluwatar/FileSelectorPresenter.java
@@ -1,3 +1,5 @@
+package com.iluwatar;
+
 /**
  * Every instance of this class represents the Presenter component
  * in the Model-View-Presenter architectural pattern.
@@ -71,4 +73,4 @@ public class FileSelectorPresenter {
 	public void cancelled() {
 		view.close();
 	}	
-}
\ No newline at end of file
+}
diff --git a/model-view-presenter/src/main/java/com/iluwatar/FileSelectorStub.java b/model-view-presenter/src/main/java/com/iluwatar/FileSelectorStub.java
index 0adb00aad..a4b6cabf8 100644
--- a/model-view-presenter/src/main/java/com/iluwatar/FileSelectorStub.java
+++ b/model-view-presenter/src/main/java/com/iluwatar/FileSelectorStub.java
@@ -1,3 +1,5 @@
+package com.iluwatar;
+
 /**
  * Every instance of this class represents the Stub component in
  * the Model-View-Presenter architectural pattern.
@@ -104,4 +106,4 @@ public class FileSelectorStub implements FileSelectorView {
 	public boolean dataDisplayed() {
 		return this.dataDisplayed;
 	}
-}
\ No newline at end of file
+}
diff --git a/model-view-presenter/src/main/java/com/iluwatar/FileSelectorView.java b/model-view-presenter/src/main/java/com/iluwatar/FileSelectorView.java
index e1782381c..deb1bd841 100644
--- a/model-view-presenter/src/main/java/com/iluwatar/FileSelectorView.java
+++ b/model-view-presenter/src/main/java/com/iluwatar/FileSelectorView.java
@@ -1,3 +1,5 @@
+package com.iluwatar;
+
 /**
  * This interface represents the View component in the 
  * Model-View-Presenter pattern. It can be implemented 
@@ -57,4 +59,4 @@ public interface FileSelectorView {
 	 * @param data The data to be written.
 	 */
 	public void displayData(String data);
-}
\ No newline at end of file
+}
diff --git a/model-view-presenter/src/main/java/com/iluwatar/MainApp.java b/model-view-presenter/src/main/java/com/iluwatar/MainApp.java
index ad40e1a51..cd342d539 100644
--- a/model-view-presenter/src/main/java/com/iluwatar/MainApp.java
+++ b/model-view-presenter/src/main/java/com/iluwatar/MainApp.java
@@ -1,3 +1,4 @@
+package com.iluwatar;
 
 public class MainApp {
 	
diff --git a/model-view-presenter/src/main/java/com/iluwatar/FileSelectorPresenterTest.java b/model-view-presenter/src/test/java/com/iluwatar/FileSelectorPresenterTest.java
similarity index 97%
rename from model-view-presenter/src/main/java/com/iluwatar/FileSelectorPresenterTest.java
rename to model-view-presenter/src/test/java/com/iluwatar/FileSelectorPresenterTest.java
index 0e5a0b227..507cad251 100644
--- a/model-view-presenter/src/main/java/com/iluwatar/FileSelectorPresenterTest.java
+++ b/model-view-presenter/src/test/java/com/iluwatar/FileSelectorPresenterTest.java
@@ -1,3 +1,5 @@
+package com.iluwatar;
+
 import static org.junit.Assert.*;
 
 import org.junit.Before;
@@ -7,7 +9,7 @@ import org.junit.Test;
  * This test case is responsible for testing our application
  * by taking advantage of the Model-View-Controller architectural pattern.
  */
-public class FileselectorPresenterTest {
+public class FileSelectorPresenterTest {
 	
 	/**
 	 * The Presenter component.
diff --git a/pom.xml b/pom.xml
index 4da45cbe6..6f43e6cc7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,6 +36,7 @@
     <module>iterator</module>
     <module>mediator</module>
     <module>memento</module>
+    <module>model-view-presenter</module>
     <module>observer</module>
     <module>state</module>
     <module>strategy</module>
@@ -59,4 +60,4 @@
 	</plugins>
 </build>
   
-</project>
\ No newline at end of file
+</project>