diff --git a/examples/pom.xml b/examples/pom.xml
index bf73332..55648db 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -55,7 +55,10 @@
       <groupId>${groupId}</groupId>
       <artifactId>asyncweb-server</artifactId>
     </dependency>
-
+    <dependency>
+      <groupId>${groupId}</groupId>
+      <artifactId>asyncweb-fileservice</artifactId>
+    </dependency>
     <dependency>
       <groupId>${groupId}</groupId>
       <artifactId>asyncweb-spring</artifactId>
diff --git a/fileservice/src/main/java/org/apache/asyncweb/fileservice/FileMain.java b/examples/src/main/java/org/apache/asyncweb/examples/fileservice/FileMain.java
similarity index 95%
rename from fileservice/src/main/java/org/apache/asyncweb/fileservice/FileMain.java
rename to examples/src/main/java/org/apache/asyncweb/examples/fileservice/FileMain.java
index a7f332e..71fb7a1 100644
--- a/fileservice/src/main/java/org/apache/asyncweb/fileservice/FileMain.java
+++ b/examples/src/main/java/org/apache/asyncweb/examples/fileservice/FileMain.java
@@ -17,8 +17,9 @@
  *  under the License.
  *
  */
-package org.apache.asyncweb.fileservice;
+package org.apache.asyncweb.examples.fileservice;
 
+import org.apache.asyncweb.fileservice.FileHttpService;
 import org.apache.asyncweb.server.BasicServiceContainer;
 import org.apache.asyncweb.server.HttpServiceHandler;
 import org.apache.asyncweb.server.resolver.PatternMatchResolver;
diff --git a/fileservice/src/main/java/org/apache/asyncweb/fileservice/FileHttpService.java b/fileservice/src/main/java/org/apache/asyncweb/fileservice/FileHttpService.java
index ccb406f..6806963 100644
--- a/fileservice/src/main/java/org/apache/asyncweb/fileservice/FileHttpService.java
+++ b/fileservice/src/main/java/org/apache/asyncweb/fileservice/FileHttpService.java
@@ -29,13 +29,13 @@
 import org.apache.asyncweb.common.DefaultHttpResponse;
 import org.apache.asyncweb.common.HttpResponseStatus;
 import org.apache.asyncweb.common.MutableHttpResponse;
-import org.apache.asyncweb.examples.file.cache.CachingPolicy;
-import org.apache.asyncweb.examples.file.cache.SimpleCachingPolicy;
-import org.apache.asyncweb.examples.file.fileloader.FileLoader;
-import org.apache.asyncweb.examples.file.fileloader.SimpleFileLoader;
-import org.apache.asyncweb.examples.file.index.DefaultDirectoryIndexGenerator;
-import org.apache.asyncweb.examples.file.index.DirectoryIndexGenerator;
-import org.apache.asyncweb.examples.file.mimetype.MimeMap;
+import org.apache.asyncweb.fileservice.cache.CachingPolicy;
+import org.apache.asyncweb.fileservice.cache.SimpleCachingPolicy;
+import org.apache.asyncweb.fileservice.fileloader.FileLoader;
+import org.apache.asyncweb.fileservice.fileloader.SimpleFileLoader;
+import org.apache.asyncweb.fileservice.index.DefaultDirectoryIndexGenerator;
+import org.apache.asyncweb.fileservice.index.DirectoryIndexGenerator;
+import org.apache.asyncweb.fileservice.mimetype.MimeMap;
 import org.apache.asyncweb.server.HttpService;
 import org.apache.asyncweb.server.HttpServiceContext;
 import org.apache.mina.common.IoBuffer;
diff --git a/fileservice/src/main/java/org/apache/asyncweb/examples/file/cache/CachingPolicy.java b/fileservice/src/main/java/org/apache/asyncweb/fileservice/cache/CachingPolicy.java
similarity index 96%
rename from fileservice/src/main/java/org/apache/asyncweb/examples/file/cache/CachingPolicy.java
rename to fileservice/src/main/java/org/apache/asyncweb/fileservice/cache/CachingPolicy.java
index ac47b16..5b55795 100644
--- a/fileservice/src/main/java/org/apache/asyncweb/examples/file/cache/CachingPolicy.java
+++ b/fileservice/src/main/java/org/apache/asyncweb/fileservice/cache/CachingPolicy.java
@@ -17,7 +17,7 @@
  *  under the License.
  *
  */
