diff --git a/build/modules/clc/build.xml b/build/modules/clc/build.xml
index dc5e54cac..f39aae47c 100644
--- a/build/modules/clc/build.xml
+++ b/build/modules/clc/build.xml
@@ -127,6 +127,7 @@
+
diff --git a/build/modules/sdk/build.xml b/build/modules/sdk/build.xml
index 20868e7e3..f3327b23d 100644
--- a/build/modules/sdk/build.xml
+++ b/build/modules/sdk/build.xml
@@ -20,6 +20,7 @@
+
diff --git a/source/com.microsoft.tfs.core/.classpath b/source/com.microsoft.tfs.core/.classpath
index 04e725587..74e9b2f6e 100644
--- a/source/com.microsoft.tfs.core/.classpath
+++ b/source/com.microsoft.tfs.core/.classpath
@@ -40,8 +40,6 @@
-
-
diff --git a/source/com.microsoft.tfs.core/META-INF/MANIFEST.MF b/source/com.microsoft.tfs.core/META-INF/MANIFEST.MF
index 8abc8c89e..fc3fedfdf 100644
--- a/source/com.microsoft.tfs.core/META-INF/MANIFEST.MF
+++ b/source/com.microsoft.tfs.core/META-INF/MANIFEST.MF
@@ -25,8 +25,6 @@ Bundle-ClassPath: com.microsoft.tfs.core.jar,
libs/jackson-core-2.4.1/jackson-core-2.4.1.jar,
libs/jackson-core-2.4.1/jackson-databind-2.4.1.jar,
libs/annotation-detector-3.0.4/annotation-detector-3.0.4.jar,
- libs/jna/jna-4.2.1.jar,
- libs/jna/jna-platform-4.2.1.jar,
libs/slf4j/slf4j-api-1.7.19.jar,
libs/slf4j/slf4j-log4j12-1.7.19.jar,
libs/oauth2-useragent/oauth2-useragent-0.11.2.jar,
diff --git a/source/com.microsoft.tfs.core/build.properties b/source/com.microsoft.tfs.core/build.properties
index 5cfb6866c..67892b32a 100644
--- a/source/com.microsoft.tfs.core/build.properties
+++ b/source/com.microsoft.tfs.core/build.properties
@@ -17,8 +17,6 @@ bin.includes = META-INF/,\
libs/jackson-core-2.4.1/jackson-core-2.4.1.jar,\
libs/jackson-core-2.4.1/jackson-databind-2.4.1.jar,\
libs/annotation-detector-3.0.4/annotation-detector-3.0.4.jar,\
- libs/jna/jna-4.2.1.jar,\
- libs/jna/jna-platform-4.2.1.jar,\
libs/slf4j/slf4j-api-1.7.19.jar,\
libs/slf4j/slf4j-log4j12-1.7.19.jar,\
libs/oauth2-useragent/oauth2-useragent-0.11.2.jar,\
diff --git a/source/com.microsoft.tfs.jni/.classpath b/source/com.microsoft.tfs.jni/.classpath
index 50e024a7b..7af277077 100644
--- a/source/com.microsoft.tfs.jni/.classpath
+++ b/source/com.microsoft.tfs.jni/.classpath
@@ -6,5 +6,7 @@
+
+
diff --git a/source/com.microsoft.tfs.jni/META-INF/MANIFEST.MF b/source/com.microsoft.tfs.jni/META-INF/MANIFEST.MF
index de62f64ec..44c90bbfc 100644
--- a/source/com.microsoft.tfs.jni/META-INF/MANIFEST.MF
+++ b/source/com.microsoft.tfs.jni/META-INF/MANIFEST.MF
@@ -29,4 +29,6 @@ Export-Package: com.microsoft.tfs.jni,
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: com.microsoft.tfs.logging,
com.microsoft.tfs.util
-Bundle-ClassPath: com.microsoft.tfs.jni.jar
+Bundle-ClassPath: com.microsoft.tfs.jni.jar,
+ libs/jna/jna-4.2.1.jar,
+ libs/jna/jna-platform-4.2.1.jar
diff --git a/source/com.microsoft.tfs.jni/build.properties b/source/com.microsoft.tfs.jni/build.properties
index 80b45312c..aad90eb7a 100644
--- a/source/com.microsoft.tfs.jni/build.properties
+++ b/source/com.microsoft.tfs.jni/build.properties
@@ -1,5 +1,7 @@
bin.includes = META-INF/,\
os/,\
com.microsoft.tfs.jni.jar,\
+ libs/jna/jna-4.2.1.jar,\
+ libs/jna/jna-platform-4.2.1.jar,\
plugin.properties
source.com.microsoft.tfs.jni.jar = src/
diff --git a/source/com.microsoft.tfs.core/libs/jna/jna-4.2.1.jar b/source/com.microsoft.tfs.jni/libs/jna/jna-4.2.1.jar
similarity index 100%
rename from source/com.microsoft.tfs.core/libs/jna/jna-4.2.1.jar
rename to source/com.microsoft.tfs.jni/libs/jna/jna-4.2.1.jar
diff --git a/source/com.microsoft.tfs.core/libs/jna/jna-platform-4.2.1.jar b/source/com.microsoft.tfs.jni/libs/jna/jna-platform-4.2.1.jar
similarity index 100%
rename from source/com.microsoft.tfs.core/libs/jna/jna-platform-4.2.1.jar
rename to source/com.microsoft.tfs.jni/libs/jna/jna-platform-4.2.1.jar