diff --git a/imageio/imageio-batik/pom.xml b/imageio/imageio-batik/pom.xml index 592584fd..e5376dc6 100644 --- a/imageio/imageio-batik/pom.xml +++ b/imageio/imageio-batik/pom.xml @@ -9,7 +9,7 @@ 3.0-SNAPSHOT imageio-batik - TwelveMonkeys ImageIO Batik Plugin + TwelveMonkeys :: ImageIO :: Batik Plugin 3.0-SNAPSHOT imageio-core - TwelveMonkeys ImageIO Core + TwelveMonkeys :: ImageIO :: Core diff --git a/imageio/imageio-ico/pom.xml b/imageio/imageio-ico/pom.xml index e633636f..c626b266 100644 --- a/imageio/imageio-ico/pom.xml +++ b/imageio/imageio-ico/pom.xml @@ -9,7 +9,7 @@ 3.0-SNAPSHOT imageio-ico - TwelveMonkeys ImageIO ICO plugin + TwelveMonkeys :: ImageIO :: ICO plugin ImageIO plugin for Windows Icon (ICO) and Cursor (CUR) format. diff --git a/imageio/imageio-iff/pom.xml b/imageio/imageio-iff/pom.xml index f2049765..5cbc3938 100644 --- a/imageio/imageio-iff/pom.xml +++ b/imageio/imageio-iff/pom.xml @@ -9,7 +9,7 @@ 3.0-SNAPSHOT twelvemonkeys-imageio-iff - TwelveMonkeys ImageIO IFF plugin + TwelveMonkeys :: ImageIO :: IFF plugin ImageIO plugin for Amiga/Electronic Arts Interchange Filed Format (IFF) type ILBM and PBM format. diff --git a/imageio/imageio-jmagick/pom.xml b/imageio/imageio-jmagick/pom.xml index e2c9affb..57bd10ff 100644 --- a/imageio/imageio-jmagick/pom.xml +++ b/imageio/imageio-jmagick/pom.xml @@ -9,7 +9,7 @@ 3.0-SNAPSHOT twelvemonkeys-imageio-jmagick - TwelveMonkeys ImageIO JMagick Plugin + TwelveMonkeys :: ImageIO :: JMagick Plugin 4.0.0 imageio-metadata - TwelveMonkeys ImageIO Metadata + TwelveMonkeys :: ImageIO :: Metadata ImageIO metadata module. diff --git a/imageio/imageio-pdf/pom.xml b/imageio/imageio-pdf/pom.xml index 396be84c..b30ee526 100644 --- a/imageio/imageio-pdf/pom.xml +++ b/imageio/imageio-pdf/pom.xml @@ -9,7 +9,7 @@ 3.0-SNAPSHOT imageio-pdf - TwelveMonkeys ImageIO PDF plugin + TwelveMonkeys :: ImageIO :: PDF plugin ImageIO plugin for Adobe Portable Document Format (PDF). diff --git a/imageio/imageio-pict/pom.xml b/imageio/imageio-pict/pom.xml index 5ced8c17..40fe9547 100644 --- a/imageio/imageio-pict/pom.xml +++ b/imageio/imageio-pict/pom.xml @@ -9,7 +9,7 @@ 3.0-SNAPSHOT imageio-pict - TwelveMonkeys ImageIO PICT plugin + TwelveMonkeys :: ImageIO :: PICT plugin ImageIO plugin for Apple Mac Paint Picture (PICT) format. diff --git a/imageio/imageio-psd/pom.xml b/imageio/imageio-psd/pom.xml index fa868416..f03b7fdb 100644 --- a/imageio/imageio-psd/pom.xml +++ b/imageio/imageio-psd/pom.xml @@ -9,7 +9,7 @@ 3.0-SNAPSHOT imageio-psd - TwelveMonkeys ImageIO PSD plugin + TwelveMonkeys :: ImageIO :: PSD plugin ImageIO plugin for Adobe Photoshop Document (PSD). diff --git a/imageio/imageio-reference/pom.xml b/imageio/imageio-reference/pom.xml index 5198d0e0..9e087f30 100644 --- a/imageio/imageio-reference/pom.xml +++ b/imageio/imageio-reference/pom.xml @@ -9,7 +9,7 @@ 3.0-SNAPSHOT imageio-reference - TwelveMonkeys ImageIO reference test cases + TwelveMonkeys :: ImageIO :: reference test cases Test cases for the JDK provided ImageReader implementations for reference. diff --git a/imageio/imageio-thumbsdb/pom.xml b/imageio/imageio-thumbsdb/pom.xml index 0d561dd0..85f16317 100644 --- a/imageio/imageio-thumbsdb/pom.xml +++ b/imageio/imageio-thumbsdb/pom.xml @@ -9,7 +9,7 @@ 3.0-SNAPSHOT imageio-thumbsdb - TwelveMonkeys ImageIO Thumbs.db plugin + TwelveMonkeys :: ImageIO :: Thumbs.db plugin ImageIO plugin for Windows Thumbs DB (Thumbs.db) format. diff --git a/imageio/pom.xml b/imageio/pom.xml index ed39ee7c..c666ca33 100644 --- a/imageio/pom.xml +++ b/imageio/pom.xml @@ -12,7 +12,7 @@ imageio 3.0-SNAPSHOT pom - TwelveMonkeys ImageIO + TwelveMonkeys :: ImageIO diff --git a/pom.xml b/pom.xml index 53f43405..8c339cd8 100755 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ common - twelvemonkeys-servlet + servlet imageio diff --git a/twelvemonkeys-servlet/pom.xml b/servlet/pom.xml similarity index 96% rename from twelvemonkeys-servlet/pom.xml rename to servlet/pom.xml index 88113a57..2838d5a6 100644 --- a/twelvemonkeys-servlet/pom.xml +++ b/servlet/pom.xml @@ -9,10 +9,10 @@ 4.0.0 - com.twelvemonkeys - twelvemonkeys-servlet + com.twelvemonkeys.servlet + servlet 3.0-SNAPSHOT - TwelveMonkeys Servlet + TwelveMonkeys :: Servlet diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/AbstractServletMapAdapter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/AbstractServletMapAdapter.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/AbstractServletMapAdapter.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/AbstractServletMapAdapter.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/BrowserHelperFilter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/BrowserHelperFilter.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/BrowserHelperFilter.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/BrowserHelperFilter.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/DebugServlet.java b/servlet/src/main/java/com/twelvemonkeys/servlet/DebugServlet.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/DebugServlet.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/DebugServlet.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/GenericFilter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/GenericFilter.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/GenericFilter.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/GenericFilter.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/GenericServlet.java b/servlet/src/main/java/com/twelvemonkeys/servlet/GenericServlet.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/GenericServlet.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/GenericServlet.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/HttpServlet.java b/servlet/src/main/java/com/twelvemonkeys/servlet/HttpServlet.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/HttpServlet.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/HttpServlet.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/InitParam.java b/servlet/src/main/java/com/twelvemonkeys/servlet/InitParam.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/InitParam.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/InitParam.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/OutputStreamAdapter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/OutputStreamAdapter.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/OutputStreamAdapter.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/OutputStreamAdapter.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/ProxyServlet.java b/servlet/src/main/java/com/twelvemonkeys/servlet/ProxyServlet.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/ProxyServlet.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/ProxyServlet.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/SerlvetHeadersMapAdapter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/SerlvetHeadersMapAdapter.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/SerlvetHeadersMapAdapter.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/SerlvetHeadersMapAdapter.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/SerlvetParametersMapAdapter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/SerlvetParametersMapAdapter.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/SerlvetParametersMapAdapter.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/SerlvetParametersMapAdapter.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/ServletConfigException.java b/servlet/src/main/java/com/twelvemonkeys/servlet/ServletConfigException.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/ServletConfigException.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/ServletConfigException.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/ServletConfigMapAdapter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/ServletConfigMapAdapter.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/ServletConfigMapAdapter.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/ServletConfigMapAdapter.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/ServletResponseStreamDelegate.java b/servlet/src/main/java/com/twelvemonkeys/servlet/ServletResponseStreamDelegate.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/ServletResponseStreamDelegate.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/ServletResponseStreamDelegate.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/ServletUtil.java b/servlet/src/main/java/com/twelvemonkeys/servlet/ServletUtil.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/ServletUtil.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/ServletUtil.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/ThrottleFilter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/ThrottleFilter.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/ThrottleFilter.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/ThrottleFilter.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/TimingFilter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/TimingFilter.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/TimingFilter.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/TimingFilter.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/TrimWhiteSpaceFilter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/TrimWhiteSpaceFilter.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/TrimWhiteSpaceFilter.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/TrimWhiteSpaceFilter.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/AbstractCacheRequest.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/AbstractCacheRequest.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/AbstractCacheRequest.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/cache/AbstractCacheRequest.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/AbstractCacheResponse.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/AbstractCacheResponse.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/AbstractCacheResponse.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/cache/AbstractCacheResponse.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheException.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheException.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheException.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheException.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheFilter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheFilter.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheFilter.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheFilter.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheRequest.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheRequest.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheRequest.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheRequest.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheResponse.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheResponse.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheResponse.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheResponse.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheResponseWrapper.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheResponseWrapper.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheResponseWrapper.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheResponseWrapper.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/CachedEntity.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CachedEntity.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/CachedEntity.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/cache/CachedEntity.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/CachedEntityImpl.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CachedEntityImpl.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/CachedEntityImpl.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/cache/CachedEntityImpl.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/CachedResponse.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CachedResponse.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/CachedResponse.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/cache/CachedResponse.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/CachedResponseImpl.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/CachedResponseImpl.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/CachedResponseImpl.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/cache/CachedResponseImpl.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/ClientCacheRequest.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/ClientCacheRequest.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/ClientCacheRequest.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/cache/ClientCacheRequest.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/ClientCacheResponse.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/ClientCacheResponse.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/ClientCacheResponse.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/cache/ClientCacheResponse.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/HTTPCache.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/HTTPCache.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/HTTPCache.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/cache/HTTPCache.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/ResponseResolver.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/ResponseResolver.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/ResponseResolver.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/cache/ResponseResolver.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/SerlvetCacheResponseWrapper.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/SerlvetCacheResponseWrapper.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/SerlvetCacheResponseWrapper.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/cache/SerlvetCacheResponseWrapper.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/ServletCacheRequest.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/ServletCacheRequest.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/ServletCacheRequest.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/cache/ServletCacheRequest.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/ServletCacheResponse.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/ServletCacheResponse.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/ServletCacheResponse.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/cache/ServletCacheResponse.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/ServletResponseResolver.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/ServletResponseResolver.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/ServletResponseResolver.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/cache/ServletResponseResolver.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/WritableCachedResponse.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/WritableCachedResponse.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/WritableCachedResponse.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/cache/WritableCachedResponse.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/WritableCachedResponseImpl.java b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/WritableCachedResponseImpl.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/WritableCachedResponseImpl.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/cache/WritableCachedResponseImpl.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/todo.txt b/servlet/src/main/java/com/twelvemonkeys/servlet/cache/todo.txt similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/cache/todo.txt rename to servlet/src/main/java/com/twelvemonkeys/servlet/cache/todo.txt diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/FileSizeExceededException.java b/servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/FileSizeExceededException.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/FileSizeExceededException.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/FileSizeExceededException.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/FileUploadException.java b/servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/FileUploadException.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/FileUploadException.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/FileUploadException.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/FileUploadFilter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/FileUploadFilter.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/FileUploadFilter.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/FileUploadFilter.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/HttpFileUploadRequest.java b/servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/HttpFileUploadRequest.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/HttpFileUploadRequest.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/HttpFileUploadRequest.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/HttpFileUploadRequestWrapper.java b/servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/HttpFileUploadRequestWrapper.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/HttpFileUploadRequestWrapper.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/HttpFileUploadRequestWrapper.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/UploadedFile.java b/servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/UploadedFile.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/UploadedFile.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/UploadedFile.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/UploadedFileImpl.java b/servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/UploadedFileImpl.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/UploadedFileImpl.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/fileupload/UploadedFileImpl.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/gzip/GZIPFilter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/gzip/GZIPFilter.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/gzip/GZIPFilter.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/gzip/GZIPFilter.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/gzip/GZIPResponseWrapper.java b/servlet/src/main/java/com/twelvemonkeys/servlet/gzip/GZIPResponseWrapper.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/gzip/GZIPResponseWrapper.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/gzip/GZIPResponseWrapper.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/AWTImageFilterAdapter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/AWTImageFilterAdapter.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/AWTImageFilterAdapter.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/image/AWTImageFilterAdapter.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/BufferedImageOpAdapter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/BufferedImageOpAdapter.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/BufferedImageOpAdapter.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/image/BufferedImageOpAdapter.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/ColorServlet.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/ColorServlet.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/ColorServlet.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/image/ColorServlet.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/ComposeFilter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/ComposeFilter.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/ComposeFilter.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/image/ComposeFilter.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/ContentNegotiationFilter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/ContentNegotiationFilter.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/ContentNegotiationFilter.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/image/ContentNegotiationFilter.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/CropFilter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/CropFilter.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/CropFilter.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/image/CropFilter.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageFilter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageFilter.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageFilter.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageFilter.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageServletException.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageServletException.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageServletException.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageServletException.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageServletResponse.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageServletResponse.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageServletResponse.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageServletResponse.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageServletResponseImpl.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageServletResponseImpl.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageServletResponseImpl.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageServletResponseImpl.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/NullImageFilter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/NullImageFilter.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/NullImageFilter.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/image/NullImageFilter.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/RotateFilter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/RotateFilter.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/RotateFilter.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/image/RotateFilter.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/ScaleFilter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/ScaleFilter.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/ScaleFilter.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/image/ScaleFilter.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/SourceRenderFilter.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/SourceRenderFilter.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/SourceRenderFilter.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/image/SourceRenderFilter.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/TextRenderer.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/TextRenderer.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/TextRenderer.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/image/TextRenderer.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/package_info.java b/servlet/src/main/java/com/twelvemonkeys/servlet/image/package_info.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/image/package_info.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/image/package_info.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/Droplet.java b/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/Droplet.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/Droplet.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/Droplet.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/JspFragment.java b/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/JspFragment.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/JspFragment.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/JspFragment.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/Oparam.java b/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/Oparam.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/Oparam.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/Oparam.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/Param.java b/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/Param.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/Param.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/Param.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/package_info.java b/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/package_info.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/package_info.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/package_info.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/IncludeTag.java b/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/IncludeTag.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/IncludeTag.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/IncludeTag.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/NestingHandler.java b/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/NestingHandler.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/NestingHandler.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/NestingHandler.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/NestingValidator.java b/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/NestingValidator.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/NestingValidator.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/NestingValidator.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/OparamTag.java b/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/OparamTag.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/OparamTag.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/OparamTag.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/ParamTag.java b/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/ParamTag.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/ParamTag.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/ParamTag.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/ValueOfTEI.java b/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/ValueOfTEI.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/ValueOfTEI.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/ValueOfTEI.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/ValueOfTag.java b/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/ValueOfTag.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/ValueOfTag.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/ValueOfTag.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/package.html b/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/package.html similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/package.html rename to servlet/src/main/java/com/twelvemonkeys/servlet/jsp/droplet/taglib/package.html diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/package_info.java b/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/package_info.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/package_info.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/jsp/package_info.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/BodyReaderTag.java b/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/BodyReaderTag.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/BodyReaderTag.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/BodyReaderTag.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/CSVToTableTag.java b/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/CSVToTableTag.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/CSVToTableTag.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/CSVToTableTag.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/ExBodyTagSupport.java b/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/ExBodyTagSupport.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/ExBodyTagSupport.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/ExBodyTagSupport.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/ExTag.java b/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/ExTag.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/ExTag.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/ExTag.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/ExTagSupport.java b/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/ExTagSupport.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/ExTagSupport.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/ExTagSupport.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/LastModifiedTEI.java b/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/LastModifiedTEI.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/LastModifiedTEI.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/LastModifiedTEI.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/LastModifiedTag.java b/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/LastModifiedTag.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/LastModifiedTag.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/LastModifiedTag.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/TrimWhiteSpaceTag.java b/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/TrimWhiteSpaceTag.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/TrimWhiteSpaceTag.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/TrimWhiteSpaceTag.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/XMLTransformTag.java b/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/XMLTransformTag.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/XMLTransformTag.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/XMLTransformTag.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/ConditionalTagBase.java b/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/ConditionalTagBase.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/ConditionalTagBase.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/ConditionalTagBase.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/EqualTag.java b/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/EqualTag.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/EqualTag.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/EqualTag.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/IteratorProviderTEI.java b/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/IteratorProviderTEI.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/IteratorProviderTEI.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/IteratorProviderTEI.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/IteratorProviderTag.java b/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/IteratorProviderTag.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/IteratorProviderTag.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/IteratorProviderTag.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/NotEqualTag.java b/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/NotEqualTag.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/NotEqualTag.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/logic/NotEqualTag.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/package_info.java b/servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/package_info.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/package_info.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/jsp/taglib/package_info.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/log4j/Log4JContextWrapper.java b/servlet/src/main/java/com/twelvemonkeys/servlet/log4j/Log4JContextWrapper.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/log4j/Log4JContextWrapper.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/log4j/Log4JContextWrapper.java diff --git a/twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/package_info.java b/servlet/src/main/java/com/twelvemonkeys/servlet/package_info.java similarity index 100% rename from twelvemonkeys-servlet/src/main/java/com/twelvemonkeys/servlet/package_info.java rename to servlet/src/main/java/com/twelvemonkeys/servlet/package_info.java diff --git a/twelvemonkeys-servlet/src/test/java/com/twelvemonkeys/servlet/FilterAbstractTestCase.java b/servlet/src/test/java/com/twelvemonkeys/servlet/FilterAbstractTestCase.java similarity index 100% rename from twelvemonkeys-servlet/src/test/java/com/twelvemonkeys/servlet/FilterAbstractTestCase.java rename to servlet/src/test/java/com/twelvemonkeys/servlet/FilterAbstractTestCase.java diff --git a/twelvemonkeys-servlet/src/test/java/com/twelvemonkeys/servlet/GenericFilterTestCase.java b/servlet/src/test/java/com/twelvemonkeys/servlet/GenericFilterTestCase.java similarity index 100% rename from twelvemonkeys-servlet/src/test/java/com/twelvemonkeys/servlet/GenericFilterTestCase.java rename to servlet/src/test/java/com/twelvemonkeys/servlet/GenericFilterTestCase.java diff --git a/twelvemonkeys-servlet/src/test/java/com/twelvemonkeys/servlet/ServletConfigExceptionTestCase.java b/servlet/src/test/java/com/twelvemonkeys/servlet/ServletConfigExceptionTestCase.java similarity index 100% rename from twelvemonkeys-servlet/src/test/java/com/twelvemonkeys/servlet/ServletConfigExceptionTestCase.java rename to servlet/src/test/java/com/twelvemonkeys/servlet/ServletConfigExceptionTestCase.java diff --git a/twelvemonkeys-servlet/src/test/java/com/twelvemonkeys/servlet/ServletConfigMapAdapterTestCase.java b/servlet/src/test/java/com/twelvemonkeys/servlet/ServletConfigMapAdapterTestCase.java similarity index 100% rename from twelvemonkeys-servlet/src/test/java/com/twelvemonkeys/servlet/ServletConfigMapAdapterTestCase.java rename to servlet/src/test/java/com/twelvemonkeys/servlet/ServletConfigMapAdapterTestCase.java diff --git a/twelvemonkeys-servlet/src/test/java/com/twelvemonkeys/servlet/ServletHeadersMapAdapterTestCase.java b/servlet/src/test/java/com/twelvemonkeys/servlet/ServletHeadersMapAdapterTestCase.java similarity index 100% rename from twelvemonkeys-servlet/src/test/java/com/twelvemonkeys/servlet/ServletHeadersMapAdapterTestCase.java rename to servlet/src/test/java/com/twelvemonkeys/servlet/ServletHeadersMapAdapterTestCase.java diff --git a/twelvemonkeys-servlet/src/test/java/com/twelvemonkeys/servlet/ServletParametersMapAdapterTestCase.java b/servlet/src/test/java/com/twelvemonkeys/servlet/ServletParametersMapAdapterTestCase.java similarity index 100% rename from twelvemonkeys-servlet/src/test/java/com/twelvemonkeys/servlet/ServletParametersMapAdapterTestCase.java rename to servlet/src/test/java/com/twelvemonkeys/servlet/ServletParametersMapAdapterTestCase.java diff --git a/twelvemonkeys-servlet/src/test/java/com/twelvemonkeys/servlet/ServletResponseAbsrtactTestCase.java b/servlet/src/test/java/com/twelvemonkeys/servlet/ServletResponseAbsrtactTestCase.java similarity index 100% rename from twelvemonkeys-servlet/src/test/java/com/twelvemonkeys/servlet/ServletResponseAbsrtactTestCase.java rename to servlet/src/test/java/com/twelvemonkeys/servlet/ServletResponseAbsrtactTestCase.java diff --git a/twelvemonkeys-servlet/src/test/java/com/twelvemonkeys/servlet/TrimWhiteSpaceFilterTestCase.java b/servlet/src/test/java/com/twelvemonkeys/servlet/TrimWhiteSpaceFilterTestCase.java similarity index 100% rename from twelvemonkeys-servlet/src/test/java/com/twelvemonkeys/servlet/TrimWhiteSpaceFilterTestCase.java rename to servlet/src/test/java/com/twelvemonkeys/servlet/TrimWhiteSpaceFilterTestCase.java diff --git a/twelvemonkeys-servlet/src/test/java/com/twelvemonkeys/servlet/cache/HTTPCacheTestCase.java b/servlet/src/test/java/com/twelvemonkeys/servlet/cache/HTTPCacheTestCase.java similarity index 100% rename from twelvemonkeys-servlet/src/test/java/com/twelvemonkeys/servlet/cache/HTTPCacheTestCase.java rename to servlet/src/test/java/com/twelvemonkeys/servlet/cache/HTTPCacheTestCase.java diff --git a/twelvemonkeys-servlet/src/test/java/com/twelvemonkeys/servlet/image/ImageServletResponseImplTestCase.java b/servlet/src/test/java/com/twelvemonkeys/servlet/image/ImageServletResponseImplTestCase.java similarity index 100% rename from twelvemonkeys-servlet/src/test/java/com/twelvemonkeys/servlet/image/ImageServletResponseImplTestCase.java rename to servlet/src/test/java/com/twelvemonkeys/servlet/image/ImageServletResponseImplTestCase.java diff --git a/twelvemonkeys-servlet/src/test/resources/com/twelvemonkeys/servlet/image/12monkeys-splash.png b/servlet/src/test/resources/com/twelvemonkeys/servlet/image/12monkeys-splash.png similarity index 100% rename from twelvemonkeys-servlet/src/test/resources/com/twelvemonkeys/servlet/image/12monkeys-splash.png rename to servlet/src/test/resources/com/twelvemonkeys/servlet/image/12monkeys-splash.png diff --git a/twelvemonkeys-servlet/src/test/resources/com/twelvemonkeys/servlet/image/foo.txt b/servlet/src/test/resources/com/twelvemonkeys/servlet/image/foo.txt similarity index 100% rename from twelvemonkeys-servlet/src/test/resources/com/twelvemonkeys/servlet/image/foo.txt rename to servlet/src/test/resources/com/twelvemonkeys/servlet/image/foo.txt diff --git a/twelvemonkeys-servlet/src/test/resources/com/twelvemonkeys/servlet/image/tux.gif b/servlet/src/test/resources/com/twelvemonkeys/servlet/image/tux.gif similarity index 100% rename from twelvemonkeys-servlet/src/test/resources/com/twelvemonkeys/servlet/image/tux.gif rename to servlet/src/test/resources/com/twelvemonkeys/servlet/image/tux.gif