-package org.apache.asyncweb.examples.file.cache;
+package org.apache.asyncweb.fileservice.cache;
 
 import java.io.File;
 
diff --git a/fileservice/src/main/java/org/apache/asyncweb/examples/file/cache/SimpleCachingPolicy.java b/fileservice/src/main/java/org/apache/asyncweb/fileservice/cache/SimpleCachingPolicy.java
similarity index 97%
rename from fileservice/src/main/java/org/apache/asyncweb/examples/file/cache/SimpleCachingPolicy.java
rename to fileservice/src/main/java/org/apache/asyncweb/fileservice/cache/SimpleCachingPolicy.java
index 5db1666..035e3b3 100644
--- a/fileservice/src/main/java/org/apache/asyncweb/examples/file/cache/SimpleCachingPolicy.java
+++ b/fileservice/src/main/java/org/apache/asyncweb/fileservice/cache/SimpleCachingPolicy.java
@@ -18,7 +18,7 @@
  *
  */
 
-package org.apache.asyncweb.examples.file.cache;
+package org.apache.asyncweb.fileservice.cache;
 
 import java.io.File;
 import java.text.SimpleDateFormat;
diff --git a/fileservice/src/main/java/org/apache/asyncweb/examples/file/fileloader/FileLoader.java b/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/FileLoader.java
similarity index 95%
rename from fileservice/src/main/java/org/apache/asyncweb/examples/file/fileloader/FileLoader.java
rename to fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/FileLoader.java
index 89da0e2..0456980 100644
--- a/fileservice/src/main/java/org/apache/asyncweb/examples/file/fileloader/FileLoader.java
+++ b/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/FileLoader.java
@@ -18,7 +18,7 @@
  *
  */
 
-package org.apache.asyncweb.examples.file.fileloader;
+package org.apache.asyncweb.fileservice.fileloader;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/fileservice/src/main/java/org/apache/asyncweb/examples/file/fileloader/MmapFileLoader.java b/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/MmapFileLoader.java
similarity index 96%
rename from fileservice/src/main/java/org/apache/asyncweb/examples/file/fileloader/MmapFileLoader.java
rename to fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/MmapFileLoader.java
index a6d423a..1a70328 100644
--- a/fileservice/src/main/java/org/apache/asyncweb/examples/file/fileloader/MmapFileLoader.java
+++ b/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/MmapFileLoader.java
@@ -17,7 +17,7 @@
  *  under the License.
  *
  */
-package org.apache.asyncweb.examples.file.fileloader;
+package org.apache.asyncweb.fileservice.fileloader;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/fileservice/src/main/java/org/apache/asyncweb/examples/file/fileloader/SimpleFileLoader.java b/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/SimpleFileLoader.java
similarity index 96%
rename from fileservice/src/main/java/org/apache/asyncweb/examples/file/fileloader/SimpleFileLoader.java
rename to fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/SimpleFileLoader.java
index ecbd12e..490a15c 100644
--- a/fileservice/src/main/java/org/apache/asyncweb/examples/file/fileloader/SimpleFileLoader.java
+++ b/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/SimpleFileLoader.java
@@ -17,7 +17,7 @@
  *  under the License.
  *
  */
-package org.apache.asyncweb.examples.file.fileloader;
+package org.apache.asyncweb.fileservice.fileloader;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/fileservice/src/main/java/org/apache/asyncweb/examples/file/index/DefaultDirectoryIndexGenerator.java b/fileservice/src/main/java/org/apache/asyncweb/fileservice/index/DefaultDirectoryIndexGenerator.java
similarity index 97%
rename from fileservice/src/main/java/org/apache/asyncweb/examples/file/index/DefaultDirectoryIndexGenerator.java
rename to fileservice/src/main/java/org/apache/asyncweb/fileservice/index/DefaultDirectoryIndexGenerator.java
index 8cce1dd..f4c4eb9 100644
--- a/fileservice/src/main/java/org/apache/asyncweb/examples/file/index/DefaultDirectoryIndexGenerator.java
+++ b/fileservice/src/main/java/org/apache/asyncweb/fileservice/index/DefaultDirectoryIndexGenerator.java
@@ -17,13 +17,13 @@
  *  under the License.
  *
  */
-package org.apache.asyncweb.examples.file.index;
+package org.apache.asyncweb.fileservice.index;
 
 import java.io.File;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 
-import org.apache.asyncweb.examples.file.mimetype.MimeMap;
+import org.apache.asyncweb.fileservice.mimetype.MimeMap;
 import org.apache.asyncweb.server.errorReporting.CSS;
 import org.apache.asyncweb.server.util.StringBundle;
 import org.apache.mina.common.IoBuffer;
