diff --git a/hapi-fhir-android/pom.xml b/hapi-fhir-android/pom.xml
index 2dcd3a1932b..adadb8915db 100644
--- a/hapi-fhir-android/pom.xml
+++ b/hapi-fhir-android/pom.xml
@@ -75,12 +75,16 @@
 		</dependency>
 
 		<!-- Android does not come with the Servlet API bundled, and MethodUtil 
-			requires it -->
-		<dependency>
+			requires it. 
+			
+			We provide a dummy implementation of servlet api to reduce size. 
+			and prevent from rewriting the BaseMethodBinding and friends.
+			-->
+		<!-- dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
 			<scope>compile</scope>
-		</dependency>
+		</dependency-->
 
 	</dependencies>
 
@@ -156,8 +160,13 @@
 								<filter>
 									<artifact>ca.uhn.hapi.fhir:hapi-fhir-base</artifact>
 									<excludes>
+										<exclude>ca/uhn/fhir/util/ITestingUiClientFactory</exclude>
+										<exclude>ca/uhn/fhir/rest/server/**</exclude>
 										<exclude>**/*.java</exclude>
 									</excludes>
+									<includes>
+										<include>ca/uhn/fhir/rest/server/exceptions/**</include>
+									</includes>
 								</filter>
 							</filters>
 						</configuration>
@@ -207,8 +216,19 @@
 								<filter>
 									<artifact>ca.uhn.hapi.fhir:hapi-fhir-base</artifact>
 									<excludes>
+										<exclude>ca/uhn/fhir/util/ITestingUiClientFactory</exclude>
+										<exclude>ca/uhn/fhir/rest/server/**</exclude>
 										<exclude>**/*.java</exclude>
 									</excludes>
+									<includes>
+										<include>ca/uhn/fhir/rest/server/exceptions/**</include>
+									</includes>
+								</filter>
+								<filter>
+									<artifact>ca.uhn.hapi.fhir:hapi-fhir-structures-dstu</artifact>
+									<excludes>
+										<exclude>ca/uhn/fhir/rest/server/**</exclude>
+									</excludes>
 								</filter>
 							</filters>
 						</configuration>
@@ -253,6 +273,25 @@
 									<shadedPattern>ca.uhn.fhir.repackage.javax.json</shadedPattern>
 								</relocation>
 							</relocations>
+							<filters>
+								<filter>
+									<artifact>ca.uhn.hapi.fhir:hapi-fhir-base</artifact>
+									<excludes>
+										<exclude>ca/uhn/fhir/util/ITestingUiClientFactory</exclude>
+										<exclude>ca/uhn/fhir/rest/server/**</exclude>
+										<exclude>**/*.java</exclude>
+									</excludes>
+									<includes>
+										<include>ca/uhn/fhir/rest/server/exceptions/**</include>
+									</includes>
+								</filter>
+								<filter>
+									<artifact>ca.uhn.hapi.fhir:hapi-fhir-structures-dstu2</artifact>
+									<excludes>
+										<exclude>ca/uhn/fhir/rest/server/**</exclude>
+									</excludes>
+								</filter>
+							</filters>
 						</configuration>
 					</execution>
 				</executions>
diff --git a/hapi-fhir-android/src/main/java/javax/servlet/ServletRequest.java b/hapi-fhir-android/src/main/java/javax/servlet/ServletRequest.java
new file mode 100644
index 00000000000..2292db91fac
--- /dev/null
+++ b/hapi-fhir-android/src/main/java/javax/servlet/ServletRequest.java
@@ -0,0 +1,5 @@
+package javax.servlet;
+
+public class ServletRequest {
+
+}
diff --git a/hapi-fhir-android/src/main/java/javax/servlet/ServletResponse.java b/hapi-fhir-android/src/main/java/javax/servlet/ServletResponse.java
new file mode 100644
index 00000000000..efa8a9baa43
--- /dev/null
+++ b/hapi-fhir-android/src/main/java/javax/servlet/ServletResponse.java
@@ -0,0 +1,5 @@
+package javax.servlet;
+
+public class ServletResponse {
+
+}
diff --git a/hapi-fhir-android/src/main/java/javax/servlet/http/HttpServletRequest.java b/hapi-fhir-android/src/main/java/javax/servlet/http/HttpServletRequest.java
new file mode 100644
index 00000000000..37551bd241d
--- /dev/null
+++ b/hapi-fhir-android/src/main/java/javax/servlet/http/HttpServletRequest.java
@@ -0,0 +1,7 @@
+package javax.servlet.http;
+
+import javax.servlet.ServletRequest;
+
+public class HttpServletRequest extends ServletRequest {
+
+}
diff --git a/hapi-fhir-android/src/main/java/javax/servlet/http/HttpServletResponse.java b/hapi-fhir-android/src/main/java/javax/servlet/http/HttpServletResponse.java
new file mode 100644
index 00000000000..230ab022b4d
--- /dev/null
+++ b/hapi-fhir-android/src/main/java/javax/servlet/http/HttpServletResponse.java
@@ -0,0 +1,7 @@
+package javax.servlet.http;
+
+import javax.servlet.ServletResponse;
+
+public class HttpServletResponse extends ServletResponse{
+
+}
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/Dstu1BundleFactory.java b/hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/rest/server/Dstu1BundleFactory.java
similarity index 100%
rename from hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/Dstu1BundleFactory.java
rename to hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/rest/server/Dstu1BundleFactory.java