diff --git a/fileservice/src/main/java/org/apache/asyncweb/examples/file/index/DirectoryIndexGenerator.java b/fileservice/src/main/java/org/apache/asyncweb/fileservice/index/DirectoryIndexGenerator.java
similarity index 95%
rename from fileservice/src/main/java/org/apache/asyncweb/examples/file/index/DirectoryIndexGenerator.java
rename to fileservice/src/main/java/org/apache/asyncweb/fileservice/index/DirectoryIndexGenerator.java
index 02b48fb..99751d6 100644
--- a/fileservice/src/main/java/org/apache/asyncweb/examples/file/index/DirectoryIndexGenerator.java
+++ b/fileservice/src/main/java/org/apache/asyncweb/fileservice/index/DirectoryIndexGenerator.java
@@ -17,7 +17,7 @@
  *  under the License.
  *
  */
-package org.apache.asyncweb.examples.file.index;
+package org.apache.asyncweb.fileservice.index;
 
 import java.io.File;
 
diff --git a/fileservice/src/main/java/org/apache/asyncweb/examples/file/mimetype/MimeMap.java b/fileservice/src/main/java/org/apache/asyncweb/fileservice/mimetype/MimeMap.java
similarity index 99%
rename from fileservice/src/main/java/org/apache/asyncweb/examples/file/mimetype/MimeMap.java
rename to fileservice/src/main/java/org/apache/asyncweb/fileservice/mimetype/MimeMap.java
index 4837797..26361a4 100644
--- a/fileservice/src/main/java/org/apache/asyncweb/examples/file/mimetype/MimeMap.java
+++ b/fileservice/src/main/java/org/apache/asyncweb/fileservice/mimetype/MimeMap.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.asyncweb.examples.file.mimetype;
+package org.apache.asyncweb.fileservice.mimetype;
 
 import java.net.*;
 import java.util.*;
diff --git a/fileservice/src/test/java/org/apache/asyncweb/fileservice/fileloader/MmapFileLoaderTest.java b/fileservice/src/test/java/org/apache/asyncweb/fileservice/fileloader/MmapFileLoaderTest.java
index 45d5d38..77481b4 100644
--- a/fileservice/src/test/java/org/apache/asyncweb/fileservice/fileloader/MmapFileLoaderTest.java
+++ b/fileservice/src/test/java/org/apache/asyncweb/fileservice/fileloader/MmapFileLoaderTest.java
@@ -6,8 +6,8 @@
 import java.io.FileOutputStream;
 import java.util.Random;
 
-import org.apache.asyncweb.examples.file.fileloader.FileLoader;
-import org.apache.asyncweb.examples.file.fileloader.MmapFileLoader;
+import org.apache.asyncweb.fileservice.fileloader.FileLoader;
+import org.apache.asyncweb.fileservice.fileloader.MmapFileLoader;
 import org.apache.mina.common.IoBuffer;
 import org.junit.Test;
 
diff --git a/fileservice/src/test/java/org/apache/asyncweb/fileservice/fileloader/SimpleFileLoaderTest.java b/fileservice/src/test/java/org/apache/asyncweb/fileservice/fileloader/SimpleFileLoaderTest.java
index 3d29ecb..d2c1c2f 100644
--- a/fileservice/src/test/java/org/apache/asyncweb/fileservice/fileloader/SimpleFileLoaderTest.java
+++ b/fileservice/src/test/java/org/apache/asyncweb/fileservice/fileloader/SimpleFileLoaderTest.java
@@ -6,7 +6,7 @@
 import java.io.FileOutputStream;
 import java.util.Random;
 
-import org.apache.asyncweb.examples.file.fileloader.SimpleFileLoader;
+import org.apache.asyncweb.fileservice.fileloader.SimpleFileLoader;
 import org.apache.mina.common.IoBuffer;
 import org.junit.Test;
 
diff --git a/pom.xml b/pom.xml
index c9bafd2..673fa0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -247,6 +247,12 @@
         <artifactId>asyncweb-client</artifactId>
         <version>${pom.version}</version>
       </dependency>
+      
+      <dependency>
+        <groupId>${groupId}</groupId>
+        <artifactId>asyncweb-fileservice</artifactId>
+        <version>${pom.version}</version>
+      </dependency>
 
       <!-- ===================== -->
       <!-- External Dependencies -->