diff --git a/.gitignore b/.gitignore
index 2a31d314..db6dc17d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@ src/main/libs
 src/main/assets/armeabi
 src/main/assets/armeabi-v7a
 src/main/assets/x86
+src/main/jni
diff --git a/.gitmodules b/.gitmodules
index 343dba5f..7c3be65b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "src/main/jni/shadowsocks"]
-	path = src/main/jni/shadowsocks
+[submodule "jni/shadowsocks"]
+	path = jni/shadowsocks
 	url = https://github.com/madeye/shadowsocks-libev.git
diff --git a/build-ndk.sh b/build-ndk.sh
index a8c3608e..6421a79a 100755
--- a/build-ndk.sh
+++ b/build-ndk.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-cd src/main
 ndk-build clean
 ndk-build
 mkdir -p assets/armeabi
@@ -7,7 +6,8 @@ mkdir -p assets/armeabi-v7a
 mkdir -p assets/x86
 for app in iptables pdnsd redsocks ss-local ss-tunnel tun2socks
 do
-    mv libs/armeabi/$app assets/armeabi/
-    mv libs/armeabi-v7a/$app assets/armeabi-v7a/
-    mv libs/x86/$app assets/x86/
+    mv libs/armeabi/$app src/main/assets/armeabi/
+    mv libs/armeabi-v7a/$app src/main/assets/armeabi-v7a/
+    mv libs/x86/$app src/main/assets/x86/
 done
+mv libs src/main/jni
diff --git a/src/main/jni/Android.mk b/jni/Android.mk
similarity index 100%
rename from src/main/jni/Android.mk
rename to jni/Android.mk
diff --git a/src/main/jni/Application.mk b/jni/Application.mk
similarity index 100%
rename from src/main/jni/Application.mk
rename to jni/Application.mk
diff --git a/src/main/jni/badvpn/CMakeLists.txt b/jni/badvpn/CMakeLists.txt
similarity index 100%
rename from src/main/jni/badvpn/CMakeLists.txt
rename to jni/badvpn/CMakeLists.txt
diff --git a/src/main/jni/badvpn/COPYING b/jni/badvpn/COPYING
similarity index 100%
rename from src/main/jni/badvpn/COPYING
rename to jni/badvpn/COPYING
diff --git a/src/main/jni/badvpn/ChangeLog b/jni/badvpn/ChangeLog
similarity index 100%
rename from src/main/jni/badvpn/ChangeLog
rename to jni/badvpn/ChangeLog
diff --git a/src/main/jni/badvpn/INSTALL b/jni/badvpn/INSTALL
similarity index 100%
rename from src/main/jni/badvpn/INSTALL
rename to jni/badvpn/INSTALL
diff --git a/src/main/jni/badvpn/INSTALL-WINDOWS b/jni/badvpn/INSTALL-WINDOWS
similarity index 100%
rename from src/main/jni/badvpn/INSTALL-WINDOWS
rename to jni/badvpn/INSTALL-WINDOWS
diff --git a/src/main/jni/badvpn/arpprobe/BArpProbe.c b/jni/badvpn/arpprobe/BArpProbe.c
similarity index 100%
rename from src/main/jni/badvpn/arpprobe/BArpProbe.c
rename to jni/badvpn/arpprobe/BArpProbe.c
diff --git a/src/main/jni/badvpn/arpprobe/BArpProbe.h b/jni/badvpn/arpprobe/BArpProbe.h
similarity index 100%
rename from src/main/jni/badvpn/arpprobe/BArpProbe.h
rename to jni/badvpn/arpprobe/BArpProbe.h
diff --git a/src/main/jni/badvpn/arpprobe/CMakeLists.txt b/jni/badvpn/arpprobe/CMakeLists.txt
similarity index 100%
rename from src/main/jni/badvpn/arpprobe/CMakeLists.txt
rename to jni/badvpn/arpprobe/CMakeLists.txt
diff --git a/src/main/jni/badvpn/badvpn.7 b/jni/badvpn/badvpn.7
similarity index 100%
rename from src/main/jni/badvpn/badvpn.7
rename to jni/badvpn/badvpn.7
diff --git a/src/main/jni/badvpn/base/BLog.c b/jni/badvpn/base/BLog.c
similarity index 100%
rename from src/main/jni/badvpn/base/BLog.c
rename to jni/badvpn/base/BLog.c
diff --git a/src/main/jni/badvpn/base/BLog.h b/jni/badvpn/base/BLog.h
similarity index 100%
rename from src/main/jni/badvpn/base/BLog.h
rename to jni/badvpn/base/BLog.h
diff --git a/src/main/jni/badvpn/base/BLog_syslog.c b/jni/badvpn/base/BLog_syslog.c
similarity index 100%
rename from src/main/jni/badvpn/base/BLog_syslog.c
rename to jni/badvpn/base/BLog_syslog.c
diff --git a/src/main/jni/badvpn/base/BLog_syslog.h b/jni/badvpn/base/BLog_syslog.h
similarity index 100%
rename from src/main/jni/badvpn/base/BLog_syslog.h
rename to jni/badvpn/base/BLog_syslog.h
diff --git a/src/main/jni/badvpn/base/BMutex.h b/jni/badvpn/base/BMutex.h
similarity index 100%
rename from src/main/jni/badvpn/base/BMutex.h
rename to jni/badvpn/base/BMutex.h
diff --git a/src/main/jni/badvpn/base/BPending.c b/jni/badvpn/base/BPending.c
similarity index 100%
rename from src/main/jni/badvpn/base/BPending.c
rename to jni/badvpn/base/BPending.c
diff --git a/src/main/jni/badvpn/base/BPending.h b/jni/badvpn/base/BPending.h
similarity index 100%
rename from src/main/jni/badvpn/base/BPending.h
rename to jni/badvpn/base/BPending.h
diff --git a/src/main/jni/badvpn/base/BPending_list.h b/jni/badvpn/base/BPending_list.h
similarity index 100%
rename from src/main/jni/badvpn/base/BPending_list.h
rename to jni/badvpn/base/BPending_list.h
diff --git a/src/main/jni/badvpn/base/CMakeLists.txt b/jni/badvpn/base/CMakeLists.txt
similarity index 100%
rename from src/main/jni/badvpn/base/CMakeLists.txt
rename to jni/badvpn/base/CMakeLists.txt
diff --git a/src/main/jni/badvpn/base/DebugObject.c b/jni/badvpn/base/DebugObject.c
similarity index 100%
rename from src/main/jni/badvpn/base/DebugObject.c
rename to jni/badvpn/base/DebugObject.c
diff --git a/src/main/jni/badvpn/base/DebugObject.h b/jni/badvpn/base/DebugObject.h
similarity index 100%
rename from src/main/jni/badvpn/base/DebugObject.h
rename to jni/badvpn/base/DebugObject.h
diff --git a/src/main/jni/badvpn/blog_channels.txt b/jni/badvpn/blog_channels.txt
similarity index 100%
rename from src/main/jni/badvpn/blog_channels.txt
rename to jni/badvpn/blog_channels.txt
diff --git a/src/main/jni/badvpn/blog_generator/blog.php b/jni/badvpn/blog_generator/blog.php
similarity index 100%
rename from src/main/jni/badvpn/blog_generator/blog.php
rename to jni/badvpn/blog_generator/blog.php
diff --git a/src/main/jni/badvpn/blog_generator/blog_functions.php b/jni/badvpn/blog_generator/blog_functions.php
similarity index 100%
rename from src/main/jni/badvpn/blog_generator/blog_functions.php
rename to jni/badvpn/blog_generator/blog_functions.php
diff --git a/src/main/jni/badvpn/bproto/BProto.h b/jni/badvpn/bproto/BProto.h
similarity index 100%
rename from src/main/jni/badvpn/bproto/BProto.h
rename to jni/badvpn/bproto/BProto.h
diff --git a/src/main/jni/badvpn/bproto_generator/ProtoParser.lime b/jni/badvpn/bproto_generator/ProtoParser.lime
similarity index 100%
rename from src/main/jni/badvpn/bproto_generator/ProtoParser.lime
rename to jni/badvpn/bproto_generator/ProtoParser.lime
diff --git a/src/main/jni/badvpn/bproto_generator/ProtoParser.php b/jni/badvpn/bproto_generator/ProtoParser.php
similarity index 100%
rename from src/main/jni/badvpn/bproto_generator/ProtoParser.php
rename to jni/badvpn/bproto_generator/ProtoParser.php
diff --git a/src/main/jni/badvpn/bproto_generator/bproto.php b/jni/badvpn/bproto_generator/bproto.php
similarity index 100%
rename from src/main/jni/badvpn/bproto_generator/bproto.php
rename to jni/badvpn/bproto_generator/bproto.php
diff --git a/src/main/jni/badvpn/bproto_generator/bproto_functions.php b/jni/badvpn/bproto_generator/bproto_functions.php
similarity index 100%
rename from src/main/jni/badvpn/bproto_generator/bproto_functions.php
rename to jni/badvpn/bproto_generator/bproto_functions.php
diff --git a/src/main/jni/badvpn/client/CMakeLists.txt b/jni/badvpn/client/CMakeLists.txt
similarity index 100%
rename from src/main/jni/badvpn/client/CMakeLists.txt
rename to jni/badvpn/client/CMakeLists.txt
diff --git a/src/main/jni/badvpn/client/DPReceive.c b/jni/badvpn/client/DPReceive.c
similarity index 100%
rename from src/main/jni/badvpn/client/DPReceive.c
rename to jni/badvpn/client/DPReceive.c
diff --git a/src/main/jni/badvpn/client/DPReceive.h b/jni/badvpn/client/DPReceive.h
similarity index 100%
rename from src/main/jni/badvpn/client/DPReceive.h
rename to jni/badvpn/client/DPReceive.h
diff --git a/src/main/jni/badvpn/client/DPRelay.c b/jni/badvpn/client/DPRelay.c
similarity index 100%
rename from src/main/jni/badvpn/client/DPRelay.c
rename to jni/badvpn/client/DPRelay.c
diff --git a/src/main/jni/badvpn/client/DPRelay.h b/jni/badvpn/client/DPRelay.h
similarity index 100%
rename from src/main/jni/badvpn/client/DPRelay.h
rename to jni/badvpn/client/DPRelay.h
diff --git a/src/main/jni/badvpn/client/DataProto.c b/jni/badvpn/client/DataProto.c
similarity index 100%
rename from src/main/jni/badvpn/client/DataProto.c
rename to jni/badvpn/client/DataProto.c
diff --git a/src/main/jni/badvpn/client/DataProto.h b/jni/badvpn/client/DataProto.h
similarity index 100%
rename from src/main/jni/badvpn/client/DataProto.h
rename to jni/badvpn/client/DataProto.h
diff --git a/src/main/jni/badvpn/client/DataProtoKeepaliveSource.c b/jni/badvpn/client/DataProtoKeepaliveSource.c
similarity index 100%
rename from src/main/jni/badvpn/client/DataProtoKeepaliveSource.c
rename to jni/badvpn/client/DataProtoKeepaliveSource.c
diff --git a/src/main/jni/badvpn/client/DataProtoKeepaliveSource.h b/jni/badvpn/client/DataProtoKeepaliveSource.h
similarity index 100%
rename from src/main/jni/badvpn/client/DataProtoKeepaliveSource.h
rename to jni/badvpn/client/DataProtoKeepaliveSource.h
diff --git a/src/main/jni/badvpn/client/DatagramPeerIO.c b/jni/badvpn/client/DatagramPeerIO.c
similarity index 100%
rename from src/main/jni/badvpn/client/DatagramPeerIO.c
rename to jni/badvpn/client/DatagramPeerIO.c
diff --git a/src/main/jni/badvpn/client/DatagramPeerIO.h b/jni/badvpn/client/DatagramPeerIO.h
similarity index 100%
rename from src/main/jni/badvpn/client/DatagramPeerIO.h
rename to jni/badvpn/client/DatagramPeerIO.h
diff --git a/src/main/jni/badvpn/client/FragmentProtoAssembler.c b/jni/badvpn/client/FragmentProtoAssembler.c
similarity index 100%
rename from src/main/jni/badvpn/client/FragmentProtoAssembler.c
rename to jni/badvpn/client/FragmentProtoAssembler.c
diff --git a/src/main/jni/badvpn/client/FragmentProtoAssembler.h b/jni/badvpn/client/FragmentProtoAssembler.h
similarity index 100%
rename from src/main/jni/badvpn/client/FragmentProtoAssembler.h
rename to jni/badvpn/client/FragmentProtoAssembler.h
diff --git a/src/main/jni/badvpn/client/FragmentProtoAssembler_tree.h b/jni/badvpn/client/FragmentProtoAssembler_tree.h
similarity index 100%
rename from src/main/jni/badvpn/client/FragmentProtoAssembler_tree.h
rename to jni/badvpn/client/FragmentProtoAssembler_tree.h
diff --git a/src/main/jni/badvpn/client/FragmentProtoDisassembler.c b/jni/badvpn/client/FragmentProtoDisassembler.c
similarity index 100%
rename from src/main/jni/badvpn/client/FragmentProtoDisassembler.c
rename to jni/badvpn/client/FragmentProtoDisassembler.c
diff --git a/src/main/jni/badvpn/client/FragmentProtoDisassembler.h b/jni/badvpn/client/FragmentProtoDisassembler.h
similarity index 100%
rename from src/main/jni/badvpn/client/FragmentProtoDisassembler.h
rename to jni/badvpn/client/FragmentProtoDisassembler.h
diff --git a/src/main/jni/badvpn/client/FrameDecider.c b/jni/badvpn/client/FrameDecider.c
similarity index 100%
rename from src/main/jni/badvpn/client/FrameDecider.c
rename to jni/badvpn/client/FrameDecider.c
diff --git a/src/main/jni/badvpn/client/FrameDecider.h b/jni/badvpn/client/FrameDecider.h
similarity index 100%
rename from src/main/jni/badvpn/client/FrameDecider.h
rename to jni/badvpn/client/FrameDecider.h
diff --git a/src/main/jni/badvpn/client/FrameDecider_groups_tree.h b/jni/badvpn/client/FrameDecider_groups_tree.h
similarity index 100%
rename from src/main/jni/badvpn/client/FrameDecider_groups_tree.h
rename to jni/badvpn/client/FrameDecider_groups_tree.h
diff --git a/src/main/jni/badvpn/client/FrameDecider_macs_tree.h b/jni/badvpn/client/FrameDecider_macs_tree.h
similarity index 100%
rename from src/main/jni/badvpn/client/FrameDecider_macs_tree.h
rename to jni/badvpn/client/FrameDecider_macs_tree.h
diff --git a/src/main/jni/badvpn/client/FrameDecider_multicast_tree.h b/jni/badvpn/client/FrameDecider_multicast_tree.h
similarity index 100%
rename from src/main/jni/badvpn/client/FrameDecider_multicast_tree.h
rename to jni/badvpn/client/FrameDecider_multicast_tree.h
diff --git a/src/main/jni/badvpn/client/PasswordListener.c b/jni/badvpn/client/PasswordListener.c
similarity index 100%
rename from src/main/jni/badvpn/client/PasswordListener.c
rename to jni/badvpn/client/PasswordListener.c
diff --git a/src/main/jni/badvpn/client/PasswordListener.h b/jni/badvpn/client/PasswordListener.h
similarity index 100%
rename from src/main/jni/badvpn/client/PasswordListener.h
rename to jni/badvpn/client/PasswordListener.h
diff --git a/src/main/jni/badvpn/client/PeerChat.c b/jni/badvpn/client/PeerChat.c
similarity index 100%
rename from src/main/jni/badvpn/client/PeerChat.c
rename to jni/badvpn/client/PeerChat.c
diff --git a/src/main/jni/badvpn/client/PeerChat.h b/jni/badvpn/client/PeerChat.h
similarity index 100%
rename from src/main/jni/badvpn/client/PeerChat.h
rename to jni/badvpn/client/PeerChat.h
diff --git a/src/main/jni/badvpn/client/SCOutmsgEncoder.c b/jni/badvpn/client/SCOutmsgEncoder.c
similarity index 100%
rename from src/main/jni/badvpn/client/SCOutmsgEncoder.c
rename to jni/badvpn/client/SCOutmsgEncoder.c
diff --git a/src/main/jni/badvpn/client/SCOutmsgEncoder.h b/jni/badvpn/client/SCOutmsgEncoder.h
similarity index 100%
rename from src/main/jni/badvpn/client/SCOutmsgEncoder.h
rename to jni/badvpn/client/SCOutmsgEncoder.h
diff --git a/src/main/jni/badvpn/client/SPProtoDecoder.c b/jni/badvpn/client/SPProtoDecoder.c
similarity index 100%
rename from src/main/jni/badvpn/client/SPProtoDecoder.c
rename to jni/badvpn/client/SPProtoDecoder.c
diff --git a/src/main/jni/badvpn/client/SPProtoDecoder.h b/jni/badvpn/client/SPProtoDecoder.h
similarity index 100%
rename from src/main/jni/badvpn/client/SPProtoDecoder.h
rename to jni/badvpn/client/SPProtoDecoder.h
diff --git a/src/main/jni/badvpn/client/SPProtoEncoder.c b/jni/badvpn/client/SPProtoEncoder.c
similarity index 100%
rename from src/main/jni/badvpn/client/SPProtoEncoder.c
rename to jni/badvpn/client/SPProtoEncoder.c
diff --git a/src/main/jni/badvpn/client/SPProtoEncoder.h b/jni/badvpn/client/SPProtoEncoder.h
similarity index 100%
rename from src/main/jni/badvpn/client/SPProtoEncoder.h
rename to jni/badvpn/client/SPProtoEncoder.h
diff --git a/src/main/jni/badvpn/client/SimpleStreamBuffer.c b/jni/badvpn/client/SimpleStreamBuffer.c
similarity index 100%
rename from src/main/jni/badvpn/client/SimpleStreamBuffer.c
rename to jni/badvpn/client/SimpleStreamBuffer.c
diff --git a/src/main/jni/badvpn/client/SimpleStreamBuffer.h b/jni/badvpn/client/SimpleStreamBuffer.h
similarity index 100%
rename from src/main/jni/badvpn/client/SimpleStreamBuffer.h
rename to jni/badvpn/client/SimpleStreamBuffer.h
diff --git a/src/main/jni/badvpn/client/SinglePacketSource.c b/jni/badvpn/client/SinglePacketSource.c
similarity index 100%
rename from src/main/jni/badvpn/client/SinglePacketSource.c
rename to jni/badvpn/client/SinglePacketSource.c
diff --git a/src/main/jni/badvpn/client/SinglePacketSource.h b/jni/badvpn/client/SinglePacketSource.h
similarity index 100%
rename from src/main/jni/badvpn/client/SinglePacketSource.h
rename to jni/badvpn/client/SinglePacketSource.h
diff --git a/src/main/jni/badvpn/client/StreamPeerIO.c b/jni/badvpn/client/StreamPeerIO.c
similarity index 100%
rename from src/main/jni/badvpn/client/StreamPeerIO.c
rename to jni/badvpn/client/StreamPeerIO.c
diff --git a/src/main/jni/badvpn/client/StreamPeerIO.h b/jni/badvpn/client/StreamPeerIO.h
similarity index 100%
rename from src/main/jni/badvpn/client/StreamPeerIO.h
rename to jni/badvpn/client/StreamPeerIO.h
diff --git a/src/main/jni/badvpn/client/badvpn-client.8 b/jni/badvpn/client/badvpn-client.8
similarity index 100%
rename from src/main/jni/badvpn/client/badvpn-client.8
rename to jni/badvpn/client/badvpn-client.8
diff --git a/src/main/jni/badvpn/client/client.c b/jni/badvpn/client/client.c
similarity index 100%
rename from src/main/jni/badvpn/client/client.c
rename to jni/badvpn/client/client.c
diff --git a/src/main/jni/badvpn/client/client.h b/jni/badvpn/client/client.h
similarity index 100%
rename from src/main/jni/badvpn/client/client.h
rename to jni/badvpn/client/client.h
diff --git a/src/main/jni/badvpn/cmake/modules/COPYING-CMAKE-SCRIPTS b/jni/badvpn/cmake/modules/COPYING-CMAKE-SCRIPTS
similarity index 100%
rename from src/main/jni/badvpn/cmake/modules/COPYING-CMAKE-SCRIPTS
rename to jni/badvpn/cmake/modules/COPYING-CMAKE-SCRIPTS
diff --git a/src/main/jni/badvpn/cmake/modules/FindGLIB2.cmake b/jni/badvpn/cmake/modules/FindGLIB2.cmake
similarity index 100%
rename from src/main/jni/badvpn/cmake/modules/FindGLIB2.cmake
rename to jni/badvpn/cmake/modules/FindGLIB2.cmake
diff --git a/src/main/jni/badvpn/cmake/modules/FindLibraryWithDebug.cmake b/jni/badvpn/cmake/modules/FindLibraryWithDebug.cmake
similarity index 100%
rename from src/main/jni/badvpn/cmake/modules/FindLibraryWithDebug.cmake
rename to jni/badvpn/cmake/modules/FindLibraryWithDebug.cmake
diff --git a/src/main/jni/badvpn/cmake/modules/FindNSPR.cmake b/jni/badvpn/cmake/modules/FindNSPR.cmake
similarity index 100%
rename from src/main/jni/badvpn/cmake/modules/FindNSPR.cmake
rename to jni/badvpn/cmake/modules/FindNSPR.cmake
diff --git a/src/main/jni/badvpn/cmake/modules/FindNSS.cmake b/jni/badvpn/cmake/modules/FindNSS.cmake
similarity index 100%
rename from src/main/jni/badvpn/cmake/modules/FindNSS.cmake
rename to jni/badvpn/cmake/modules/FindNSS.cmake
diff --git a/src/main/jni/badvpn/cmake/modules/FindOpenSSL.cmake b/jni/badvpn/cmake/modules/FindOpenSSL.cmake
similarity index 100%
rename from src/main/jni/badvpn/cmake/modules/FindOpenSSL.cmake
rename to jni/badvpn/cmake/modules/FindOpenSSL.cmake
diff --git a/src/main/jni/badvpn/compile-tun2sock.sh b/jni/badvpn/compile-tun2sock.sh
similarity index 100%
rename from src/main/jni/badvpn/compile-tun2sock.sh
rename to jni/badvpn/compile-tun2sock.sh
diff --git a/src/main/jni/badvpn/dhcpclient/BDHCPClient.c b/jni/badvpn/dhcpclient/BDHCPClient.c
similarity index 100%
rename from src/main/jni/badvpn/dhcpclient/BDHCPClient.c
rename to jni/badvpn/dhcpclient/BDHCPClient.c
diff --git a/src/main/jni/badvpn/dhcpclient/BDHCPClient.h b/jni/badvpn/dhcpclient/BDHCPClient.h
similarity index 100%
rename from src/main/jni/badvpn/dhcpclient/BDHCPClient.h
rename to jni/badvpn/dhcpclient/BDHCPClient.h
diff --git a/src/main/jni/badvpn/dhcpclient/BDHCPClientCore.c b/jni/badvpn/dhcpclient/BDHCPClientCore.c
similarity index 100%
rename from src/main/jni/badvpn/dhcpclient/BDHCPClientCore.c
rename to jni/badvpn/dhcpclient/BDHCPClientCore.c
diff --git a/src/main/jni/badvpn/dhcpclient/BDHCPClientCore.h b/jni/badvpn/dhcpclient/BDHCPClientCore.h
similarity index 100%
rename from src/main/jni/badvpn/dhcpclient/BDHCPClientCore.h
rename to jni/badvpn/dhcpclient/BDHCPClientCore.h
diff --git a/src/main/jni/badvpn/dhcpclient/CMakeLists.txt b/jni/badvpn/dhcpclient/CMakeLists.txt
similarity index 100%
rename from src/main/jni/badvpn/dhcpclient/CMakeLists.txt
rename to jni/badvpn/dhcpclient/CMakeLists.txt
diff --git a/src/main/jni/badvpn/dhcpclient/DHCPIpUdpDecoder.c b/jni/badvpn/dhcpclient/DHCPIpUdpDecoder.c
similarity index 100%
rename from src/main/jni/badvpn/dhcpclient/DHCPIpUdpDecoder.c
rename to jni/badvpn/dhcpclient/DHCPIpUdpDecoder.c
diff --git a/src/main/jni/badvpn/dhcpclient/DHCPIpUdpDecoder.h b/jni/badvpn/dhcpclient/DHCPIpUdpDecoder.h
similarity index 100%
rename from src/main/jni/badvpn/dhcpclient/DHCPIpUdpDecoder.h
rename to jni/badvpn/dhcpclient/DHCPIpUdpDecoder.h
diff --git a/src/main/jni/badvpn/dhcpclient/DHCPIpUdpEncoder.c b/jni/badvpn/dhcpclient/DHCPIpUdpEncoder.c
similarity index 100%
rename from src/main/jni/badvpn/dhcpclient/DHCPIpUdpEncoder.c
rename to jni/badvpn/dhcpclient/DHCPIpUdpEncoder.c
diff --git a/src/main/jni/badvpn/dhcpclient/DHCPIpUdpEncoder.h b/jni/badvpn/dhcpclient/DHCPIpUdpEncoder.h
similarity index 100%
rename from src/main/jni/badvpn/dhcpclient/DHCPIpUdpEncoder.h
rename to jni/badvpn/dhcpclient/DHCPIpUdpEncoder.h
diff --git a/src/main/jni/badvpn/dostest/CMakeLists.txt b/jni/badvpn/dostest/CMakeLists.txt
similarity index 100%
rename from src/main/jni/badvpn/dostest/CMakeLists.txt
rename to jni/badvpn/dostest/CMakeLists.txt
diff --git a/src/main/jni/badvpn/dostest/StreamBuffer.c b/jni/badvpn/dostest/StreamBuffer.c
similarity index 100%
rename from src/main/jni/badvpn/dostest/StreamBuffer.c
rename to jni/badvpn/dostest/StreamBuffer.c
diff --git a/src/main/jni/badvpn/dostest/StreamBuffer.h b/jni/badvpn/dostest/StreamBuffer.h
similarity index 100%
rename from src/main/jni/badvpn/dostest/StreamBuffer.h
rename to jni/badvpn/dostest/StreamBuffer.h
diff --git a/src/main/jni/badvpn/dostest/dostest-attacker.c b/jni/badvpn/dostest/dostest-attacker.c
similarity index 100%
rename from src/main/jni/badvpn/dostest/dostest-attacker.c
rename to jni/badvpn/dostest/dostest-attacker.c
diff --git a/src/main/jni/badvpn/dostest/dostest-server.c b/jni/badvpn/dostest/dostest-server.c
similarity index 100%
rename from src/main/jni/badvpn/dostest/dostest-server.c
rename to jni/badvpn/dostest/dostest-server.c
diff --git a/src/main/jni/badvpn/examples/CMakeLists.txt b/jni/badvpn/examples/CMakeLists.txt
similarity index 100%
rename from src/main/jni/badvpn/examples/CMakeLists.txt
rename to jni/badvpn/examples/CMakeLists.txt
diff --git a/src/main/jni/badvpn/examples/FastPacketSource.h b/jni/badvpn/examples/FastPacketSource.h
similarity index 100%
rename from src/main/jni/badvpn/examples/FastPacketSource.h
rename to jni/badvpn/examples/FastPacketSource.h
diff --git a/src/main/jni/badvpn/examples/RandomPacketSink.h b/jni/badvpn/examples/RandomPacketSink.h
similarity index 100%
rename from src/main/jni/badvpn/examples/RandomPacketSink.h
rename to jni/badvpn/examples/RandomPacketSink.h
diff --git a/src/main/jni/badvpn/examples/TimerPacketSink.h b/jni/badvpn/examples/TimerPacketSink.h
similarity index 100%
rename from src/main/jni/badvpn/examples/TimerPacketSink.h
rename to jni/badvpn/examples/TimerPacketSink.h
diff --git a/src/main/jni/badvpn/examples/arpprobe_test.c b/jni/badvpn/examples/arpprobe_test.c
similarity index 100%
rename from src/main/jni/badvpn/examples/arpprobe_test.c
rename to jni/badvpn/examples/arpprobe_test.c
diff --git a/src/main/jni/badvpn/examples/bavl_test.c b/jni/badvpn/examples/bavl_test.c
similarity index 100%
rename from src/main/jni/badvpn/examples/bavl_test.c
rename to jni/badvpn/examples/bavl_test.c
diff --git a/src/main/jni/badvpn/examples/bencryption_bench.c b/jni/badvpn/examples/bencryption_bench.c
similarity index 100%
rename from src/main/jni/badvpn/examples/bencryption_bench.c
rename to jni/badvpn/examples/bencryption_bench.c
diff --git a/src/main/jni/badvpn/examples/bprocess_example.c b/jni/badvpn/examples/bprocess_example.c
similarity index 100%
rename from src/main/jni/badvpn/examples/bprocess_example.c
rename to jni/badvpn/examples/bprocess_example.c
diff --git a/src/main/jni/badvpn/examples/brandom2_test.c b/jni/badvpn/examples/brandom2_test.c
similarity index 100%
rename from src/main/jni/badvpn/examples/brandom2_test.c
rename to jni/badvpn/examples/brandom2_test.c
diff --git a/src/main/jni/badvpn/examples/btimer_example.c b/jni/badvpn/examples/btimer_example.c
similarity index 100%
rename from src/main/jni/badvpn/examples/btimer_example.c
rename to jni/badvpn/examples/btimer_example.c
diff --git a/src/main/jni/badvpn/examples/cavl_test.c b/jni/badvpn/examples/cavl_test.c
similarity index 100%
rename from src/main/jni/badvpn/examples/cavl_test.c
rename to jni/badvpn/examples/cavl_test.c
diff --git a/src/main/jni/badvpn/examples/cavl_test_tree.h b/jni/badvpn/examples/cavl_test_tree.h
similarity index 100%
rename from src/main/jni/badvpn/examples/cavl_test_tree.h
rename to jni/badvpn/examples/cavl_test_tree.h
diff --git a/src/main/jni/badvpn/examples/dhcpclient_test.c b/jni/badvpn/examples/dhcpclient_test.c
similarity index 100%
rename from src/main/jni/badvpn/examples/dhcpclient_test.c
rename to jni/badvpn/examples/dhcpclient_test.c
diff --git a/src/main/jni/badvpn/examples/emscripten_test.c b/jni/badvpn/examples/emscripten_test.c
similarity index 100%
rename from src/main/jni/badvpn/examples/emscripten_test.c
rename to jni/badvpn/examples/emscripten_test.c
diff --git a/src/main/jni/badvpn/examples/fairqueue_test.c b/jni/badvpn/examples/fairqueue_test.c
similarity index 100%
rename from src/main/jni/badvpn/examples/fairqueue_test.c
rename to jni/badvpn/examples/fairqueue_test.c
diff --git a/src/main/jni/badvpn/examples/fairqueue_test2.c b/jni/badvpn/examples/fairqueue_test2.c
similarity index 100%
rename from src/main/jni/badvpn/examples/fairqueue_test2.c
rename to jni/badvpn/examples/fairqueue_test2.c
diff --git a/src/main/jni/badvpn/examples/indexedlist_test.c b/jni/badvpn/examples/indexedlist_test.c
similarity index 100%
rename from src/main/jni/badvpn/examples/indexedlist_test.c
rename to jni/badvpn/examples/indexedlist_test.c
diff --git a/src/main/jni/badvpn/examples/ipaddr6_test.c b/jni/badvpn/examples/ipaddr6_test.c
similarity index 100%
rename from src/main/jni/badvpn/examples/ipaddr6_test.c
rename to jni/badvpn/examples/ipaddr6_test.c
diff --git a/src/main/jni/badvpn/examples/ncd_parser_test.c b/jni/badvpn/examples/ncd_parser_test.c
similarity index 100%
rename from src/main/jni/badvpn/examples/ncd_parser_test.c
rename to jni/badvpn/examples/ncd_parser_test.c
diff --git a/src/main/jni/badvpn/examples/ncd_tokenizer_test.c b/jni/badvpn/examples/ncd_tokenizer_test.c
similarity index 100%
rename from src/main/jni/badvpn/examples/ncd_tokenizer_test.c
rename to jni/badvpn/examples/ncd_tokenizer_test.c
diff --git a/src/main/jni/badvpn/examples/ncd_value_parser_test.c b/jni/badvpn/examples/ncd_value_parser_test.c
similarity index 100%
rename from src/main/jni/badvpn/examples/ncd_value_parser_test.c
rename to jni/badvpn/examples/ncd_value_parser_test.c
diff --git a/src/main/jni/badvpn/examples/ncdinterfacemonitor_test.c b/jni/badvpn/examples/ncdinterfacemonitor_test.c
similarity index 100%
rename from src/main/jni/badvpn/examples/ncdinterfacemonitor_test.c
rename to jni/badvpn/examples/ncdinterfacemonitor_test.c
diff --git a/src/main/jni/badvpn/examples/ncdudevmanager_test.c b/jni/badvpn/examples/ncdudevmanager_test.c
similarity index 100%
rename from src/main/jni/badvpn/examples/ncdudevmanager_test.c
rename to jni/badvpn/examples/ncdudevmanager_test.c
diff --git a/src/main/jni/badvpn/examples/ncdudevmonitor_test.c b/jni/badvpn/examples/ncdudevmonitor_test.c
similarity index 100%
rename from src/main/jni/badvpn/examples/ncdudevmonitor_test.c
rename to jni/badvpn/examples/ncdudevmonitor_test.c
diff --git a/src/main/jni/badvpn/examples/ncdval_test.c b/jni/badvpn/examples/ncdval_test.c
similarity index 100%
rename from src/main/jni/badvpn/examples/ncdval_test.c
rename to jni/badvpn/examples/ncdval_test.c
diff --git a/src/main/jni/badvpn/examples/ncdvalcons_test.c b/jni/badvpn/examples/ncdvalcons_test.c
similarity index 100%
rename from src/main/jni/badvpn/examples/ncdvalcons_test.c
rename to jni/badvpn/examples/ncdvalcons_test.c
diff --git a/src/main/jni/badvpn/examples/parse_number_test.c b/jni/badvpn/examples/parse_number_test.c
similarity index 100%
rename from src/main/jni/badvpn/examples/parse_number_test.c
rename to jni/badvpn/examples/parse_number_test.c
diff --git a/src/main/jni/badvpn/examples/predicate_test.c b/jni/badvpn/examples/predicate_test.c
similarity index 100%
rename from src/main/jni/badvpn/examples/predicate_test.c
rename to jni/badvpn/examples/predicate_test.c
diff --git a/src/main/jni/badvpn/examples/savl_test.c b/jni/badvpn/examples/savl_test.c
similarity index 100%
rename from src/main/jni/badvpn/examples/savl_test.c
rename to jni/badvpn/examples/savl_test.c
diff --git a/src/main/jni/badvpn/examples/savl_test_tree.h b/jni/badvpn/examples/savl_test_tree.h
similarity index 100%
rename from src/main/jni/badvpn/examples/savl_test_tree.h
rename to jni/badvpn/examples/savl_test_tree.h
diff --git a/src/main/jni/badvpn/examples/stdin_input.c b/jni/badvpn/examples/stdin_input.c
similarity index 100%
rename from src/main/jni/badvpn/examples/stdin_input.c
rename to jni/badvpn/examples/stdin_input.c
diff --git a/src/main/jni/badvpn/examples/substring_test.c b/jni/badvpn/examples/substring_test.c
similarity index 100%
rename from src/main/jni/badvpn/examples/substring_test.c
rename to jni/badvpn/examples/substring_test.c
diff --git a/src/main/jni/badvpn/fix_flex.php b/jni/badvpn/fix_flex.php
similarity index 100%
rename from src/main/jni/badvpn/fix_flex.php
rename to jni/badvpn/fix_flex.php
diff --git a/src/main/jni/badvpn/flooder/CMakeLists.txt b/jni/badvpn/flooder/CMakeLists.txt
similarity index 100%
rename from src/main/jni/badvpn/flooder/CMakeLists.txt
rename to jni/badvpn/flooder/CMakeLists.txt
diff --git a/src/main/jni/badvpn/flooder/flooder.c b/jni/badvpn/flooder/flooder.c
similarity index 100%
rename from src/main/jni/badvpn/flooder/flooder.c
rename to jni/badvpn/flooder/flooder.c
diff --git a/src/main/jni/badvpn/flooder/flooder.h b/jni/badvpn/flooder/flooder.h
similarity index 100%
rename from src/main/jni/badvpn/flooder/flooder.h
rename to jni/badvpn/flooder/flooder.h
diff --git a/src/main/jni/badvpn/flow/BufferWriter.c b/jni/badvpn/flow/BufferWriter.c
similarity index 100%
rename from src/main/jni/badvpn/flow/BufferWriter.c
rename to jni/badvpn/flow/BufferWriter.c
diff --git a/src/main/jni/badvpn/flow/BufferWriter.h b/jni/badvpn/flow/BufferWriter.h
similarity index 100%
rename from src/main/jni/badvpn/flow/BufferWriter.h
rename to jni/badvpn/flow/BufferWriter.h
diff --git a/src/main/jni/badvpn/flow/CMakeLists.txt b/jni/badvpn/flow/CMakeLists.txt
similarity index 100%
rename from src/main/jni/badvpn/flow/CMakeLists.txt
rename to jni/badvpn/flow/CMakeLists.txt
diff --git a/src/main/jni/badvpn/flow/LineBuffer.c b/jni/badvpn/flow/LineBuffer.c
similarity index 100%
rename from src/main/jni/badvpn/flow/LineBuffer.c
rename to jni/badvpn/flow/LineBuffer.c
diff --git a/src/main/jni/badvpn/flow/LineBuffer.h b/jni/badvpn/flow/LineBuffer.h
similarity index 100%
rename from src/main/jni/badvpn/flow/LineBuffer.h
rename to jni/badvpn/flow/LineBuffer.h
diff --git a/src/main/jni/badvpn/flow/PacketBuffer.c b/jni/badvpn/flow/PacketBuffer.c
similarity index 100%
rename from src/main/jni/badvpn/flow/PacketBuffer.c
rename to jni/badvpn/flow/PacketBuffer.c
diff --git a/src/main/jni/badvpn/flow/PacketBuffer.h b/jni/badvpn/flow/PacketBuffer.h
similarity index 100%
rename from src/main/jni/badvpn/flow/PacketBuffer.h
rename to jni/badvpn/flow/PacketBuffer.h
diff --git a/src/main/jni/badvpn/flow/PacketCopier.c b/jni/badvpn/flow/PacketCopier.c
similarity index 100%
rename from src/main/jni/badvpn/flow/PacketCopier.c
rename to jni/badvpn/flow/PacketCopier.c
diff --git a/src/main/jni/badvpn/flow/PacketCopier.h b/jni/badvpn/flow/PacketCopier.h
similarity index 100%
rename from src/main/jni/badvpn/flow/PacketCopier.h
rename to jni/badvpn/flow/PacketCopier.h
diff --git a/src/main/jni/badvpn/flow/PacketPassConnector.c b/jni/badvpn/flow/PacketPassConnector.c
similarity index 100%
rename from src/main/jni/badvpn/flow/PacketPassConnector.c
rename to jni/badvpn/flow/PacketPassConnector.c
diff --git a/src/main/jni/badvpn/flow/PacketPassConnector.h b/jni/badvpn/flow/PacketPassConnector.h
similarity index 100%
rename from src/main/jni/badvpn/flow/PacketPassConnector.h
rename to jni/badvpn/flow/PacketPassConnector.h
diff --git a/src/main/jni/badvpn/flow/PacketPassFairQueue.c b/jni/badvpn/flow/PacketPassFairQueue.c
similarity index 100%
rename from src/main/jni/badvpn/flow/PacketPassFairQueue.c
rename to jni/badvpn/flow/PacketPassFairQueue.c
diff --git a/src/main/jni/badvpn/flow/PacketPassFairQueue.h b/jni/badvpn/flow/PacketPassFairQueue.h
similarity index 100%
rename from src/main/jni/badvpn/flow/PacketPassFairQueue.h
rename to jni/badvpn/flow/PacketPassFairQueue.h
diff --git a/src/main/jni/badvpn/flow/PacketPassFairQueue_tree.h b/jni/badvpn/flow/PacketPassFairQueue_tree.h
similarity index 100%
rename from src/main/jni/badvpn/flow/PacketPassFairQueue_tree.h
rename to jni/badvpn/flow/PacketPassFairQueue_tree.h
diff --git a/src/main/jni/badvpn/flow/PacketPassFifoQueue.c b/jni/badvpn/flow/PacketPassFifoQueue.c
similarity index 100%
rename from src/main/jni/badvpn/flow/PacketPassFifoQueue.c
rename to jni/badvpn/flow/PacketPassFifoQueue.c
diff --git a/src/main/jni/badvpn/flow/PacketPassFifoQueue.h b/jni/badvpn/flow/PacketPassFifoQueue.h
similarity index 100%
rename from src/main/jni/badvpn/flow/PacketPassFifoQueue.h
rename to jni/badvpn/flow/PacketPassFifoQueue.h
diff --git a/src/main/jni/badvpn/flow/PacketPassInterface.c b/jni/badvpn/flow/PacketPassInterface.c
similarity index 100%
rename from src/main/jni/badvpn/flow/PacketPassInterface.c
rename to jni/badvpn/flow/PacketPassInterface.c
diff --git a/src/main/jni/badvpn/flow/PacketPassInterface.h b/jni/badvpn/flow/PacketPassInterface.h
similarity index 100%
rename from src/main/jni/badvpn/flow/PacketPassInterface.h
rename to jni/badvpn/flow/PacketPassInterface.h
diff --git a/src/main/jni/badvpn/flow/PacketPassNotifier.c b/jni/badvpn/flow/PacketPassNotifier.c
similarity index 100%
rename from src/main/jni/badvpn/flow/PacketPassNotifier.c
rename to jni/badvpn/flow/PacketPassNotifier.c
diff --git a/src/main/jni/badvpn/flow/PacketPassNotifier.h b/jni/badvpn/flow/PacketPassNotifier.h
similarity index 100%
rename from src/main/jni/badvpn/flow/PacketPassNotifier.h
rename to jni/badvpn/flow/PacketPassNotifier.h
diff --git a/src/main/jni/badvpn/flow/PacketPassPriorityQueue.c b/jni/badvpn/flow/PacketPassPriorityQueue.c
similarity index 100%
rename from src/main/jni/badvpn/flow/PacketPassPriorityQueue.c
rename to jni/badvpn/flow/PacketPassPriorityQueue.c
diff --git a/src/main/jni/badvpn/flow/PacketPassPriorityQueue.h b/jni/badvpn/flow/PacketPassPriorityQueue.h
similarity index 100%
rename from src/main/jni/badvpn/flow/PacketPassPriorityQueue.h
rename to jni/badvpn/flow/PacketPassPriorityQueue.h
diff --git a/src/main/jni/badvpn/flow/PacketPassPriorityQueue_tree.h b/jni/badvpn/flow/PacketPassPriorityQueue_tree.h
similarity index 100%
rename from src/main/jni/badvpn/flow/PacketPassPriorityQueue_tree.h
rename to jni/badvpn/flow/PacketPassPriorityQueue_tree.h
diff --git a/src/main/jni/badvpn/flow/PacketProtoDecoder.c b/jni/badvpn/flow/PacketProtoDecoder.c
similarity index 100%
rename from src/main/jni/badvpn/flow/PacketProtoDecoder.c
rename to jni/badvpn/flow/PacketProtoDecoder.c
diff --git a/src/main/jni/badvpn/flow/PacketProtoDecoder.h b/jni/badvpn/flow/PacketProtoDecoder.h
similarity index 100%
rename from src/main/jni/badvpn/flow/PacketProtoDecoder.h
rename to jni/badvpn/flow/PacketProtoDecoder.h
diff --git a/src/main/jni/badvpn/flow/PacketProtoEncoder.c b/jni/badvpn/flow/PacketProtoEncoder.c
similarity index 100%
rename from src/main/jni/badvpn/flow/PacketProtoEncoder.c
rename to jni/badvpn/flow/PacketProtoEncoder.c
diff --git a/src/main/jni/badvpn/flow/PacketProtoEncoder.h b/jni/badvpn/flow/PacketProtoEncoder.h
similarity index 100%
rename from src/main/jni/badvpn/flow/PacketProtoEncoder.h
rename to jni/badvpn/flow/PacketProtoEncoder.h
diff --git a/src/main/jni/badvpn/flow/PacketProtoFlow.c b/jni/badvpn/flow/PacketProtoFlow.c
similarity index 100%
rename from src/main/jni/badvpn/flow/PacketProtoFlow.c
rename to jni/badvpn/flow/PacketProtoFlow.c
diff --git a/src/main/jni/badvpn/flow/PacketProtoFlow.h b/jni/badvpn/flow/PacketProtoFlow.h
similarity index 100%
rename from src/main/jni/badvpn/flow/PacketProtoFlow.h
rename to jni/badvpn/flow/PacketProtoFlow.h
diff --git a/src/main/jni/badvpn/flow/PacketRecvBlocker.c b/jni/badvpn/flow/PacketRecvBlocker.c
similarity index 100%
rename from src/main/jni/badvpn/flow/PacketRecvBlocker.c
rename to jni/badvpn/flow/PacketRecvBlocker.c
diff --git a/src/main/jni/badvpn/flow/PacketRecvBlocker.h b/jni/badvpn/flow/PacketRecvBlocker.h
similarity index 100%
rename from src/main/jni/badvpn/flow/PacketRecvBlocker.h
rename to jni/badvpn/flow/PacketRecvBlocker.h
diff --git a/src/main/jni/badvpn/flow/PacketRecvConnector.c b/jni/badvpn/flow/PacketRecvConnector.c
similarity index 100%
rename from src/main/jni/badvpn/flow/PacketRecvConnector.c
rename to jni/badvpn/flow/PacketRecvConnector.c
diff --git a/src/main/jni/badvpn/flow/PacketRecvConnector.h b/jni/badvpn/flow/PacketRecvConnector.h
similarity index 100%
rename from src/main/jni/badvpn/flow/PacketRecvConnector.h
rename to jni/badvpn/flow/PacketRecvConnector.h
diff --git a/src/main/jni/badvpn/flow/PacketRecvInterface.c b/jni/badvpn/flow/PacketRecvInterface.c
similarity index 100%
rename from src/main/jni/badvpn/flow/PacketRecvInterface.c
rename to jni/badvpn/flow/PacketRecvInterface.c
diff --git a/src/main/jni/badvpn/flow/PacketRecvInterface.h b/jni/badvpn/flow/PacketRecvInterface.h
similarity index 100%
rename from src/main/jni/badvpn/flow/PacketRecvInterface.h
rename to jni/badvpn/flow/PacketRecvInterface.h
diff --git a/src/main/jni/badvpn/flow/PacketRouter.c b/jni/badvpn/flow/PacketRouter.c
similarity index 100%
rename from src/main/jni/badvpn/flow/PacketRouter.c
rename to jni/badvpn/flow/PacketRouter.c
diff --git a/src/main/jni/badvpn/flow/PacketRouter.h b/jni/badvpn/flow/PacketRouter.h
similarity index 100%
rename from src/main/jni/badvpn/flow/PacketRouter.h
rename to jni/badvpn/flow/PacketRouter.h
diff --git a/src/main/jni/badvpn/flow/PacketStreamSender.c b/jni/badvpn/flow/PacketStreamSender.c
similarity index 100%
rename from src/main/jni/badvpn/flow/PacketStreamSender.c
rename to jni/badvpn/flow/PacketStreamSender.c
diff --git a/src/main/jni/badvpn/flow/PacketStreamSender.h b/jni/badvpn/flow/PacketStreamSender.h
similarity index 100%
rename from src/main/jni/badvpn/flow/PacketStreamSender.h
rename to jni/badvpn/flow/PacketStreamSender.h
diff --git a/src/main/jni/badvpn/flow/RouteBuffer.c b/jni/badvpn/flow/RouteBuffer.c
similarity index 100%
rename from src/main/jni/badvpn/flow/RouteBuffer.c
rename to jni/badvpn/flow/RouteBuffer.c
diff --git a/src/main/jni/badvpn/flow/RouteBuffer.h b/jni/badvpn/flow/RouteBuffer.h
similarity index 100%
rename from src/main/jni/badvpn/flow/RouteBuffer.h
rename to jni/badvpn/flow/RouteBuffer.h
diff --git a/src/main/jni/badvpn/flow/SinglePacketBuffer.c b/jni/badvpn/flow/SinglePacketBuffer.c
similarity index 100%
rename from src/main/jni/badvpn/flow/SinglePacketBuffer.c
rename to jni/badvpn/flow/SinglePacketBuffer.c
diff --git a/src/main/jni/badvpn/flow/SinglePacketBuffer.h b/jni/badvpn/flow/SinglePacketBuffer.h
similarity index 100%
rename from src/main/jni/badvpn/flow/SinglePacketBuffer.h
rename to jni/badvpn/flow/SinglePacketBuffer.h
diff --git a/src/main/jni/badvpn/flow/SinglePacketSender.c b/jni/badvpn/flow/SinglePacketSender.c
similarity index 100%
rename from src/main/jni/badvpn/flow/SinglePacketSender.c
rename to jni/badvpn/flow/SinglePacketSender.c
diff --git a/src/main/jni/badvpn/flow/SinglePacketSender.h b/jni/badvpn/flow/SinglePacketSender.h
similarity index 100%
rename from src/main/jni/badvpn/flow/SinglePacketSender.h
rename to jni/badvpn/flow/SinglePacketSender.h
diff --git a/src/main/jni/badvpn/flow/SingleStreamReceiver.c b/jni/badvpn/flow/SingleStreamReceiver.c
similarity index 100%
rename from src/main/jni/badvpn/flow/SingleStreamReceiver.c
rename to jni/badvpn/flow/SingleStreamReceiver.c
diff --git a/src/main/jni/badvpn/flow/SingleStreamReceiver.h b/jni/badvpn/flow/SingleStreamReceiver.h
similarity index 100%
rename from src/main/jni/badvpn/flow/SingleStreamReceiver.h
rename to jni/badvpn/flow/SingleStreamReceiver.h
diff --git a/src/main/jni/badvpn/flow/SingleStreamSender.c b/jni/badvpn/flow/SingleStreamSender.c
similarity index 100%
rename from src/main/jni/badvpn/flow/SingleStreamSender.c
rename to jni/badvpn/flow/SingleStreamSender.c
diff --git a/src/main/jni/badvpn/flow/SingleStreamSender.h b/jni/badvpn/flow/SingleStreamSender.h
similarity index 100%
rename from src/main/jni/badvpn/flow/SingleStreamSender.h
rename to jni/badvpn/flow/SingleStreamSender.h
diff --git a/src/main/jni/badvpn/flow/StreamPacketSender.c b/jni/badvpn/flow/StreamPacketSender.c
similarity index 100%
rename from src/main/jni/badvpn/flow/StreamPacketSender.c
rename to jni/badvpn/flow/StreamPacketSender.c
diff --git a/src/main/jni/badvpn/flow/StreamPacketSender.h b/jni/badvpn/flow/StreamPacketSender.h
similarity index 100%
rename from src/main/jni/badvpn/flow/StreamPacketSender.h
rename to jni/badvpn/flow/StreamPacketSender.h
diff --git a/src/main/jni/badvpn/flow/StreamPassConnector.c b/jni/badvpn/flow/StreamPassConnector.c
similarity index 100%
rename from src/main/jni/badvpn/flow/StreamPassConnector.c
rename to jni/badvpn/flow/StreamPassConnector.c
diff --git a/src/main/jni/badvpn/flow/StreamPassConnector.h b/jni/badvpn/flow/StreamPassConnector.h
similarity index 100%
rename from src/main/jni/badvpn/flow/StreamPassConnector.h
rename to jni/badvpn/flow/StreamPassConnector.h
diff --git a/src/main/jni/badvpn/flow/StreamPassInterface.c b/jni/badvpn/flow/StreamPassInterface.c
similarity index 100%
rename from src/main/jni/badvpn/flow/StreamPassInterface.c
rename to jni/badvpn/flow/StreamPassInterface.c
diff --git a/src/main/jni/badvpn/flow/StreamPassInterface.h b/jni/badvpn/flow/StreamPassInterface.h
similarity index 100%
rename from src/main/jni/badvpn/flow/StreamPassInterface.h
rename to jni/badvpn/flow/StreamPassInterface.h
diff --git a/src/main/jni/badvpn/flow/StreamRecvConnector.c b/jni/badvpn/flow/StreamRecvConnector.c
similarity index 100%
rename from src/main/jni/badvpn/flow/StreamRecvConnector.c
rename to jni/badvpn/flow/StreamRecvConnector.c
diff --git a/src/main/jni/badvpn/flow/StreamRecvConnector.h b/jni/badvpn/flow/StreamRecvConnector.h
similarity index 100%
rename from src/main/jni/badvpn/flow/StreamRecvConnector.h
rename to jni/badvpn/flow/StreamRecvConnector.h
diff --git a/src/main/jni/badvpn/flow/StreamRecvInterface.c b/jni/badvpn/flow/StreamRecvInterface.c
similarity index 100%
rename from src/main/jni/badvpn/flow/StreamRecvInterface.c
rename to jni/badvpn/flow/StreamRecvInterface.c
diff --git a/src/main/jni/badvpn/flow/StreamRecvInterface.h b/jni/badvpn/flow/StreamRecvInterface.h
similarity index 100%
rename from src/main/jni/badvpn/flow/StreamRecvInterface.h
rename to jni/badvpn/flow/StreamRecvInterface.h
diff --git a/src/main/jni/badvpn/flowextra/CMakeLists.txt b/jni/badvpn/flowextra/CMakeLists.txt
similarity index 100%
rename from src/main/jni/badvpn/flowextra/CMakeLists.txt
rename to jni/badvpn/flowextra/CMakeLists.txt
diff --git a/src/main/jni/badvpn/flowextra/KeepaliveIO.c b/jni/badvpn/flowextra/KeepaliveIO.c
similarity index 100%
rename from src/main/jni/badvpn/flowextra/KeepaliveIO.c
rename to jni/badvpn/flowextra/KeepaliveIO.c
diff --git a/src/main/jni/badvpn/flowextra/KeepaliveIO.h b/jni/badvpn/flowextra/KeepaliveIO.h
similarity index 100%
rename from src/main/jni/badvpn/flowextra/KeepaliveIO.h
rename to jni/badvpn/flowextra/KeepaliveIO.h
diff --git a/src/main/jni/badvpn/flowextra/PacketPassInactivityMonitor.c b/jni/badvpn/flowextra/PacketPassInactivityMonitor.c
similarity index 100%
rename from src/main/jni/badvpn/flowextra/PacketPassInactivityMonitor.c
rename to jni/badvpn/flowextra/PacketPassInactivityMonitor.c
diff --git a/src/main/jni/badvpn/flowextra/PacketPassInactivityMonitor.h b/jni/badvpn/flowextra/PacketPassInactivityMonitor.h
similarity index 100%
rename from src/main/jni/badvpn/flowextra/PacketPassInactivityMonitor.h
rename to jni/badvpn/flowextra/PacketPassInactivityMonitor.h
diff --git a/src/main/jni/badvpn/generate_files b/jni/badvpn/generate_files
similarity index 100%
rename from src/main/jni/badvpn/generate_files
rename to jni/badvpn/generate_files
diff --git a/src/main/jni/badvpn/generated/NCDConfigParser_parse.c b/jni/badvpn/generated/NCDConfigParser_parse.c
similarity index 100%
rename from src/main/jni/badvpn/generated/NCDConfigParser_parse.c
rename to jni/badvpn/generated/NCDConfigParser_parse.c
diff --git a/src/main/jni/badvpn/generated/NCDConfigParser_parse.h b/jni/badvpn/generated/NCDConfigParser_parse.h
similarity index 100%
rename from src/main/jni/badvpn/generated/NCDConfigParser_parse.h
rename to jni/badvpn/generated/NCDConfigParser_parse.h
diff --git a/src/main/jni/badvpn/generated/NCDConfigParser_parse.out b/jni/badvpn/generated/NCDConfigParser_parse.out
similarity index 100%
rename from src/main/jni/badvpn/generated/NCDConfigParser_parse.out
rename to jni/badvpn/generated/NCDConfigParser_parse.out
diff --git a/src/main/jni/badvpn/generated/NCDConfigParser_parse.y b/jni/badvpn/generated/NCDConfigParser_parse.y
similarity index 100%
rename from src/main/jni/badvpn/generated/NCDConfigParser_parse.y
rename to jni/badvpn/generated/NCDConfigParser_parse.y
diff --git a/src/main/jni/badvpn/generated/NCDValParser_parse.c b/jni/badvpn/generated/NCDValParser_parse.c
similarity index 100%
rename from src/main/jni/badvpn/generated/NCDValParser_parse.c
rename to jni/badvpn/generated/NCDValParser_parse.c
diff --git a/src/main/jni/badvpn/generated/NCDValParser_parse.h b/jni/badvpn/generated/NCDValParser_parse.h
similarity index 100%
rename from src/main/jni/badvpn/generated/NCDValParser_parse.h
rename to jni/badvpn/generated/NCDValParser_parse.h
diff --git a/src/main/jni/badvpn/generated/NCDValParser_parse.out b/jni/badvpn/generated/NCDValParser_parse.out
similarity index 100%
rename from src/main/jni/badvpn/generated/NCDValParser_parse.out
rename to jni/badvpn/generated/NCDValParser_parse.out
diff --git a/src/main/jni/badvpn/generated/NCDValParser_parse.y b/jni/badvpn/generated/NCDValParser_parse.y
similarity index 100%
rename from src/main/jni/badvpn/generated/NCDValParser_parse.y
rename to jni/badvpn/generated/NCDValParser_parse.y
diff --git a/src/main/jni/badvpn/generated/bison_BPredicate.c b/jni/badvpn/generated/bison_BPredicate.c
similarity index 100%
rename from src/main/jni/badvpn/generated/bison_BPredicate.c
rename to jni/badvpn/generated/bison_BPredicate.c
diff --git a/src/main/jni/badvpn/generated/bison_BPredicate.h b/jni/badvpn/generated/bison_BPredicate.h
similarity index 100%
rename from src/main/jni/badvpn/generated/bison_BPredicate.h
rename to jni/badvpn/generated/bison_BPredicate.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_BArpProbe.h b/jni/badvpn/generated/blog_channel_BArpProbe.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_BArpProbe.h
rename to jni/badvpn/generated/blog_channel_BArpProbe.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_BConnection.h b/jni/badvpn/generated/blog_channel_BConnection.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_BConnection.h
rename to jni/badvpn/generated/blog_channel_BConnection.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_BDHCPClient.h b/jni/badvpn/generated/blog_channel_BDHCPClient.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_BDHCPClient.h
rename to jni/badvpn/generated/blog_channel_BDHCPClient.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_BDHCPClientCore.h b/jni/badvpn/generated/blog_channel_BDHCPClientCore.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_BDHCPClientCore.h
rename to jni/badvpn/generated/blog_channel_BDHCPClientCore.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_BDatagram.h b/jni/badvpn/generated/blog_channel_BDatagram.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_BDatagram.h
rename to jni/badvpn/generated/blog_channel_BDatagram.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_BEncryption.h b/jni/badvpn/generated/blog_channel_BEncryption.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_BEncryption.h
rename to jni/badvpn/generated/blog_channel_BEncryption.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_BInputProcess.h b/jni/badvpn/generated/blog_channel_BInputProcess.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_BInputProcess.h
rename to jni/badvpn/generated/blog_channel_BInputProcess.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_BLockReactor.h b/jni/badvpn/generated/blog_channel_BLockReactor.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_BLockReactor.h
rename to jni/badvpn/generated/blog_channel_BLockReactor.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_BNetwork.h b/jni/badvpn/generated/blog_channel_BNetwork.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_BNetwork.h
rename to jni/badvpn/generated/blog_channel_BNetwork.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_BPredicate.h b/jni/badvpn/generated/blog_channel_BPredicate.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_BPredicate.h
rename to jni/badvpn/generated/blog_channel_BPredicate.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_BProcess.h b/jni/badvpn/generated/blog_channel_BProcess.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_BProcess.h
rename to jni/badvpn/generated/blog_channel_BProcess.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_BReactor.h b/jni/badvpn/generated/blog_channel_BReactor.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_BReactor.h
rename to jni/badvpn/generated/blog_channel_BReactor.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_BSSLConnection.h b/jni/badvpn/generated/blog_channel_BSSLConnection.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_BSSLConnection.h
rename to jni/badvpn/generated/blog_channel_BSSLConnection.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_BSignal.h b/jni/badvpn/generated/blog_channel_BSignal.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_BSignal.h
rename to jni/badvpn/generated/blog_channel_BSignal.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_BSocksClient.h b/jni/badvpn/generated/blog_channel_BSocksClient.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_BSocksClient.h
rename to jni/badvpn/generated/blog_channel_BSocksClient.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_BTap.h b/jni/badvpn/generated/blog_channel_BTap.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_BTap.h
rename to jni/badvpn/generated/blog_channel_BTap.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_BThreadSignal.h b/jni/badvpn/generated/blog_channel_BThreadSignal.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_BThreadSignal.h
rename to jni/badvpn/generated/blog_channel_BThreadSignal.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_BThreadWork.h b/jni/badvpn/generated/blog_channel_BThreadWork.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_BThreadWork.h
rename to jni/badvpn/generated/blog_channel_BThreadWork.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_BTime.h b/jni/badvpn/generated/blog_channel_BTime.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_BTime.h
rename to jni/badvpn/generated/blog_channel_BTime.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_BUnixSignal.h b/jni/badvpn/generated/blog_channel_BUnixSignal.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_BUnixSignal.h
rename to jni/badvpn/generated/blog_channel_BUnixSignal.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_DPReceive.h b/jni/badvpn/generated/blog_channel_DPReceive.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_DPReceive.h
rename to jni/badvpn/generated/blog_channel_DPReceive.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_DPRelay.h b/jni/badvpn/generated/blog_channel_DPRelay.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_DPRelay.h
rename to jni/badvpn/generated/blog_channel_DPRelay.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_DataProto.h b/jni/badvpn/generated/blog_channel_DataProto.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_DataProto.h
rename to jni/badvpn/generated/blog_channel_DataProto.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_DatagramPeerIO.h b/jni/badvpn/generated/blog_channel_DatagramPeerIO.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_DatagramPeerIO.h
rename to jni/badvpn/generated/blog_channel_DatagramPeerIO.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_FragmentProtoAssembler.h b/jni/badvpn/generated/blog_channel_FragmentProtoAssembler.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_FragmentProtoAssembler.h
rename to jni/badvpn/generated/blog_channel_FragmentProtoAssembler.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_FrameDecider.h b/jni/badvpn/generated/blog_channel_FrameDecider.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_FrameDecider.h
rename to jni/badvpn/generated/blog_channel_FrameDecider.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_LineBuffer.h b/jni/badvpn/generated/blog_channel_LineBuffer.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_LineBuffer.h
rename to jni/badvpn/generated/blog_channel_LineBuffer.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_Listener.h b/jni/badvpn/generated/blog_channel_Listener.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_Listener.h
rename to jni/badvpn/generated/blog_channel_Listener.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_NCDBuildProgram.h b/jni/badvpn/generated/blog_channel_NCDBuildProgram.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_NCDBuildProgram.h
rename to jni/badvpn/generated/blog_channel_NCDBuildProgram.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_NCDConfigParser.h b/jni/badvpn/generated/blog_channel_NCDConfigParser.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_NCDConfigParser.h
rename to jni/badvpn/generated/blog_channel_NCDConfigParser.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_NCDConfigTokenizer.h b/jni/badvpn/generated/blog_channel_NCDConfigTokenizer.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_NCDConfigTokenizer.h
rename to jni/badvpn/generated/blog_channel_NCDConfigTokenizer.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_NCDIfConfig.h b/jni/badvpn/generated/blog_channel_NCDIfConfig.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_NCDIfConfig.h
rename to jni/badvpn/generated/blog_channel_NCDIfConfig.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_NCDInterfaceMonitor.h b/jni/badvpn/generated/blog_channel_NCDInterfaceMonitor.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_NCDInterfaceMonitor.h
rename to jni/badvpn/generated/blog_channel_NCDInterfaceMonitor.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_NCDModuleIndex.h b/jni/badvpn/generated/blog_channel_NCDModuleIndex.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_NCDModuleIndex.h
rename to jni/badvpn/generated/blog_channel_NCDModuleIndex.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_NCDModuleProcess.h b/jni/badvpn/generated/blog_channel_NCDModuleProcess.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_NCDModuleProcess.h
rename to jni/badvpn/generated/blog_channel_NCDModuleProcess.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_NCDPlaceholderDb.h b/jni/badvpn/generated/blog_channel_NCDPlaceholderDb.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_NCDPlaceholderDb.h
rename to jni/badvpn/generated/blog_channel_NCDPlaceholderDb.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_NCDRequest.h b/jni/badvpn/generated/blog_channel_NCDRequest.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_NCDRequest.h
rename to jni/badvpn/generated/blog_channel_NCDRequest.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_NCDRequestClient.h b/jni/badvpn/generated/blog_channel_NCDRequestClient.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_NCDRequestClient.h
rename to jni/badvpn/generated/blog_channel_NCDRequestClient.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_NCDRfkillMonitor.h b/jni/badvpn/generated/blog_channel_NCDRfkillMonitor.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_NCDRfkillMonitor.h
rename to jni/badvpn/generated/blog_channel_NCDRfkillMonitor.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_NCDUdevCache.h b/jni/badvpn/generated/blog_channel_NCDUdevCache.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_NCDUdevCache.h
rename to jni/badvpn/generated/blog_channel_NCDUdevCache.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_NCDUdevManager.h b/jni/badvpn/generated/blog_channel_NCDUdevManager.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_NCDUdevManager.h
rename to jni/badvpn/generated/blog_channel_NCDUdevManager.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_NCDUdevMonitor.h b/jni/badvpn/generated/blog_channel_NCDUdevMonitor.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_NCDUdevMonitor.h
rename to jni/badvpn/generated/blog_channel_NCDUdevMonitor.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_NCDUdevMonitorParser.h b/jni/badvpn/generated/blog_channel_NCDUdevMonitorParser.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_NCDUdevMonitorParser.h
rename to jni/badvpn/generated/blog_channel_NCDUdevMonitorParser.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_NCDVal.h b/jni/badvpn/generated/blog_channel_NCDVal.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_NCDVal.h
rename to jni/badvpn/generated/blog_channel_NCDVal.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_NCDValGenerator.h b/jni/badvpn/generated/blog_channel_NCDValGenerator.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_NCDValGenerator.h
rename to jni/badvpn/generated/blog_channel_NCDValGenerator.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_NCDValParser.h b/jni/badvpn/generated/blog_channel_NCDValParser.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_NCDValParser.h
rename to jni/badvpn/generated/blog_channel_NCDValParser.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_PRStreamSink.h b/jni/badvpn/generated/blog_channel_PRStreamSink.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_PRStreamSink.h
rename to jni/badvpn/generated/blog_channel_PRStreamSink.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_PRStreamSource.h b/jni/badvpn/generated/blog_channel_PRStreamSource.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_PRStreamSource.h
rename to jni/badvpn/generated/blog_channel_PRStreamSource.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_PacketProtoDecoder.h b/jni/badvpn/generated/blog_channel_PacketProtoDecoder.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_PacketProtoDecoder.h
rename to jni/badvpn/generated/blog_channel_PacketProtoDecoder.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_PasswordListener.h b/jni/badvpn/generated/blog_channel_PasswordListener.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_PasswordListener.h
rename to jni/badvpn/generated/blog_channel_PasswordListener.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_PeerChat.h b/jni/badvpn/generated/blog_channel_PeerChat.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_PeerChat.h
rename to jni/badvpn/generated/blog_channel_PeerChat.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_SPProtoDecoder.h b/jni/badvpn/generated/blog_channel_SPProtoDecoder.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_SPProtoDecoder.h
rename to jni/badvpn/generated/blog_channel_SPProtoDecoder.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ServerConnection.h b/jni/badvpn/generated/blog_channel_ServerConnection.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ServerConnection.h
rename to jni/badvpn/generated/blog_channel_ServerConnection.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_SocksUdpGwClient.h b/jni/badvpn/generated/blog_channel_SocksUdpGwClient.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_SocksUdpGwClient.h
rename to jni/badvpn/generated/blog_channel_SocksUdpGwClient.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_StreamPeerIO.h b/jni/badvpn/generated/blog_channel_StreamPeerIO.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_StreamPeerIO.h
rename to jni/badvpn/generated/blog_channel_StreamPeerIO.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_UdpGwClient.h b/jni/badvpn/generated/blog_channel_UdpGwClient.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_UdpGwClient.h
rename to jni/badvpn/generated/blog_channel_UdpGwClient.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_addr.h b/jni/badvpn/generated/blog_channel_addr.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_addr.h
rename to jni/badvpn/generated/blog_channel_addr.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_client.h b/jni/badvpn/generated/blog_channel_client.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_client.h
rename to jni/badvpn/generated/blog_channel_client.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_dostest_attacker.h b/jni/badvpn/generated/blog_channel_dostest_attacker.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_dostest_attacker.h
rename to jni/badvpn/generated/blog_channel_dostest_attacker.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_dostest_server.h b/jni/badvpn/generated/blog_channel_dostest_server.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_dostest_server.h
rename to jni/badvpn/generated/blog_channel_dostest_server.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_flooder.h b/jni/badvpn/generated/blog_channel_flooder.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_flooder.h
rename to jni/badvpn/generated/blog_channel_flooder.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_lwip.h b/jni/badvpn/generated/blog_channel_lwip.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_lwip.h
rename to jni/badvpn/generated/blog_channel_lwip.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd.h b/jni/badvpn/generated/blog_channel_ncd.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd.h
rename to jni/badvpn/generated/blog_channel_ncd.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_alias.h b/jni/badvpn/generated/blog_channel_ncd_alias.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_alias.h
rename to jni/badvpn/generated/blog_channel_ncd_alias.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_arithmetic.h b/jni/badvpn/generated/blog_channel_ncd_arithmetic.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_arithmetic.h
rename to jni/badvpn/generated/blog_channel_ncd_arithmetic.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_assert.h b/jni/badvpn/generated/blog_channel_ncd_assert.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_assert.h
rename to jni/badvpn/generated/blog_channel_ncd_assert.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_backtrack.h b/jni/badvpn/generated/blog_channel_ncd_backtrack.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_backtrack.h
rename to jni/badvpn/generated/blog_channel_ncd_backtrack.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_blocker.h b/jni/badvpn/generated/blog_channel_ncd_blocker.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_blocker.h
rename to jni/badvpn/generated/blog_channel_ncd_blocker.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_buffer.h b/jni/badvpn/generated/blog_channel_ncd_buffer.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_buffer.h
rename to jni/badvpn/generated/blog_channel_ncd_buffer.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_call2.h b/jni/badvpn/generated/blog_channel_ncd_call2.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_call2.h
rename to jni/badvpn/generated/blog_channel_ncd_call2.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_choose.h b/jni/badvpn/generated/blog_channel_ncd_choose.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_choose.h
rename to jni/badvpn/generated/blog_channel_ncd_choose.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_concat.h b/jni/badvpn/generated/blog_channel_ncd_concat.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_concat.h
rename to jni/badvpn/generated/blog_channel_ncd_concat.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_daemon.h b/jni/badvpn/generated/blog_channel_ncd_daemon.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_daemon.h
rename to jni/badvpn/generated/blog_channel_ncd_daemon.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_depend.h b/jni/badvpn/generated/blog_channel_ncd_depend.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_depend.h
rename to jni/badvpn/generated/blog_channel_ncd_depend.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_depend_scope.h b/jni/badvpn/generated/blog_channel_ncd_depend_scope.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_depend_scope.h
rename to jni/badvpn/generated/blog_channel_ncd_depend_scope.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_dynamic_depend.h b/jni/badvpn/generated/blog_channel_ncd_dynamic_depend.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_dynamic_depend.h
rename to jni/badvpn/generated/blog_channel_ncd_dynamic_depend.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_exit.h b/jni/badvpn/generated/blog_channel_ncd_exit.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_exit.h
rename to jni/badvpn/generated/blog_channel_ncd_exit.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_explode.h b/jni/badvpn/generated/blog_channel_ncd_explode.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_explode.h
rename to jni/badvpn/generated/blog_channel_ncd_explode.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_file.h b/jni/badvpn/generated/blog_channel_ncd_file.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_file.h
rename to jni/badvpn/generated/blog_channel_ncd_file.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_file_open.h b/jni/badvpn/generated/blog_channel_ncd_file_open.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_file_open.h
rename to jni/badvpn/generated/blog_channel_ncd_file_open.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_foreach.h b/jni/badvpn/generated/blog_channel_ncd_foreach.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_foreach.h
rename to jni/badvpn/generated/blog_channel_ncd_foreach.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_from_string.h b/jni/badvpn/generated/blog_channel_ncd_from_string.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_from_string.h
rename to jni/badvpn/generated/blog_channel_ncd_from_string.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_getargs.h b/jni/badvpn/generated/blog_channel_ncd_getargs.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_getargs.h
rename to jni/badvpn/generated/blog_channel_ncd_getargs.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_getenv.h b/jni/badvpn/generated/blog_channel_ncd_getenv.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_getenv.h
rename to jni/badvpn/generated/blog_channel_ncd_getenv.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_if.h b/jni/badvpn/generated/blog_channel_ncd_if.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_if.h
rename to jni/badvpn/generated/blog_channel_ncd_if.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_imperative.h b/jni/badvpn/generated/blog_channel_ncd_imperative.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_imperative.h
rename to jni/badvpn/generated/blog_channel_ncd_imperative.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_implode.h b/jni/badvpn/generated/blog_channel_ncd_implode.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_implode.h
rename to jni/badvpn/generated/blog_channel_ncd_implode.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_index.h b/jni/badvpn/generated/blog_channel_ncd_index.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_index.h
rename to jni/badvpn/generated/blog_channel_ncd_index.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_list.h b/jni/badvpn/generated/blog_channel_ncd_list.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_list.h
rename to jni/badvpn/generated/blog_channel_ncd_list.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_load_module.h b/jni/badvpn/generated/blog_channel_ncd_load_module.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_load_module.h
rename to jni/badvpn/generated/blog_channel_ncd_load_module.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_log.h b/jni/badvpn/generated/blog_channel_ncd_log.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_log.h
rename to jni/badvpn/generated/blog_channel_ncd_log.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_log_msg.h b/jni/badvpn/generated/blog_channel_ncd_log_msg.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_log_msg.h
rename to jni/badvpn/generated/blog_channel_ncd_log_msg.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_logical.h b/jni/badvpn/generated/blog_channel_ncd_logical.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_logical.h
rename to jni/badvpn/generated/blog_channel_ncd_logical.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_multidepend.h b/jni/badvpn/generated/blog_channel_ncd_multidepend.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_multidepend.h
rename to jni/badvpn/generated/blog_channel_ncd_multidepend.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_net_backend_badvpn.h b/jni/badvpn/generated/blog_channel_ncd_net_backend_badvpn.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_net_backend_badvpn.h
rename to jni/badvpn/generated/blog_channel_ncd_net_backend_badvpn.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_net_backend_rfkill.h b/jni/badvpn/generated/blog_channel_ncd_net_backend_rfkill.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_net_backend_rfkill.h
rename to jni/badvpn/generated/blog_channel_ncd_net_backend_rfkill.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_net_backend_waitdevice.h b/jni/badvpn/generated/blog_channel_ncd_net_backend_waitdevice.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_net_backend_waitdevice.h
rename to jni/badvpn/generated/blog_channel_ncd_net_backend_waitdevice.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_net_backend_waitlink.h b/jni/badvpn/generated/blog_channel_ncd_net_backend_waitlink.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_net_backend_waitlink.h
rename to jni/badvpn/generated/blog_channel_ncd_net_backend_waitlink.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_net_backend_wpa_supplicant.h b/jni/badvpn/generated/blog_channel_ncd_net_backend_wpa_supplicant.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_net_backend_wpa_supplicant.h
rename to jni/badvpn/generated/blog_channel_ncd_net_backend_wpa_supplicant.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_net_dns.h b/jni/badvpn/generated/blog_channel_ncd_net_dns.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_net_dns.h
rename to jni/badvpn/generated/blog_channel_ncd_net_dns.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_net_iptables.h b/jni/badvpn/generated/blog_channel_ncd_net_iptables.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_net_iptables.h
rename to jni/badvpn/generated/blog_channel_ncd_net_iptables.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_net_ipv4_addr.h b/jni/badvpn/generated/blog_channel_ncd_net_ipv4_addr.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_net_ipv4_addr.h
rename to jni/badvpn/generated/blog_channel_ncd_net_ipv4_addr.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_net_ipv4_addr_in_network.h b/jni/badvpn/generated/blog_channel_ncd_net_ipv4_addr_in_network.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_net_ipv4_addr_in_network.h
rename to jni/badvpn/generated/blog_channel_ncd_net_ipv4_addr_in_network.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_net_ipv4_arp_probe.h b/jni/badvpn/generated/blog_channel_ncd_net_ipv4_arp_probe.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_net_ipv4_arp_probe.h
rename to jni/badvpn/generated/blog_channel_ncd_net_ipv4_arp_probe.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_net_ipv4_dhcp.h b/jni/badvpn/generated/blog_channel_ncd_net_ipv4_dhcp.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_net_ipv4_dhcp.h
rename to jni/badvpn/generated/blog_channel_ncd_net_ipv4_dhcp.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_net_ipv4_route.h b/jni/badvpn/generated/blog_channel_ncd_net_ipv4_route.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_net_ipv4_route.h
rename to jni/badvpn/generated/blog_channel_ncd_net_ipv4_route.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_net_ipv6_addr.h b/jni/badvpn/generated/blog_channel_ncd_net_ipv6_addr.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_net_ipv6_addr.h
rename to jni/badvpn/generated/blog_channel_ncd_net_ipv6_addr.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_net_ipv6_addr_in_network.h b/jni/badvpn/generated/blog_channel_ncd_net_ipv6_addr_in_network.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_net_ipv6_addr_in_network.h
rename to jni/badvpn/generated/blog_channel_ncd_net_ipv6_addr_in_network.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_net_ipv6_route.h b/jni/badvpn/generated/blog_channel_ncd_net_ipv6_route.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_net_ipv6_route.h
rename to jni/badvpn/generated/blog_channel_ncd_net_ipv6_route.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_net_ipv6_wait_dynamic_addr.h b/jni/badvpn/generated/blog_channel_ncd_net_ipv6_wait_dynamic_addr.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_net_ipv6_wait_dynamic_addr.h
rename to jni/badvpn/generated/blog_channel_ncd_net_ipv6_wait_dynamic_addr.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_net_up.h b/jni/badvpn/generated/blog_channel_ncd_net_up.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_net_up.h
rename to jni/badvpn/generated/blog_channel_ncd_net_up.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_net_watch_interfaces.h b/jni/badvpn/generated/blog_channel_ncd_net_watch_interfaces.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_net_watch_interfaces.h
rename to jni/badvpn/generated/blog_channel_ncd_net_watch_interfaces.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_netmask.h b/jni/badvpn/generated/blog_channel_ncd_netmask.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_netmask.h
rename to jni/badvpn/generated/blog_channel_ncd_netmask.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_ondemand.h b/jni/badvpn/generated/blog_channel_ncd_ondemand.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_ondemand.h
rename to jni/badvpn/generated/blog_channel_ncd_ondemand.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_parse.h b/jni/badvpn/generated/blog_channel_ncd_parse.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_parse.h
rename to jni/badvpn/generated/blog_channel_ncd_parse.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_print.h b/jni/badvpn/generated/blog_channel_ncd_print.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_print.h
rename to jni/badvpn/generated/blog_channel_ncd_print.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_process_manager.h b/jni/badvpn/generated/blog_channel_ncd_process_manager.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_process_manager.h
rename to jni/badvpn/generated/blog_channel_ncd_process_manager.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_reboot.h b/jni/badvpn/generated/blog_channel_ncd_reboot.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_reboot.h
rename to jni/badvpn/generated/blog_channel_ncd_reboot.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_ref.h b/jni/badvpn/generated/blog_channel_ncd_ref.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_ref.h
rename to jni/badvpn/generated/blog_channel_ncd_ref.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_regex_match.h b/jni/badvpn/generated/blog_channel_ncd_regex_match.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_regex_match.h
rename to jni/badvpn/generated/blog_channel_ncd_regex_match.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_request.h b/jni/badvpn/generated/blog_channel_ncd_request.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_request.h
rename to jni/badvpn/generated/blog_channel_ncd_request.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_run.h b/jni/badvpn/generated/blog_channel_ncd_run.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_run.h
rename to jni/badvpn/generated/blog_channel_ncd_run.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_runonce.h b/jni/badvpn/generated/blog_channel_ncd_runonce.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_runonce.h
rename to jni/badvpn/generated/blog_channel_ncd_runonce.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_sleep.h b/jni/badvpn/generated/blog_channel_ncd_sleep.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_sleep.h
rename to jni/badvpn/generated/blog_channel_ncd_sleep.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_socket.h b/jni/badvpn/generated/blog_channel_ncd_socket.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_socket.h
rename to jni/badvpn/generated/blog_channel_ncd_socket.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_spawn.h b/jni/badvpn/generated/blog_channel_ncd_spawn.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_spawn.h
rename to jni/badvpn/generated/blog_channel_ncd_spawn.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_strcmp.h b/jni/badvpn/generated/blog_channel_ncd_strcmp.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_strcmp.h
rename to jni/badvpn/generated/blog_channel_ncd_strcmp.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_substr.h b/jni/badvpn/generated/blog_channel_ncd_substr.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_substr.h
rename to jni/badvpn/generated/blog_channel_ncd_substr.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_sys_evdev.h b/jni/badvpn/generated/blog_channel_ncd_sys_evdev.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_sys_evdev.h
rename to jni/badvpn/generated/blog_channel_ncd_sys_evdev.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_sys_request_client.h b/jni/badvpn/generated/blog_channel_ncd_sys_request_client.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_sys_request_client.h
rename to jni/badvpn/generated/blog_channel_ncd_sys_request_client.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_sys_request_server.h b/jni/badvpn/generated/blog_channel_ncd_sys_request_server.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_sys_request_server.h
rename to jni/badvpn/generated/blog_channel_ncd_sys_request_server.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_sys_start_process.h b/jni/badvpn/generated/blog_channel_ncd_sys_start_process.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_sys_start_process.h
rename to jni/badvpn/generated/blog_channel_ncd_sys_start_process.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_sys_watch_directory.h b/jni/badvpn/generated/blog_channel_ncd_sys_watch_directory.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_sys_watch_directory.h
rename to jni/badvpn/generated/blog_channel_ncd_sys_watch_directory.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_sys_watch_input.h b/jni/badvpn/generated/blog_channel_ncd_sys_watch_input.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_sys_watch_input.h
rename to jni/badvpn/generated/blog_channel_ncd_sys_watch_input.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_sys_watch_usb.h b/jni/badvpn/generated/blog_channel_ncd_sys_watch_usb.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_sys_watch_usb.h
rename to jni/badvpn/generated/blog_channel_ncd_sys_watch_usb.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_timer.h b/jni/badvpn/generated/blog_channel_ncd_timer.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_timer.h
rename to jni/badvpn/generated/blog_channel_ncd_timer.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_to_string.h b/jni/badvpn/generated/blog_channel_ncd_to_string.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_to_string.h
rename to jni/badvpn/generated/blog_channel_ncd_to_string.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_try.h b/jni/badvpn/generated/blog_channel_ncd_try.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_try.h
rename to jni/badvpn/generated/blog_channel_ncd_try.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_value.h b/jni/badvpn/generated/blog_channel_ncd_value.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_value.h
rename to jni/badvpn/generated/blog_channel_ncd_value.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_valuemetic.h b/jni/badvpn/generated/blog_channel_ncd_valuemetic.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_valuemetic.h
rename to jni/badvpn/generated/blog_channel_ncd_valuemetic.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_ncd_var.h b/jni/badvpn/generated/blog_channel_ncd_var.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_ncd_var.h
rename to jni/badvpn/generated/blog_channel_ncd_var.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_nsskey.h b/jni/badvpn/generated/blog_channel_nsskey.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_nsskey.h
rename to jni/badvpn/generated/blog_channel_nsskey.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_server.h b/jni/badvpn/generated/blog_channel_server.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_server.h
rename to jni/badvpn/generated/blog_channel_server.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_tun2socks.h b/jni/badvpn/generated/blog_channel_tun2socks.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_tun2socks.h
rename to jni/badvpn/generated/blog_channel_tun2socks.h
diff --git a/src/main/jni/badvpn/generated/blog_channel_udpgw.h b/jni/badvpn/generated/blog_channel_udpgw.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channel_udpgw.h
rename to jni/badvpn/generated/blog_channel_udpgw.h
diff --git a/src/main/jni/badvpn/generated/blog_channels_defines.h b/jni/badvpn/generated/blog_channels_defines.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channels_defines.h
rename to jni/badvpn/generated/blog_channels_defines.h
diff --git a/src/main/jni/badvpn/generated/blog_channels_list.h b/jni/badvpn/generated/blog_channels_list.h
similarity index 100%
rename from src/main/jni/badvpn/generated/blog_channels_list.h
rename to jni/badvpn/generated/blog_channels_list.h
diff --git a/src/main/jni/badvpn/generated/bproto_addr.h b/jni/badvpn/generated/bproto_addr.h
similarity index 100%
rename from src/main/jni/badvpn/generated/bproto_addr.h
rename to jni/badvpn/generated/bproto_addr.h
diff --git a/src/main/jni/badvpn/generated/bproto_bproto_test.h b/jni/badvpn/generated/bproto_bproto_test.h
similarity index 100%
rename from src/main/jni/badvpn/generated/bproto_bproto_test.h
rename to jni/badvpn/generated/bproto_bproto_test.h
diff --git a/src/main/jni/badvpn/generated/bproto_msgproto.h b/jni/badvpn/generated/bproto_msgproto.h
similarity index 100%
rename from src/main/jni/badvpn/generated/bproto_msgproto.h
rename to jni/badvpn/generated/bproto_msgproto.h
diff --git a/src/main/jni/badvpn/generated/flex_BPredicate.c b/jni/badvpn/generated/flex_BPredicate.c
similarity index 100%
rename from src/main/jni/badvpn/generated/flex_BPredicate.c
rename to jni/badvpn/generated/flex_BPredicate.c
diff --git a/src/main/jni/badvpn/generated/flex_BPredicate.h b/jni/badvpn/generated/flex_BPredicate.h
similarity index 100%
rename from src/main/jni/badvpn/generated/flex_BPredicate.h
rename to jni/badvpn/generated/flex_BPredicate.h
diff --git a/src/main/jni/badvpn/lemon/lemon.c b/jni/badvpn/lemon/lemon.c
similarity index 100%
rename from src/main/jni/badvpn/lemon/lemon.c
rename to jni/badvpn/lemon/lemon.c
diff --git a/src/main/jni/badvpn/lemon/lempar.c b/jni/badvpn/lemon/lempar.c
similarity index 100%
rename from src/main/jni/badvpn/lemon/lempar.c
rename to jni/badvpn/lemon/lempar.c
diff --git a/src/main/jni/badvpn/lime/HOWTO b/jni/badvpn/lime/HOWTO
similarity index 100%
rename from src/main/jni/badvpn/lime/HOWTO
rename to jni/badvpn/lime/HOWTO
diff --git a/src/main/jni/badvpn/lime/flex_token_stream.php b/jni/badvpn/lime/flex_token_stream.php
similarity index 100%
rename from src/main/jni/badvpn/lime/flex_token_stream.php
rename to jni/badvpn/lime/flex_token_stream.php
diff --git a/src/main/jni/badvpn/lime/lemon.c b/jni/badvpn/lime/lemon.c
similarity index 100%
rename from src/main/jni/badvpn/lime/lemon.c
rename to jni/badvpn/lime/lemon.c
diff --git a/src/main/jni/badvpn/lime/lime.bootstrap b/jni/badvpn/lime/lime.bootstrap
similarity index 100%
rename from src/main/jni/badvpn/lime/lime.bootstrap
rename to jni/badvpn/lime/lime.bootstrap
diff --git a/src/main/jni/badvpn/lime/lime.php b/jni/badvpn/lime/lime.php
similarity index 100%
rename from src/main/jni/badvpn/lime/lime.php
rename to jni/badvpn/lime/lime.php
diff --git a/src/main/jni/badvpn/lime/lime_scan_tokens.l b/jni/badvpn/lime/lime_scan_tokens.l
similarity index 100%
rename from src/main/jni/badvpn/lime/lime_scan_tokens.l
rename to jni/badvpn/lime/lime_scan_tokens.l
diff --git a/src/main/jni/badvpn/lime/metagrammar b/jni/badvpn/lime/metagrammar
similarity index 100%
rename from src/main/jni/badvpn/lime/metagrammar
rename to jni/badvpn/lime/metagrammar
diff --git a/src/main/jni/badvpn/lime/parse_engine.php b/jni/badvpn/lime/parse_engine.php
similarity index 100%
rename from src/main/jni/badvpn/lime/parse_engine.php
rename to jni/badvpn/lime/parse_engine.php
diff --git a/src/main/jni/badvpn/lime/set.so.php b/jni/badvpn/lime/set.so.php
similarity index 100%
rename from src/main/jni/badvpn/lime/set.so.php
rename to jni/badvpn/lime/set.so.php
diff --git a/src/main/jni/badvpn/lwip/CHANGELOG b/jni/badvpn/lwip/CHANGELOG
similarity index 100%
rename from src/main/jni/badvpn/lwip/CHANGELOG
rename to jni/badvpn/lwip/CHANGELOG
diff --git a/src/main/jni/badvpn/lwip/CMakeLists.txt b/jni/badvpn/lwip/CMakeLists.txt
similarity index 100%
rename from src/main/jni/badvpn/lwip/CMakeLists.txt
rename to jni/badvpn/lwip/CMakeLists.txt
diff --git a/src/main/jni/badvpn/lwip/COPYING b/jni/badvpn/lwip/COPYING
similarity index 100%
rename from src/main/jni/badvpn/lwip/COPYING
rename to jni/badvpn/lwip/COPYING
diff --git a/src/main/jni/badvpn/lwip/FILES b/jni/badvpn/lwip/FILES
similarity index 100%
rename from src/main/jni/badvpn/lwip/FILES
rename to jni/badvpn/lwip/FILES
diff --git a/src/main/jni/badvpn/lwip/README b/jni/badvpn/lwip/README
similarity index 100%
rename from src/main/jni/badvpn/lwip/README
rename to jni/badvpn/lwip/README
diff --git a/src/main/jni/badvpn/lwip/UPGRADING b/jni/badvpn/lwip/UPGRADING
similarity index 100%
rename from src/main/jni/badvpn/lwip/UPGRADING
rename to jni/badvpn/lwip/UPGRADING
diff --git a/src/main/jni/badvpn/lwip/custom/arch/cc.h b/jni/badvpn/lwip/custom/arch/cc.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/custom/arch/cc.h
rename to jni/badvpn/lwip/custom/arch/cc.h
diff --git a/src/main/jni/badvpn/lwip/custom/arch/perf.h b/jni/badvpn/lwip/custom/arch/perf.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/custom/arch/perf.h
rename to jni/badvpn/lwip/custom/arch/perf.h
diff --git a/src/main/jni/badvpn/lwip/custom/lwipopts.h b/jni/badvpn/lwip/custom/lwipopts.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/custom/lwipopts.h
rename to jni/badvpn/lwip/custom/lwipopts.h
diff --git a/src/main/jni/badvpn/lwip/custom/sys.c b/jni/badvpn/lwip/custom/sys.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/custom/sys.c
rename to jni/badvpn/lwip/custom/sys.c
diff --git a/src/main/jni/badvpn/lwip/doc/FILES b/jni/badvpn/lwip/doc/FILES
similarity index 100%
rename from src/main/jni/badvpn/lwip/doc/FILES
rename to jni/badvpn/lwip/doc/FILES
diff --git a/src/main/jni/badvpn/lwip/doc/contrib.txt b/jni/badvpn/lwip/doc/contrib.txt
similarity index 100%
rename from src/main/jni/badvpn/lwip/doc/contrib.txt
rename to jni/badvpn/lwip/doc/contrib.txt
diff --git a/src/main/jni/badvpn/lwip/doc/rawapi.txt b/jni/badvpn/lwip/doc/rawapi.txt
similarity index 100%
rename from src/main/jni/badvpn/lwip/doc/rawapi.txt
rename to jni/badvpn/lwip/doc/rawapi.txt
diff --git a/src/main/jni/badvpn/lwip/doc/savannah.txt b/jni/badvpn/lwip/doc/savannah.txt
similarity index 100%
rename from src/main/jni/badvpn/lwip/doc/savannah.txt
rename to jni/badvpn/lwip/doc/savannah.txt
diff --git a/src/main/jni/badvpn/lwip/doc/snmp_agent.txt b/jni/badvpn/lwip/doc/snmp_agent.txt
similarity index 100%
rename from src/main/jni/badvpn/lwip/doc/snmp_agent.txt
rename to jni/badvpn/lwip/doc/snmp_agent.txt
diff --git a/src/main/jni/badvpn/lwip/doc/sys_arch.txt b/jni/badvpn/lwip/doc/sys_arch.txt
similarity index 100%
rename from src/main/jni/badvpn/lwip/doc/sys_arch.txt
rename to jni/badvpn/lwip/doc/sys_arch.txt
diff --git a/src/main/jni/badvpn/lwip/lwip-base-version b/jni/badvpn/lwip/lwip-base-version
similarity index 100%
rename from src/main/jni/badvpn/lwip/lwip-base-version
rename to jni/badvpn/lwip/lwip-base-version
diff --git a/src/main/jni/badvpn/lwip/src/FILES b/jni/badvpn/lwip/src/FILES
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/FILES
rename to jni/badvpn/lwip/src/FILES
diff --git a/src/main/jni/badvpn/lwip/src/api/api_lib.c b/jni/badvpn/lwip/src/api/api_lib.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/api/api_lib.c
rename to jni/badvpn/lwip/src/api/api_lib.c
diff --git a/src/main/jni/badvpn/lwip/src/api/api_msg.c b/jni/badvpn/lwip/src/api/api_msg.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/api/api_msg.c
rename to jni/badvpn/lwip/src/api/api_msg.c
diff --git a/src/main/jni/badvpn/lwip/src/api/err.c b/jni/badvpn/lwip/src/api/err.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/api/err.c
rename to jni/badvpn/lwip/src/api/err.c
diff --git a/src/main/jni/badvpn/lwip/src/api/netbuf.c b/jni/badvpn/lwip/src/api/netbuf.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/api/netbuf.c
rename to jni/badvpn/lwip/src/api/netbuf.c
diff --git a/src/main/jni/badvpn/lwip/src/api/netdb.c b/jni/badvpn/lwip/src/api/netdb.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/api/netdb.c
rename to jni/badvpn/lwip/src/api/netdb.c
diff --git a/src/main/jni/badvpn/lwip/src/api/netifapi.c b/jni/badvpn/lwip/src/api/netifapi.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/api/netifapi.c
rename to jni/badvpn/lwip/src/api/netifapi.c
diff --git a/src/main/jni/badvpn/lwip/src/api/sockets.c b/jni/badvpn/lwip/src/api/sockets.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/api/sockets.c
rename to jni/badvpn/lwip/src/api/sockets.c
diff --git a/src/main/jni/badvpn/lwip/src/api/tcpip.c b/jni/badvpn/lwip/src/api/tcpip.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/api/tcpip.c
rename to jni/badvpn/lwip/src/api/tcpip.c
diff --git a/src/main/jni/badvpn/lwip/src/core/def.c b/jni/badvpn/lwip/src/core/def.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/core/def.c
rename to jni/badvpn/lwip/src/core/def.c
diff --git a/src/main/jni/badvpn/lwip/src/core/dhcp.c b/jni/badvpn/lwip/src/core/dhcp.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/core/dhcp.c
rename to jni/badvpn/lwip/src/core/dhcp.c
diff --git a/src/main/jni/badvpn/lwip/src/core/dns.c b/jni/badvpn/lwip/src/core/dns.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/core/dns.c
rename to jni/badvpn/lwip/src/core/dns.c
diff --git a/src/main/jni/badvpn/lwip/src/core/inet_chksum.c b/jni/badvpn/lwip/src/core/inet_chksum.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/core/inet_chksum.c
rename to jni/badvpn/lwip/src/core/inet_chksum.c
diff --git a/src/main/jni/badvpn/lwip/src/core/init.c b/jni/badvpn/lwip/src/core/init.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/core/init.c
rename to jni/badvpn/lwip/src/core/init.c
diff --git a/src/main/jni/badvpn/lwip/src/core/ipv4/autoip.c b/jni/badvpn/lwip/src/core/ipv4/autoip.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/core/ipv4/autoip.c
rename to jni/badvpn/lwip/src/core/ipv4/autoip.c
diff --git a/src/main/jni/badvpn/lwip/src/core/ipv4/icmp.c b/jni/badvpn/lwip/src/core/ipv4/icmp.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/core/ipv4/icmp.c
rename to jni/badvpn/lwip/src/core/ipv4/icmp.c
diff --git a/src/main/jni/badvpn/lwip/src/core/ipv4/igmp.c b/jni/badvpn/lwip/src/core/ipv4/igmp.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/core/ipv4/igmp.c
rename to jni/badvpn/lwip/src/core/ipv4/igmp.c
diff --git a/src/main/jni/badvpn/lwip/src/core/ipv4/ip4.c b/jni/badvpn/lwip/src/core/ipv4/ip4.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/core/ipv4/ip4.c
rename to jni/badvpn/lwip/src/core/ipv4/ip4.c
diff --git a/src/main/jni/badvpn/lwip/src/core/ipv4/ip4_addr.c b/jni/badvpn/lwip/src/core/ipv4/ip4_addr.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/core/ipv4/ip4_addr.c
rename to jni/badvpn/lwip/src/core/ipv4/ip4_addr.c
diff --git a/src/main/jni/badvpn/lwip/src/core/ipv4/ip_frag.c b/jni/badvpn/lwip/src/core/ipv4/ip_frag.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/core/ipv4/ip_frag.c
rename to jni/badvpn/lwip/src/core/ipv4/ip_frag.c
diff --git a/src/main/jni/badvpn/lwip/src/core/ipv6/README b/jni/badvpn/lwip/src/core/ipv6/README
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/core/ipv6/README
rename to jni/badvpn/lwip/src/core/ipv6/README
diff --git a/src/main/jni/badvpn/lwip/src/core/ipv6/dhcp6.c b/jni/badvpn/lwip/src/core/ipv6/dhcp6.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/core/ipv6/dhcp6.c
rename to jni/badvpn/lwip/src/core/ipv6/dhcp6.c
diff --git a/src/main/jni/badvpn/lwip/src/core/ipv6/ethip6.c b/jni/badvpn/lwip/src/core/ipv6/ethip6.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/core/ipv6/ethip6.c
rename to jni/badvpn/lwip/src/core/ipv6/ethip6.c
diff --git a/src/main/jni/badvpn/lwip/src/core/ipv6/icmp6.c b/jni/badvpn/lwip/src/core/ipv6/icmp6.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/core/ipv6/icmp6.c
rename to jni/badvpn/lwip/src/core/ipv6/icmp6.c
diff --git a/src/main/jni/badvpn/lwip/src/core/ipv6/inet6.c b/jni/badvpn/lwip/src/core/ipv6/inet6.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/core/ipv6/inet6.c
rename to jni/badvpn/lwip/src/core/ipv6/inet6.c
diff --git a/src/main/jni/badvpn/lwip/src/core/ipv6/ip6.c b/jni/badvpn/lwip/src/core/ipv6/ip6.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/core/ipv6/ip6.c
rename to jni/badvpn/lwip/src/core/ipv6/ip6.c
diff --git a/src/main/jni/badvpn/lwip/src/core/ipv6/ip6_addr.c b/jni/badvpn/lwip/src/core/ipv6/ip6_addr.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/core/ipv6/ip6_addr.c
rename to jni/badvpn/lwip/src/core/ipv6/ip6_addr.c
diff --git a/src/main/jni/badvpn/lwip/src/core/ipv6/ip6_frag.c b/jni/badvpn/lwip/src/core/ipv6/ip6_frag.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/core/ipv6/ip6_frag.c
rename to jni/badvpn/lwip/src/core/ipv6/ip6_frag.c
diff --git a/src/main/jni/badvpn/lwip/src/core/ipv6/mld6.c b/jni/badvpn/lwip/src/core/ipv6/mld6.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/core/ipv6/mld6.c
rename to jni/badvpn/lwip/src/core/ipv6/mld6.c
diff --git a/src/main/jni/badvpn/lwip/src/core/ipv6/nd6.c b/jni/badvpn/lwip/src/core/ipv6/nd6.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/core/ipv6/nd6.c
rename to jni/badvpn/lwip/src/core/ipv6/nd6.c
diff --git a/src/main/jni/badvpn/lwip/src/core/mem.c b/jni/badvpn/lwip/src/core/mem.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/core/mem.c
rename to jni/badvpn/lwip/src/core/mem.c
diff --git a/src/main/jni/badvpn/lwip/src/core/memp.c b/jni/badvpn/lwip/src/core/memp.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/core/memp.c
rename to jni/badvpn/lwip/src/core/memp.c
diff --git a/src/main/jni/badvpn/lwip/src/core/netif.c b/jni/badvpn/lwip/src/core/netif.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/core/netif.c
rename to jni/badvpn/lwip/src/core/netif.c
diff --git a/src/main/jni/badvpn/lwip/src/core/pbuf.c b/jni/badvpn/lwip/src/core/pbuf.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/core/pbuf.c
rename to jni/badvpn/lwip/src/core/pbuf.c
diff --git a/src/main/jni/badvpn/lwip/src/core/raw.c b/jni/badvpn/lwip/src/core/raw.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/core/raw.c
rename to jni/badvpn/lwip/src/core/raw.c
diff --git a/src/main/jni/badvpn/lwip/src/core/snmp/asn1_dec.c b/jni/badvpn/lwip/src/core/snmp/asn1_dec.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/core/snmp/asn1_dec.c
rename to jni/badvpn/lwip/src/core/snmp/asn1_dec.c
diff --git a/src/main/jni/badvpn/lwip/src/core/snmp/asn1_enc.c b/jni/badvpn/lwip/src/core/snmp/asn1_enc.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/core/snmp/asn1_enc.c
rename to jni/badvpn/lwip/src/core/snmp/asn1_enc.c
diff --git a/src/main/jni/badvpn/lwip/src/core/snmp/mib2.c b/jni/badvpn/lwip/src/core/snmp/mib2.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/core/snmp/mib2.c
rename to jni/badvpn/lwip/src/core/snmp/mib2.c
diff --git a/src/main/jni/badvpn/lwip/src/core/snmp/mib_structs.c b/jni/badvpn/lwip/src/core/snmp/mib_structs.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/core/snmp/mib_structs.c
rename to jni/badvpn/lwip/src/core/snmp/mib_structs.c
diff --git a/src/main/jni/badvpn/lwip/src/core/snmp/msg_in.c b/jni/badvpn/lwip/src/core/snmp/msg_in.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/core/snmp/msg_in.c
rename to jni/badvpn/lwip/src/core/snmp/msg_in.c
diff --git a/src/main/jni/badvpn/lwip/src/core/snmp/msg_out.c b/jni/badvpn/lwip/src/core/snmp/msg_out.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/core/snmp/msg_out.c
rename to jni/badvpn/lwip/src/core/snmp/msg_out.c
diff --git a/src/main/jni/badvpn/lwip/src/core/stats.c b/jni/badvpn/lwip/src/core/stats.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/core/stats.c
rename to jni/badvpn/lwip/src/core/stats.c
diff --git a/src/main/jni/badvpn/lwip/src/core/sys.c b/jni/badvpn/lwip/src/core/sys.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/core/sys.c
rename to jni/badvpn/lwip/src/core/sys.c
diff --git a/src/main/jni/badvpn/lwip/src/core/tcp.c b/jni/badvpn/lwip/src/core/tcp.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/core/tcp.c
rename to jni/badvpn/lwip/src/core/tcp.c
diff --git a/src/main/jni/badvpn/lwip/src/core/tcp_in.c b/jni/badvpn/lwip/src/core/tcp_in.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/core/tcp_in.c
rename to jni/badvpn/lwip/src/core/tcp_in.c
diff --git a/src/main/jni/badvpn/lwip/src/core/tcp_out.c b/jni/badvpn/lwip/src/core/tcp_out.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/core/tcp_out.c
rename to jni/badvpn/lwip/src/core/tcp_out.c
diff --git a/src/main/jni/badvpn/lwip/src/core/timers.c b/jni/badvpn/lwip/src/core/timers.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/core/timers.c
rename to jni/badvpn/lwip/src/core/timers.c
diff --git a/src/main/jni/badvpn/lwip/src/core/udp.c b/jni/badvpn/lwip/src/core/udp.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/core/udp.c
rename to jni/badvpn/lwip/src/core/udp.c
diff --git a/src/main/jni/badvpn/lwip/src/include/ipv4/lwip/autoip.h b/jni/badvpn/lwip/src/include/ipv4/lwip/autoip.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/ipv4/lwip/autoip.h
rename to jni/badvpn/lwip/src/include/ipv4/lwip/autoip.h
diff --git a/src/main/jni/badvpn/lwip/src/include/ipv4/lwip/icmp.h b/jni/badvpn/lwip/src/include/ipv4/lwip/icmp.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/ipv4/lwip/icmp.h
rename to jni/badvpn/lwip/src/include/ipv4/lwip/icmp.h
diff --git a/src/main/jni/badvpn/lwip/src/include/ipv4/lwip/igmp.h b/jni/badvpn/lwip/src/include/ipv4/lwip/igmp.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/ipv4/lwip/igmp.h
rename to jni/badvpn/lwip/src/include/ipv4/lwip/igmp.h
diff --git a/src/main/jni/badvpn/lwip/src/include/ipv4/lwip/inet.h b/jni/badvpn/lwip/src/include/ipv4/lwip/inet.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/ipv4/lwip/inet.h
rename to jni/badvpn/lwip/src/include/ipv4/lwip/inet.h
diff --git a/src/main/jni/badvpn/lwip/src/include/ipv4/lwip/ip4.h b/jni/badvpn/lwip/src/include/ipv4/lwip/ip4.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/ipv4/lwip/ip4.h
rename to jni/badvpn/lwip/src/include/ipv4/lwip/ip4.h
diff --git a/src/main/jni/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h b/jni/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h
rename to jni/badvpn/lwip/src/include/ipv4/lwip/ip4_addr.h
diff --git a/src/main/jni/badvpn/lwip/src/include/ipv4/lwip/ip_frag.h b/jni/badvpn/lwip/src/include/ipv4/lwip/ip_frag.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/ipv4/lwip/ip_frag.h
rename to jni/badvpn/lwip/src/include/ipv4/lwip/ip_frag.h
diff --git a/src/main/jni/badvpn/lwip/src/include/ipv6/lwip/dhcp6.h b/jni/badvpn/lwip/src/include/ipv6/lwip/dhcp6.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/ipv6/lwip/dhcp6.h
rename to jni/badvpn/lwip/src/include/ipv6/lwip/dhcp6.h
diff --git a/src/main/jni/badvpn/lwip/src/include/ipv6/lwip/ethip6.h b/jni/badvpn/lwip/src/include/ipv6/lwip/ethip6.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/ipv6/lwip/ethip6.h
rename to jni/badvpn/lwip/src/include/ipv6/lwip/ethip6.h
diff --git a/src/main/jni/badvpn/lwip/src/include/ipv6/lwip/icmp6.h b/jni/badvpn/lwip/src/include/ipv6/lwip/icmp6.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/ipv6/lwip/icmp6.h
rename to jni/badvpn/lwip/src/include/ipv6/lwip/icmp6.h
diff --git a/src/main/jni/badvpn/lwip/src/include/ipv6/lwip/inet6.h b/jni/badvpn/lwip/src/include/ipv6/lwip/inet6.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/ipv6/lwip/inet6.h
rename to jni/badvpn/lwip/src/include/ipv6/lwip/inet6.h
diff --git a/src/main/jni/badvpn/lwip/src/include/ipv6/lwip/ip6.h b/jni/badvpn/lwip/src/include/ipv6/lwip/ip6.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/ipv6/lwip/ip6.h
rename to jni/badvpn/lwip/src/include/ipv6/lwip/ip6.h
diff --git a/src/main/jni/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h b/jni/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h
rename to jni/badvpn/lwip/src/include/ipv6/lwip/ip6_addr.h
diff --git a/src/main/jni/badvpn/lwip/src/include/ipv6/lwip/ip6_frag.h b/jni/badvpn/lwip/src/include/ipv6/lwip/ip6_frag.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/ipv6/lwip/ip6_frag.h
rename to jni/badvpn/lwip/src/include/ipv6/lwip/ip6_frag.h
diff --git a/src/main/jni/badvpn/lwip/src/include/ipv6/lwip/mld6.h b/jni/badvpn/lwip/src/include/ipv6/lwip/mld6.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/ipv6/lwip/mld6.h
rename to jni/badvpn/lwip/src/include/ipv6/lwip/mld6.h
diff --git a/src/main/jni/badvpn/lwip/src/include/ipv6/lwip/nd6.h b/jni/badvpn/lwip/src/include/ipv6/lwip/nd6.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/ipv6/lwip/nd6.h
rename to jni/badvpn/lwip/src/include/ipv6/lwip/nd6.h
diff --git a/src/main/jni/badvpn/lwip/src/include/lwip/api.h b/jni/badvpn/lwip/src/include/lwip/api.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/lwip/api.h
rename to jni/badvpn/lwip/src/include/lwip/api.h
diff --git a/src/main/jni/badvpn/lwip/src/include/lwip/api_msg.h b/jni/badvpn/lwip/src/include/lwip/api_msg.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/lwip/api_msg.h
rename to jni/badvpn/lwip/src/include/lwip/api_msg.h
diff --git a/src/main/jni/badvpn/lwip/src/include/lwip/arch.h b/jni/badvpn/lwip/src/include/lwip/arch.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/lwip/arch.h
rename to jni/badvpn/lwip/src/include/lwip/arch.h
diff --git a/src/main/jni/badvpn/lwip/src/include/lwip/debug.h b/jni/badvpn/lwip/src/include/lwip/debug.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/lwip/debug.h
rename to jni/badvpn/lwip/src/include/lwip/debug.h
diff --git a/src/main/jni/badvpn/lwip/src/include/lwip/def.h b/jni/badvpn/lwip/src/include/lwip/def.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/lwip/def.h
rename to jni/badvpn/lwip/src/include/lwip/def.h
diff --git a/src/main/jni/badvpn/lwip/src/include/lwip/dhcp.h b/jni/badvpn/lwip/src/include/lwip/dhcp.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/lwip/dhcp.h
rename to jni/badvpn/lwip/src/include/lwip/dhcp.h
diff --git a/src/main/jni/badvpn/lwip/src/include/lwip/dns.h b/jni/badvpn/lwip/src/include/lwip/dns.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/lwip/dns.h
rename to jni/badvpn/lwip/src/include/lwip/dns.h
diff --git a/src/main/jni/badvpn/lwip/src/include/lwip/err.h b/jni/badvpn/lwip/src/include/lwip/err.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/lwip/err.h
rename to jni/badvpn/lwip/src/include/lwip/err.h
diff --git a/src/main/jni/badvpn/lwip/src/include/lwip/inet_chksum.h b/jni/badvpn/lwip/src/include/lwip/inet_chksum.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/lwip/inet_chksum.h
rename to jni/badvpn/lwip/src/include/lwip/inet_chksum.h
diff --git a/src/main/jni/badvpn/lwip/src/include/lwip/init.h b/jni/badvpn/lwip/src/include/lwip/init.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/lwip/init.h
rename to jni/badvpn/lwip/src/include/lwip/init.h
diff --git a/src/main/jni/badvpn/lwip/src/include/lwip/ip.h b/jni/badvpn/lwip/src/include/lwip/ip.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/lwip/ip.h
rename to jni/badvpn/lwip/src/include/lwip/ip.h
diff --git a/src/main/jni/badvpn/lwip/src/include/lwip/ip_addr.h b/jni/badvpn/lwip/src/include/lwip/ip_addr.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/lwip/ip_addr.h
rename to jni/badvpn/lwip/src/include/lwip/ip_addr.h
diff --git a/src/main/jni/badvpn/lwip/src/include/lwip/mem.h b/jni/badvpn/lwip/src/include/lwip/mem.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/lwip/mem.h
rename to jni/badvpn/lwip/src/include/lwip/mem.h
diff --git a/src/main/jni/badvpn/lwip/src/include/lwip/memp.h b/jni/badvpn/lwip/src/include/lwip/memp.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/lwip/memp.h
rename to jni/badvpn/lwip/src/include/lwip/memp.h
diff --git a/src/main/jni/badvpn/lwip/src/include/lwip/memp_std.h b/jni/badvpn/lwip/src/include/lwip/memp_std.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/lwip/memp_std.h
rename to jni/badvpn/lwip/src/include/lwip/memp_std.h
diff --git a/src/main/jni/badvpn/lwip/src/include/lwip/netbuf.h b/jni/badvpn/lwip/src/include/lwip/netbuf.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/lwip/netbuf.h
rename to jni/badvpn/lwip/src/include/lwip/netbuf.h
diff --git a/src/main/jni/badvpn/lwip/src/include/lwip/netdb.h b/jni/badvpn/lwip/src/include/lwip/netdb.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/lwip/netdb.h
rename to jni/badvpn/lwip/src/include/lwip/netdb.h
diff --git a/src/main/jni/badvpn/lwip/src/include/lwip/netif.h b/jni/badvpn/lwip/src/include/lwip/netif.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/lwip/netif.h
rename to jni/badvpn/lwip/src/include/lwip/netif.h
diff --git a/src/main/jni/badvpn/lwip/src/include/lwip/netifapi.h b/jni/badvpn/lwip/src/include/lwip/netifapi.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/lwip/netifapi.h
rename to jni/badvpn/lwip/src/include/lwip/netifapi.h
diff --git a/src/main/jni/badvpn/lwip/src/include/lwip/opt.h b/jni/badvpn/lwip/src/include/lwip/opt.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/lwip/opt.h
rename to jni/badvpn/lwip/src/include/lwip/opt.h
diff --git a/src/main/jni/badvpn/lwip/src/include/lwip/pbuf.h b/jni/badvpn/lwip/src/include/lwip/pbuf.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/lwip/pbuf.h
rename to jni/badvpn/lwip/src/include/lwip/pbuf.h
diff --git a/src/main/jni/badvpn/lwip/src/include/lwip/raw.h b/jni/badvpn/lwip/src/include/lwip/raw.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/lwip/raw.h
rename to jni/badvpn/lwip/src/include/lwip/raw.h
diff --git a/src/main/jni/badvpn/lwip/src/include/lwip/sio.h b/jni/badvpn/lwip/src/include/lwip/sio.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/lwip/sio.h
rename to jni/badvpn/lwip/src/include/lwip/sio.h
diff --git a/src/main/jni/badvpn/lwip/src/include/lwip/snmp.h b/jni/badvpn/lwip/src/include/lwip/snmp.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/lwip/snmp.h
rename to jni/badvpn/lwip/src/include/lwip/snmp.h
diff --git a/src/main/jni/badvpn/lwip/src/include/lwip/snmp_asn1.h b/jni/badvpn/lwip/src/include/lwip/snmp_asn1.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/lwip/snmp_asn1.h
rename to jni/badvpn/lwip/src/include/lwip/snmp_asn1.h
diff --git a/src/main/jni/badvpn/lwip/src/include/lwip/snmp_msg.h b/jni/badvpn/lwip/src/include/lwip/snmp_msg.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/lwip/snmp_msg.h
rename to jni/badvpn/lwip/src/include/lwip/snmp_msg.h
diff --git a/src/main/jni/badvpn/lwip/src/include/lwip/snmp_structs.h b/jni/badvpn/lwip/src/include/lwip/snmp_structs.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/lwip/snmp_structs.h
rename to jni/badvpn/lwip/src/include/lwip/snmp_structs.h
diff --git a/src/main/jni/badvpn/lwip/src/include/lwip/sockets.h b/jni/badvpn/lwip/src/include/lwip/sockets.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/lwip/sockets.h
rename to jni/badvpn/lwip/src/include/lwip/sockets.h
diff --git a/src/main/jni/badvpn/lwip/src/include/lwip/stats.h b/jni/badvpn/lwip/src/include/lwip/stats.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/lwip/stats.h
rename to jni/badvpn/lwip/src/include/lwip/stats.h
diff --git a/src/main/jni/badvpn/lwip/src/include/lwip/sys.h b/jni/badvpn/lwip/src/include/lwip/sys.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/lwip/sys.h
rename to jni/badvpn/lwip/src/include/lwip/sys.h
diff --git a/src/main/jni/badvpn/lwip/src/include/lwip/tcp.h b/jni/badvpn/lwip/src/include/lwip/tcp.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/lwip/tcp.h
rename to jni/badvpn/lwip/src/include/lwip/tcp.h
diff --git a/src/main/jni/badvpn/lwip/src/include/lwip/tcp_impl.h b/jni/badvpn/lwip/src/include/lwip/tcp_impl.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/lwip/tcp_impl.h
rename to jni/badvpn/lwip/src/include/lwip/tcp_impl.h
diff --git a/src/main/jni/badvpn/lwip/src/include/lwip/tcpip.h b/jni/badvpn/lwip/src/include/lwip/tcpip.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/lwip/tcpip.h
rename to jni/badvpn/lwip/src/include/lwip/tcpip.h
diff --git a/src/main/jni/badvpn/lwip/src/include/lwip/timers.h b/jni/badvpn/lwip/src/include/lwip/timers.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/lwip/timers.h
rename to jni/badvpn/lwip/src/include/lwip/timers.h
diff --git a/src/main/jni/badvpn/lwip/src/include/lwip/udp.h b/jni/badvpn/lwip/src/include/lwip/udp.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/lwip/udp.h
rename to jni/badvpn/lwip/src/include/lwip/udp.h
diff --git a/src/main/jni/badvpn/lwip/src/include/netif/etharp.h b/jni/badvpn/lwip/src/include/netif/etharp.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/netif/etharp.h
rename to jni/badvpn/lwip/src/include/netif/etharp.h
diff --git a/src/main/jni/badvpn/lwip/src/include/netif/ppp_oe.h b/jni/badvpn/lwip/src/include/netif/ppp_oe.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/netif/ppp_oe.h
rename to jni/badvpn/lwip/src/include/netif/ppp_oe.h
diff --git a/src/main/jni/badvpn/lwip/src/include/netif/slipif.h b/jni/badvpn/lwip/src/include/netif/slipif.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/netif/slipif.h
rename to jni/badvpn/lwip/src/include/netif/slipif.h
diff --git a/src/main/jni/badvpn/lwip/src/include/posix/netdb.h b/jni/badvpn/lwip/src/include/posix/netdb.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/posix/netdb.h
rename to jni/badvpn/lwip/src/include/posix/netdb.h
diff --git a/src/main/jni/badvpn/lwip/src/include/posix/sys/socket.h b/jni/badvpn/lwip/src/include/posix/sys/socket.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/include/posix/sys/socket.h
rename to jni/badvpn/lwip/src/include/posix/sys/socket.h
diff --git a/src/main/jni/badvpn/lwip/src/netif/FILES b/jni/badvpn/lwip/src/netif/FILES
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/netif/FILES
rename to jni/badvpn/lwip/src/netif/FILES
diff --git a/src/main/jni/badvpn/lwip/src/netif/etharp.c b/jni/badvpn/lwip/src/netif/etharp.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/netif/etharp.c
rename to jni/badvpn/lwip/src/netif/etharp.c
diff --git a/src/main/jni/badvpn/lwip/src/netif/ethernetif.c b/jni/badvpn/lwip/src/netif/ethernetif.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/netif/ethernetif.c
rename to jni/badvpn/lwip/src/netif/ethernetif.c
diff --git a/src/main/jni/badvpn/lwip/src/netif/ppp/auth.c b/jni/badvpn/lwip/src/netif/ppp/auth.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/netif/ppp/auth.c
rename to jni/badvpn/lwip/src/netif/ppp/auth.c
diff --git a/src/main/jni/badvpn/lwip/src/netif/ppp/auth.h b/jni/badvpn/lwip/src/netif/ppp/auth.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/netif/ppp/auth.h
rename to jni/badvpn/lwip/src/netif/ppp/auth.h
diff --git a/src/main/jni/badvpn/lwip/src/netif/ppp/chap.c b/jni/badvpn/lwip/src/netif/ppp/chap.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/netif/ppp/chap.c
rename to jni/badvpn/lwip/src/netif/ppp/chap.c
diff --git a/src/main/jni/badvpn/lwip/src/netif/ppp/chap.h b/jni/badvpn/lwip/src/netif/ppp/chap.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/netif/ppp/chap.h
rename to jni/badvpn/lwip/src/netif/ppp/chap.h
diff --git a/src/main/jni/badvpn/lwip/src/netif/ppp/chpms.c b/jni/badvpn/lwip/src/netif/ppp/chpms.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/netif/ppp/chpms.c
rename to jni/badvpn/lwip/src/netif/ppp/chpms.c
diff --git a/src/main/jni/badvpn/lwip/src/netif/ppp/chpms.h b/jni/badvpn/lwip/src/netif/ppp/chpms.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/netif/ppp/chpms.h
rename to jni/badvpn/lwip/src/netif/ppp/chpms.h
diff --git a/src/main/jni/badvpn/lwip/src/netif/ppp/fsm.c b/jni/badvpn/lwip/src/netif/ppp/fsm.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/netif/ppp/fsm.c
rename to jni/badvpn/lwip/src/netif/ppp/fsm.c
diff --git a/src/main/jni/badvpn/lwip/src/netif/ppp/fsm.h b/jni/badvpn/lwip/src/netif/ppp/fsm.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/netif/ppp/fsm.h
rename to jni/badvpn/lwip/src/netif/ppp/fsm.h
diff --git a/src/main/jni/badvpn/lwip/src/netif/ppp/ipcp.c b/jni/badvpn/lwip/src/netif/ppp/ipcp.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/netif/ppp/ipcp.c
rename to jni/badvpn/lwip/src/netif/ppp/ipcp.c
diff --git a/src/main/jni/badvpn/lwip/src/netif/ppp/ipcp.h b/jni/badvpn/lwip/src/netif/ppp/ipcp.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/netif/ppp/ipcp.h
rename to jni/badvpn/lwip/src/netif/ppp/ipcp.h
diff --git a/src/main/jni/badvpn/lwip/src/netif/ppp/lcp.c b/jni/badvpn/lwip/src/netif/ppp/lcp.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/netif/ppp/lcp.c
rename to jni/badvpn/lwip/src/netif/ppp/lcp.c
diff --git a/src/main/jni/badvpn/lwip/src/netif/ppp/lcp.h b/jni/badvpn/lwip/src/netif/ppp/lcp.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/netif/ppp/lcp.h
rename to jni/badvpn/lwip/src/netif/ppp/lcp.h
diff --git a/src/main/jni/badvpn/lwip/src/netif/ppp/magic.c b/jni/badvpn/lwip/src/netif/ppp/magic.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/netif/ppp/magic.c
rename to jni/badvpn/lwip/src/netif/ppp/magic.c
diff --git a/src/main/jni/badvpn/lwip/src/netif/ppp/magic.h b/jni/badvpn/lwip/src/netif/ppp/magic.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/netif/ppp/magic.h
rename to jni/badvpn/lwip/src/netif/ppp/magic.h
diff --git a/src/main/jni/badvpn/lwip/src/netif/ppp/md5.c b/jni/badvpn/lwip/src/netif/ppp/md5.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/netif/ppp/md5.c
rename to jni/badvpn/lwip/src/netif/ppp/md5.c
diff --git a/src/main/jni/badvpn/lwip/src/netif/ppp/md5.h b/jni/badvpn/lwip/src/netif/ppp/md5.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/netif/ppp/md5.h
rename to jni/badvpn/lwip/src/netif/ppp/md5.h
diff --git a/src/main/jni/badvpn/lwip/src/netif/ppp/pap.c b/jni/badvpn/lwip/src/netif/ppp/pap.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/netif/ppp/pap.c
rename to jni/badvpn/lwip/src/netif/ppp/pap.c
diff --git a/src/main/jni/badvpn/lwip/src/netif/ppp/pap.h b/jni/badvpn/lwip/src/netif/ppp/pap.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/netif/ppp/pap.h
rename to jni/badvpn/lwip/src/netif/ppp/pap.h
diff --git a/src/main/jni/badvpn/lwip/src/netif/ppp/ppp.c b/jni/badvpn/lwip/src/netif/ppp/ppp.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/netif/ppp/ppp.c
rename to jni/badvpn/lwip/src/netif/ppp/ppp.c
diff --git a/src/main/jni/badvpn/lwip/src/netif/ppp/ppp.h b/jni/badvpn/lwip/src/netif/ppp/ppp.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/netif/ppp/ppp.h
rename to jni/badvpn/lwip/src/netif/ppp/ppp.h
diff --git a/src/main/jni/badvpn/lwip/src/netif/ppp/ppp_impl.h b/jni/badvpn/lwip/src/netif/ppp/ppp_impl.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/netif/ppp/ppp_impl.h
rename to jni/badvpn/lwip/src/netif/ppp/ppp_impl.h
diff --git a/src/main/jni/badvpn/lwip/src/netif/ppp/ppp_oe.c b/jni/badvpn/lwip/src/netif/ppp/ppp_oe.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/netif/ppp/ppp_oe.c
rename to jni/badvpn/lwip/src/netif/ppp/ppp_oe.c
diff --git a/src/main/jni/badvpn/lwip/src/netif/ppp/pppdebug.h b/jni/badvpn/lwip/src/netif/ppp/pppdebug.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/netif/ppp/pppdebug.h
rename to jni/badvpn/lwip/src/netif/ppp/pppdebug.h
diff --git a/src/main/jni/badvpn/lwip/src/netif/ppp/randm.c b/jni/badvpn/lwip/src/netif/ppp/randm.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/netif/ppp/randm.c
rename to jni/badvpn/lwip/src/netif/ppp/randm.c
diff --git a/src/main/jni/badvpn/lwip/src/netif/ppp/randm.h b/jni/badvpn/lwip/src/netif/ppp/randm.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/netif/ppp/randm.h
rename to jni/badvpn/lwip/src/netif/ppp/randm.h
diff --git a/src/main/jni/badvpn/lwip/src/netif/ppp/readme.txt b/jni/badvpn/lwip/src/netif/ppp/readme.txt
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/netif/ppp/readme.txt
rename to jni/badvpn/lwip/src/netif/ppp/readme.txt
diff --git a/src/main/jni/badvpn/lwip/src/netif/ppp/vj.c b/jni/badvpn/lwip/src/netif/ppp/vj.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/netif/ppp/vj.c
rename to jni/badvpn/lwip/src/netif/ppp/vj.c
diff --git a/src/main/jni/badvpn/lwip/src/netif/ppp/vj.h b/jni/badvpn/lwip/src/netif/ppp/vj.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/netif/ppp/vj.h
rename to jni/badvpn/lwip/src/netif/ppp/vj.h
diff --git a/src/main/jni/badvpn/lwip/src/netif/slipif.c b/jni/badvpn/lwip/src/netif/slipif.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/src/netif/slipif.c
rename to jni/badvpn/lwip/src/netif/slipif.c
diff --git a/src/main/jni/badvpn/lwip/test/unit/core/test_mem.c b/jni/badvpn/lwip/test/unit/core/test_mem.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/test/unit/core/test_mem.c
rename to jni/badvpn/lwip/test/unit/core/test_mem.c
diff --git a/src/main/jni/badvpn/lwip/test/unit/core/test_mem.h b/jni/badvpn/lwip/test/unit/core/test_mem.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/test/unit/core/test_mem.h
rename to jni/badvpn/lwip/test/unit/core/test_mem.h
diff --git a/src/main/jni/badvpn/lwip/test/unit/core/test_pbuf.c b/jni/badvpn/lwip/test/unit/core/test_pbuf.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/test/unit/core/test_pbuf.c
rename to jni/badvpn/lwip/test/unit/core/test_pbuf.c
diff --git a/src/main/jni/badvpn/lwip/test/unit/core/test_pbuf.h b/jni/badvpn/lwip/test/unit/core/test_pbuf.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/test/unit/core/test_pbuf.h
rename to jni/badvpn/lwip/test/unit/core/test_pbuf.h
diff --git a/src/main/jni/badvpn/lwip/test/unit/dhcp/test_dhcp.c b/jni/badvpn/lwip/test/unit/dhcp/test_dhcp.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/test/unit/dhcp/test_dhcp.c
rename to jni/badvpn/lwip/test/unit/dhcp/test_dhcp.c
diff --git a/src/main/jni/badvpn/lwip/test/unit/dhcp/test_dhcp.h b/jni/badvpn/lwip/test/unit/dhcp/test_dhcp.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/test/unit/dhcp/test_dhcp.h
rename to jni/badvpn/lwip/test/unit/dhcp/test_dhcp.h
diff --git a/src/main/jni/badvpn/lwip/test/unit/etharp/test_etharp.c b/jni/badvpn/lwip/test/unit/etharp/test_etharp.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/test/unit/etharp/test_etharp.c
rename to jni/badvpn/lwip/test/unit/etharp/test_etharp.c
diff --git a/src/main/jni/badvpn/lwip/test/unit/etharp/test_etharp.h b/jni/badvpn/lwip/test/unit/etharp/test_etharp.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/test/unit/etharp/test_etharp.h
rename to jni/badvpn/lwip/test/unit/etharp/test_etharp.h
diff --git a/src/main/jni/badvpn/lwip/test/unit/lwip_check.h b/jni/badvpn/lwip/test/unit/lwip_check.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/test/unit/lwip_check.h
rename to jni/badvpn/lwip/test/unit/lwip_check.h
diff --git a/src/main/jni/badvpn/lwip/test/unit/lwip_unittests.c b/jni/badvpn/lwip/test/unit/lwip_unittests.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/test/unit/lwip_unittests.c
rename to jni/badvpn/lwip/test/unit/lwip_unittests.c
diff --git a/src/main/jni/badvpn/lwip/test/unit/lwipopts.h b/jni/badvpn/lwip/test/unit/lwipopts.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/test/unit/lwipopts.h
rename to jni/badvpn/lwip/test/unit/lwipopts.h
diff --git a/src/main/jni/badvpn/lwip/test/unit/tcp/tcp_helper.c b/jni/badvpn/lwip/test/unit/tcp/tcp_helper.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/test/unit/tcp/tcp_helper.c
rename to jni/badvpn/lwip/test/unit/tcp/tcp_helper.c
diff --git a/src/main/jni/badvpn/lwip/test/unit/tcp/tcp_helper.h b/jni/badvpn/lwip/test/unit/tcp/tcp_helper.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/test/unit/tcp/tcp_helper.h
rename to jni/badvpn/lwip/test/unit/tcp/tcp_helper.h
diff --git a/src/main/jni/badvpn/lwip/test/unit/tcp/test_tcp.c b/jni/badvpn/lwip/test/unit/tcp/test_tcp.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/test/unit/tcp/test_tcp.c
rename to jni/badvpn/lwip/test/unit/tcp/test_tcp.c
diff --git a/src/main/jni/badvpn/lwip/test/unit/tcp/test_tcp.h b/jni/badvpn/lwip/test/unit/tcp/test_tcp.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/test/unit/tcp/test_tcp.h
rename to jni/badvpn/lwip/test/unit/tcp/test_tcp.h
diff --git a/src/main/jni/badvpn/lwip/test/unit/tcp/test_tcp_oos.c b/jni/badvpn/lwip/test/unit/tcp/test_tcp_oos.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/test/unit/tcp/test_tcp_oos.c
rename to jni/badvpn/lwip/test/unit/tcp/test_tcp_oos.c
diff --git a/src/main/jni/badvpn/lwip/test/unit/tcp/test_tcp_oos.h b/jni/badvpn/lwip/test/unit/tcp/test_tcp_oos.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/test/unit/tcp/test_tcp_oos.h
rename to jni/badvpn/lwip/test/unit/tcp/test_tcp_oos.h
diff --git a/src/main/jni/badvpn/lwip/test/unit/udp/test_udp.c b/jni/badvpn/lwip/test/unit/udp/test_udp.c
similarity index 100%
rename from src/main/jni/badvpn/lwip/test/unit/udp/test_udp.c
rename to jni/badvpn/lwip/test/unit/udp/test_udp.c
diff --git a/src/main/jni/badvpn/lwip/test/unit/udp/test_udp.h b/jni/badvpn/lwip/test/unit/udp/test_udp.h
similarity index 100%
rename from src/main/jni/badvpn/lwip/test/unit/udp/test_udp.h
rename to jni/badvpn/lwip/test/unit/udp/test_udp.h
diff --git a/src/main/jni/badvpn/misc/BRefTarget.h b/jni/badvpn/misc/BRefTarget.h
similarity index 100%
rename from src/main/jni/badvpn/misc/BRefTarget.h
rename to jni/badvpn/misc/BRefTarget.h
diff --git a/src/main/jni/badvpn/misc/Utf16Decoder.h b/jni/badvpn/misc/Utf16Decoder.h
similarity index 100%
rename from src/main/jni/badvpn/misc/Utf16Decoder.h
rename to jni/badvpn/misc/Utf16Decoder.h
diff --git a/src/main/jni/badvpn/misc/Utf16Encoder.h b/jni/badvpn/misc/Utf16Encoder.h
similarity index 100%
rename from src/main/jni/badvpn/misc/Utf16Encoder.h
rename to jni/badvpn/misc/Utf16Encoder.h
diff --git a/src/main/jni/badvpn/misc/Utf8Decoder.h b/jni/badvpn/misc/Utf8Decoder.h
similarity index 100%
rename from src/main/jni/badvpn/misc/Utf8Decoder.h
rename to jni/badvpn/misc/Utf8Decoder.h
diff --git a/src/main/jni/badvpn/misc/Utf8Encoder.h b/jni/badvpn/misc/Utf8Encoder.h
similarity index 100%
rename from src/main/jni/badvpn/misc/Utf8Encoder.h
rename to jni/badvpn/misc/Utf8Encoder.h
diff --git a/src/main/jni/badvpn/misc/arp_proto.h b/jni/badvpn/misc/arp_proto.h
similarity index 100%
rename from src/main/jni/badvpn/misc/arp_proto.h
rename to jni/badvpn/misc/arp_proto.h
diff --git a/src/main/jni/badvpn/misc/array_length.h b/jni/badvpn/misc/array_length.h
similarity index 100%
rename from src/main/jni/badvpn/misc/array_length.h
rename to jni/badvpn/misc/array_length.h
diff --git a/src/main/jni/badvpn/misc/balign.h b/jni/badvpn/misc/balign.h
similarity index 100%
rename from src/main/jni/badvpn/misc/balign.h
rename to jni/badvpn/misc/balign.h
diff --git a/src/main/jni/badvpn/misc/balloc.h b/jni/badvpn/misc/balloc.h
similarity index 100%
rename from src/main/jni/badvpn/misc/balloc.h
rename to jni/badvpn/misc/balloc.h
diff --git a/src/main/jni/badvpn/misc/blimits.h b/jni/badvpn/misc/blimits.h
similarity index 100%
rename from src/main/jni/badvpn/misc/blimits.h
rename to jni/badvpn/misc/blimits.h
diff --git a/src/main/jni/badvpn/misc/bsize.h b/jni/badvpn/misc/bsize.h
similarity index 100%
rename from src/main/jni/badvpn/misc/bsize.h
rename to jni/badvpn/misc/bsize.h
diff --git a/src/main/jni/badvpn/misc/bsort.h b/jni/badvpn/misc/bsort.h
similarity index 100%
rename from src/main/jni/badvpn/misc/bsort.h
rename to jni/badvpn/misc/bsort.h
diff --git a/src/main/jni/badvpn/misc/bstring.h b/jni/badvpn/misc/bstring.h
similarity index 100%
rename from src/main/jni/badvpn/misc/bstring.h
rename to jni/badvpn/misc/bstring.h
diff --git a/src/main/jni/badvpn/misc/byteorder.h b/jni/badvpn/misc/byteorder.h
similarity index 100%
rename from src/main/jni/badvpn/misc/byteorder.h
rename to jni/badvpn/misc/byteorder.h
diff --git a/src/main/jni/badvpn/misc/cmdline.h b/jni/badvpn/misc/cmdline.h
similarity index 100%
rename from src/main/jni/badvpn/misc/cmdline.h
rename to jni/badvpn/misc/cmdline.h
diff --git a/src/main/jni/badvpn/misc/compare.h b/jni/badvpn/misc/compare.h
similarity index 100%
rename from src/main/jni/badvpn/misc/compare.h
rename to jni/badvpn/misc/compare.h
diff --git a/src/main/jni/badvpn/misc/concat_strings.h b/jni/badvpn/misc/concat_strings.h
similarity index 100%
rename from src/main/jni/badvpn/misc/concat_strings.h
rename to jni/badvpn/misc/concat_strings.h
diff --git a/src/main/jni/badvpn/misc/cstring.h b/jni/badvpn/misc/cstring.h
similarity index 100%
rename from src/main/jni/badvpn/misc/cstring.h
rename to jni/badvpn/misc/cstring.h
diff --git a/src/main/jni/badvpn/misc/dead.h b/jni/badvpn/misc/dead.h
similarity index 100%
rename from src/main/jni/badvpn/misc/dead.h
rename to jni/badvpn/misc/dead.h
diff --git a/src/main/jni/badvpn/misc/debug.h b/jni/badvpn/misc/debug.h
similarity index 100%
rename from src/main/jni/badvpn/misc/debug.h
rename to jni/badvpn/misc/debug.h
diff --git a/src/main/jni/badvpn/misc/debugcounter.h b/jni/badvpn/misc/debugcounter.h
similarity index 100%
rename from src/main/jni/badvpn/misc/debugcounter.h
rename to jni/badvpn/misc/debugcounter.h
diff --git a/src/main/jni/badvpn/misc/debugerror.h b/jni/badvpn/misc/debugerror.h
similarity index 100%
rename from src/main/jni/badvpn/misc/debugerror.h
rename to jni/badvpn/misc/debugerror.h
diff --git a/src/main/jni/badvpn/misc/dhcp_proto.h b/jni/badvpn/misc/dhcp_proto.h
similarity index 100%
rename from src/main/jni/badvpn/misc/dhcp_proto.h
rename to jni/badvpn/misc/dhcp_proto.h
diff --git a/src/main/jni/badvpn/misc/ethernet_proto.h b/jni/badvpn/misc/ethernet_proto.h
similarity index 100%
rename from src/main/jni/badvpn/misc/ethernet_proto.h
rename to jni/badvpn/misc/ethernet_proto.h
diff --git a/src/main/jni/badvpn/misc/exparray.h b/jni/badvpn/misc/exparray.h
similarity index 100%
rename from src/main/jni/badvpn/misc/exparray.h
rename to jni/badvpn/misc/exparray.h
diff --git a/src/main/jni/badvpn/misc/expstring.h b/jni/badvpn/misc/expstring.h
similarity index 100%
rename from src/main/jni/badvpn/misc/expstring.h
rename to jni/badvpn/misc/expstring.h
diff --git a/src/main/jni/badvpn/misc/find_char.h b/jni/badvpn/misc/find_char.h
similarity index 100%
rename from src/main/jni/badvpn/misc/find_char.h
rename to jni/badvpn/misc/find_char.h
diff --git a/src/main/jni/badvpn/misc/find_program.h b/jni/badvpn/misc/find_program.h
similarity index 100%
rename from src/main/jni/badvpn/misc/find_program.h
rename to jni/badvpn/misc/find_program.h
diff --git a/src/main/jni/badvpn/misc/get_iface_info.h b/jni/badvpn/misc/get_iface_info.h
similarity index 100%
rename from src/main/jni/badvpn/misc/get_iface_info.h
rename to jni/badvpn/misc/get_iface_info.h
diff --git a/src/main/jni/badvpn/misc/grow_array.h b/jni/badvpn/misc/grow_array.h
similarity index 100%
rename from src/main/jni/badvpn/misc/grow_array.h
rename to jni/badvpn/misc/grow_array.h
diff --git a/src/main/jni/badvpn/misc/hashfun.h b/jni/badvpn/misc/hashfun.h
similarity index 100%
rename from src/main/jni/badvpn/misc/hashfun.h
rename to jni/badvpn/misc/hashfun.h
diff --git a/src/main/jni/badvpn/misc/igmp_proto.h b/jni/badvpn/misc/igmp_proto.h
similarity index 100%
rename from src/main/jni/badvpn/misc/igmp_proto.h
rename to jni/badvpn/misc/igmp_proto.h
diff --git a/src/main/jni/badvpn/misc/ipaddr.h b/jni/badvpn/misc/ipaddr.h
similarity index 100%
rename from src/main/jni/badvpn/misc/ipaddr.h
rename to jni/badvpn/misc/ipaddr.h
diff --git a/src/main/jni/badvpn/misc/ipaddr6.h b/jni/badvpn/misc/ipaddr6.h
similarity index 100%
rename from src/main/jni/badvpn/misc/ipaddr6.h
rename to jni/badvpn/misc/ipaddr6.h
diff --git a/src/main/jni/badvpn/misc/ipv4_proto.h b/jni/badvpn/misc/ipv4_proto.h
similarity index 100%
rename from src/main/jni/badvpn/misc/ipv4_proto.h
rename to jni/badvpn/misc/ipv4_proto.h
diff --git a/src/main/jni/badvpn/misc/ipv6_proto.h b/jni/badvpn/misc/ipv6_proto.h
similarity index 100%
rename from src/main/jni/badvpn/misc/ipv6_proto.h
rename to jni/badvpn/misc/ipv6_proto.h
diff --git a/src/main/jni/badvpn/misc/loggers_string.h b/jni/badvpn/misc/loggers_string.h
similarity index 100%
rename from src/main/jni/badvpn/misc/loggers_string.h
rename to jni/badvpn/misc/loggers_string.h
diff --git a/src/main/jni/badvpn/misc/loglevel.h b/jni/badvpn/misc/loglevel.h
similarity index 100%
rename from src/main/jni/badvpn/misc/loglevel.h
rename to jni/badvpn/misc/loglevel.h
diff --git a/src/main/jni/badvpn/misc/maxalign.h b/jni/badvpn/misc/maxalign.h
similarity index 100%
rename from src/main/jni/badvpn/misc/maxalign.h
rename to jni/badvpn/misc/maxalign.h
diff --git a/src/main/jni/badvpn/misc/merge.h b/jni/badvpn/misc/merge.h
similarity index 100%
rename from src/main/jni/badvpn/misc/merge.h
rename to jni/badvpn/misc/merge.h
diff --git a/src/main/jni/badvpn/misc/minmax.h b/jni/badvpn/misc/minmax.h
similarity index 100%
rename from src/main/jni/badvpn/misc/minmax.h
rename to jni/badvpn/misc/minmax.h
diff --git a/src/main/jni/badvpn/misc/modadd.h b/jni/badvpn/misc/modadd.h
similarity index 100%
rename from src/main/jni/badvpn/misc/modadd.h
rename to jni/badvpn/misc/modadd.h
diff --git a/src/main/jni/badvpn/misc/mswsock.h b/jni/badvpn/misc/mswsock.h
similarity index 100%
rename from src/main/jni/badvpn/misc/mswsock.h
rename to jni/badvpn/misc/mswsock.h
diff --git a/src/main/jni/badvpn/misc/nonblocking.h b/jni/badvpn/misc/nonblocking.h
similarity index 100%
rename from src/main/jni/badvpn/misc/nonblocking.h
rename to jni/badvpn/misc/nonblocking.h
diff --git a/src/main/jni/badvpn/misc/nsskey.h b/jni/badvpn/misc/nsskey.h
similarity index 100%
rename from src/main/jni/badvpn/misc/nsskey.h
rename to jni/badvpn/misc/nsskey.h
diff --git a/src/main/jni/badvpn/misc/offset.h b/jni/badvpn/misc/offset.h
similarity index 100%
rename from src/main/jni/badvpn/misc/offset.h
rename to jni/badvpn/misc/offset.h
diff --git a/src/main/jni/badvpn/misc/open_standard_streams.h b/jni/badvpn/misc/open_standard_streams.h
similarity index 100%
rename from src/main/jni/badvpn/misc/open_standard_streams.h
rename to jni/badvpn/misc/open_standard_streams.h
diff --git a/src/main/jni/badvpn/misc/overflow.h b/jni/badvpn/misc/overflow.h
similarity index 100%
rename from src/main/jni/badvpn/misc/overflow.h
rename to jni/badvpn/misc/overflow.h
diff --git a/src/main/jni/badvpn/misc/packed.h b/jni/badvpn/misc/packed.h
similarity index 100%
rename from src/main/jni/badvpn/misc/packed.h
rename to jni/badvpn/misc/packed.h
diff --git a/src/main/jni/badvpn/misc/parse_number.h b/jni/badvpn/misc/parse_number.h
similarity index 100%
rename from src/main/jni/badvpn/misc/parse_number.h
rename to jni/badvpn/misc/parse_number.h
diff --git a/src/main/jni/badvpn/misc/print_macros.h b/jni/badvpn/misc/print_macros.h
similarity index 100%
rename from src/main/jni/badvpn/misc/print_macros.h
rename to jni/badvpn/misc/print_macros.h
diff --git a/src/main/jni/badvpn/misc/read_file.h b/jni/badvpn/misc/read_file.h
similarity index 100%
rename from src/main/jni/badvpn/misc/read_file.h
rename to jni/badvpn/misc/read_file.h
diff --git a/src/main/jni/badvpn/misc/read_write_int.h b/jni/badvpn/misc/read_write_int.h
similarity index 100%
rename from src/main/jni/badvpn/misc/read_write_int.h
rename to jni/badvpn/misc/read_write_int.h
diff --git a/src/main/jni/badvpn/misc/socks_proto.h b/jni/badvpn/misc/socks_proto.h
similarity index 100%
rename from src/main/jni/badvpn/misc/socks_proto.h
rename to jni/badvpn/misc/socks_proto.h
diff --git a/src/main/jni/badvpn/misc/sslsocket.h b/jni/badvpn/misc/sslsocket.h
similarity index 100%
rename from src/main/jni/badvpn/misc/sslsocket.h
rename to jni/badvpn/misc/sslsocket.h
diff --git a/src/main/jni/badvpn/misc/stdbuf_cmdline.h b/jni/badvpn/misc/stdbuf_cmdline.h
similarity index 100%
rename from src/main/jni/badvpn/misc/stdbuf_cmdline.h
rename to jni/badvpn/misc/stdbuf_cmdline.h
diff --git a/src/main/jni/badvpn/misc/strdup.h b/jni/badvpn/misc/strdup.h
similarity index 100%
rename from src/main/jni/badvpn/misc/strdup.h
rename to jni/badvpn/misc/strdup.h
diff --git a/src/main/jni/badvpn/misc/string_begins_with.h b/jni/badvpn/misc/string_begins_with.h
similarity index 100%
rename from src/main/jni/badvpn/misc/string_begins_with.h
rename to jni/badvpn/misc/string_begins_with.h
diff --git a/src/main/jni/badvpn/misc/substring.h b/jni/badvpn/misc/substring.h
similarity index 100%
rename from src/main/jni/badvpn/misc/substring.h
rename to jni/badvpn/misc/substring.h
diff --git a/src/main/jni/badvpn/misc/udp_proto.h b/jni/badvpn/misc/udp_proto.h
similarity index 100%
rename from src/main/jni/badvpn/misc/udp_proto.h
rename to jni/badvpn/misc/udp_proto.h
diff --git a/src/main/jni/badvpn/misc/unicode_funcs.h b/jni/badvpn/misc/unicode_funcs.h
similarity index 100%
rename from src/main/jni/badvpn/misc/unicode_funcs.h
rename to jni/badvpn/misc/unicode_funcs.h
diff --git a/src/main/jni/badvpn/misc/version.h b/jni/badvpn/misc/version.h
similarity index 100%
rename from src/main/jni/badvpn/misc/version.h
rename to jni/badvpn/misc/version.h
diff --git a/src/main/jni/badvpn/misc/write_file.h b/jni/badvpn/misc/write_file.h
similarity index 100%
rename from src/main/jni/badvpn/misc/write_file.h
rename to jni/badvpn/misc/write_file.h
diff --git a/src/main/jni/badvpn/ncd-request/CMakeLists.txt b/jni/badvpn/ncd-request/CMakeLists.txt
similarity index 100%
rename from src/main/jni/badvpn/ncd-request/CMakeLists.txt
rename to jni/badvpn/ncd-request/CMakeLists.txt
diff --git a/src/main/jni/badvpn/ncd-request/ncd-request.c b/jni/badvpn/ncd-request/ncd-request.c
similarity index 100%
rename from src/main/jni/badvpn/ncd-request/ncd-request.c
rename to jni/badvpn/ncd-request/ncd-request.c
diff --git a/src/main/jni/badvpn/ncd/CMakeLists.txt b/jni/badvpn/ncd/CMakeLists.txt
similarity index 100%
rename from src/main/jni/badvpn/ncd/CMakeLists.txt
rename to jni/badvpn/ncd/CMakeLists.txt
diff --git a/src/main/jni/badvpn/ncd/NCDAst.c b/jni/badvpn/ncd/NCDAst.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDAst.c
rename to jni/badvpn/ncd/NCDAst.c
diff --git a/src/main/jni/badvpn/ncd/NCDAst.h b/jni/badvpn/ncd/NCDAst.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDAst.h
rename to jni/badvpn/ncd/NCDAst.h
diff --git a/src/main/jni/badvpn/ncd/NCDBuildProgram.c b/jni/badvpn/ncd/NCDBuildProgram.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDBuildProgram.c
rename to jni/badvpn/ncd/NCDBuildProgram.c
diff --git a/src/main/jni/badvpn/ncd/NCDBuildProgram.h b/jni/badvpn/ncd/NCDBuildProgram.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDBuildProgram.h
rename to jni/badvpn/ncd/NCDBuildProgram.h
diff --git a/src/main/jni/badvpn/ncd/NCDConfigParser.c b/jni/badvpn/ncd/NCDConfigParser.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDConfigParser.c
rename to jni/badvpn/ncd/NCDConfigParser.c
diff --git a/src/main/jni/badvpn/ncd/NCDConfigParser.h b/jni/badvpn/ncd/NCDConfigParser.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDConfigParser.h
rename to jni/badvpn/ncd/NCDConfigParser.h
diff --git a/src/main/jni/badvpn/ncd/NCDConfigParser_parse.y b/jni/badvpn/ncd/NCDConfigParser_parse.y
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDConfigParser_parse.y
rename to jni/badvpn/ncd/NCDConfigParser_parse.y
diff --git a/src/main/jni/badvpn/ncd/NCDConfigTokenizer.c b/jni/badvpn/ncd/NCDConfigTokenizer.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDConfigTokenizer.c
rename to jni/badvpn/ncd/NCDConfigTokenizer.c
diff --git a/src/main/jni/badvpn/ncd/NCDConfigTokenizer.h b/jni/badvpn/ncd/NCDConfigTokenizer.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDConfigTokenizer.h
rename to jni/badvpn/ncd/NCDConfigTokenizer.h
diff --git a/src/main/jni/badvpn/ncd/NCDInterpProcess.c b/jni/badvpn/ncd/NCDInterpProcess.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDInterpProcess.c
rename to jni/badvpn/ncd/NCDInterpProcess.c
diff --git a/src/main/jni/badvpn/ncd/NCDInterpProcess.h b/jni/badvpn/ncd/NCDInterpProcess.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDInterpProcess.h
rename to jni/badvpn/ncd/NCDInterpProcess.h
diff --git a/src/main/jni/badvpn/ncd/NCDInterpProg.c b/jni/badvpn/ncd/NCDInterpProg.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDInterpProg.c
rename to jni/badvpn/ncd/NCDInterpProg.c
diff --git a/src/main/jni/badvpn/ncd/NCDInterpProg.h b/jni/badvpn/ncd/NCDInterpProg.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDInterpProg.h
rename to jni/badvpn/ncd/NCDInterpProg.h
diff --git a/src/main/jni/badvpn/ncd/NCDInterpProg_hash.h b/jni/badvpn/ncd/NCDInterpProg_hash.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDInterpProg_hash.h
rename to jni/badvpn/ncd/NCDInterpProg_hash.h
diff --git a/src/main/jni/badvpn/ncd/NCDInterpreter.c b/jni/badvpn/ncd/NCDInterpreter.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDInterpreter.c
rename to jni/badvpn/ncd/NCDInterpreter.c
diff --git a/src/main/jni/badvpn/ncd/NCDInterpreter.h b/jni/badvpn/ncd/NCDInterpreter.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDInterpreter.h
rename to jni/badvpn/ncd/NCDInterpreter.h
diff --git a/src/main/jni/badvpn/ncd/NCDMethodIndex.c b/jni/badvpn/ncd/NCDMethodIndex.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDMethodIndex.c
rename to jni/badvpn/ncd/NCDMethodIndex.c
diff --git a/src/main/jni/badvpn/ncd/NCDMethodIndex.h b/jni/badvpn/ncd/NCDMethodIndex.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDMethodIndex.h
rename to jni/badvpn/ncd/NCDMethodIndex.h
diff --git a/src/main/jni/badvpn/ncd/NCDMethodIndex_hash.h b/jni/badvpn/ncd/NCDMethodIndex_hash.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDMethodIndex_hash.h
rename to jni/badvpn/ncd/NCDMethodIndex_hash.h
diff --git a/src/main/jni/badvpn/ncd/NCDModule.c b/jni/badvpn/ncd/NCDModule.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDModule.c
rename to jni/badvpn/ncd/NCDModule.c
diff --git a/src/main/jni/badvpn/ncd/NCDModule.h b/jni/badvpn/ncd/NCDModule.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDModule.h
rename to jni/badvpn/ncd/NCDModule.h
diff --git a/src/main/jni/badvpn/ncd/NCDModuleIndex.c b/jni/badvpn/ncd/NCDModuleIndex.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDModuleIndex.c
rename to jni/badvpn/ncd/NCDModuleIndex.c
diff --git a/src/main/jni/badvpn/ncd/NCDModuleIndex.h b/jni/badvpn/ncd/NCDModuleIndex.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDModuleIndex.h
rename to jni/badvpn/ncd/NCDModuleIndex.h
diff --git a/src/main/jni/badvpn/ncd/NCDModuleIndex_mhash.h b/jni/badvpn/ncd/NCDModuleIndex_mhash.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDModuleIndex_mhash.h
rename to jni/badvpn/ncd/NCDModuleIndex_mhash.h
diff --git a/src/main/jni/badvpn/ncd/NCDObject.c b/jni/badvpn/ncd/NCDObject.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDObject.c
rename to jni/badvpn/ncd/NCDObject.c
diff --git a/src/main/jni/badvpn/ncd/NCDObject.h b/jni/badvpn/ncd/NCDObject.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDObject.h
rename to jni/badvpn/ncd/NCDObject.h
diff --git a/src/main/jni/badvpn/ncd/NCDPlaceholderDb.c b/jni/badvpn/ncd/NCDPlaceholderDb.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDPlaceholderDb.c
rename to jni/badvpn/ncd/NCDPlaceholderDb.c
diff --git a/src/main/jni/badvpn/ncd/NCDPlaceholderDb.h b/jni/badvpn/ncd/NCDPlaceholderDb.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDPlaceholderDb.h
rename to jni/badvpn/ncd/NCDPlaceholderDb.h
diff --git a/src/main/jni/badvpn/ncd/NCDStringIndex.c b/jni/badvpn/ncd/NCDStringIndex.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDStringIndex.c
rename to jni/badvpn/ncd/NCDStringIndex.c
diff --git a/src/main/jni/badvpn/ncd/NCDStringIndex.h b/jni/badvpn/ncd/NCDStringIndex.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDStringIndex.h
rename to jni/badvpn/ncd/NCDStringIndex.h
diff --git a/src/main/jni/badvpn/ncd/NCDStringIndex_hash.h b/jni/badvpn/ncd/NCDStringIndex_hash.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDStringIndex_hash.h
rename to jni/badvpn/ncd/NCDStringIndex_hash.h
diff --git a/src/main/jni/badvpn/ncd/NCDSugar.c b/jni/badvpn/ncd/NCDSugar.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDSugar.c
rename to jni/badvpn/ncd/NCDSugar.c
diff --git a/src/main/jni/badvpn/ncd/NCDSugar.h b/jni/badvpn/ncd/NCDSugar.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDSugar.h
rename to jni/badvpn/ncd/NCDSugar.h
diff --git a/src/main/jni/badvpn/ncd/NCDVal.c b/jni/badvpn/ncd/NCDVal.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDVal.c
rename to jni/badvpn/ncd/NCDVal.c
diff --git a/src/main/jni/badvpn/ncd/NCDVal.h b/jni/badvpn/ncd/NCDVal.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDVal.h
rename to jni/badvpn/ncd/NCDVal.h
diff --git a/src/main/jni/badvpn/ncd/NCDValCons.c b/jni/badvpn/ncd/NCDValCons.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDValCons.c
rename to jni/badvpn/ncd/NCDValCons.c
diff --git a/src/main/jni/badvpn/ncd/NCDValCons.h b/jni/badvpn/ncd/NCDValCons.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDValCons.h
rename to jni/badvpn/ncd/NCDValCons.h
diff --git a/src/main/jni/badvpn/ncd/NCDValGenerator.c b/jni/badvpn/ncd/NCDValGenerator.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDValGenerator.c
rename to jni/badvpn/ncd/NCDValGenerator.c
diff --git a/src/main/jni/badvpn/ncd/NCDValGenerator.h b/jni/badvpn/ncd/NCDValGenerator.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDValGenerator.h
rename to jni/badvpn/ncd/NCDValGenerator.h
diff --git a/src/main/jni/badvpn/ncd/NCDValParser.c b/jni/badvpn/ncd/NCDValParser.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDValParser.c
rename to jni/badvpn/ncd/NCDValParser.c
diff --git a/src/main/jni/badvpn/ncd/NCDValParser.h b/jni/badvpn/ncd/NCDValParser.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDValParser.h
rename to jni/badvpn/ncd/NCDValParser.h
diff --git a/src/main/jni/badvpn/ncd/NCDValParser_parse.y b/jni/badvpn/ncd/NCDValParser_parse.y
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDValParser_parse.y
rename to jni/badvpn/ncd/NCDValParser_parse.y
diff --git a/src/main/jni/badvpn/ncd/NCDVal_maptree.h b/jni/badvpn/ncd/NCDVal_maptree.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/NCDVal_maptree.h
rename to jni/badvpn/ncd/NCDVal_maptree.h
diff --git a/src/main/jni/badvpn/ncd/README b/jni/badvpn/ncd/README
similarity index 100%
rename from src/main/jni/badvpn/ncd/README
rename to jni/badvpn/ncd/README
diff --git a/src/main/jni/badvpn/ncd/emncd.c b/jni/badvpn/ncd/emncd.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/emncd.c
rename to jni/badvpn/ncd/emncd.c
diff --git a/src/main/jni/badvpn/ncd/emncd.html b/jni/badvpn/ncd/emncd.html
similarity index 100%
rename from src/main/jni/badvpn/ncd/emncd.html
rename to jni/badvpn/ncd/emncd.html
diff --git a/src/main/jni/badvpn/ncd/examples/dbus_start.ncd b/jni/badvpn/ncd/examples/dbus_start.ncd
similarity index 100%
rename from src/main/jni/badvpn/ncd/examples/dbus_start.ncd
rename to jni/badvpn/ncd/examples/dbus_start.ncd
diff --git a/src/main/jni/badvpn/ncd/examples/dhcpd.conf.template b/jni/badvpn/ncd/examples/dhcpd.conf.template
similarity index 100%
rename from src/main/jni/badvpn/ncd/examples/dhcpd.conf.template
rename to jni/badvpn/ncd/examples/dhcpd.conf.template
diff --git a/src/main/jni/badvpn/ncd/examples/directory_updater.ncd b/jni/badvpn/ncd/examples/directory_updater.ncd
similarity index 100%
rename from src/main/jni/badvpn/ncd/examples/directory_updater.ncd
rename to jni/badvpn/ncd/examples/directory_updater.ncd
diff --git a/src/main/jni/badvpn/ncd/examples/events.ncd b/jni/badvpn/ncd/examples/events.ncd
similarity index 100%
rename from src/main/jni/badvpn/ncd/examples/events.ncd
rename to jni/badvpn/ncd/examples/events.ncd
diff --git a/src/main/jni/badvpn/ncd/examples/igmpproxy.conf.template b/jni/badvpn/ncd/examples/igmpproxy.conf.template
similarity index 100%
rename from src/main/jni/badvpn/ncd/examples/igmpproxy.conf.template
rename to jni/badvpn/ncd/examples/igmpproxy.conf.template
diff --git a/src/main/jni/badvpn/ncd/examples/make_dhcp_config.ncd b/jni/badvpn/ncd/examples/make_dhcp_config.ncd
similarity index 100%
rename from src/main/jni/badvpn/ncd/examples/make_dhcp_config.ncd
rename to jni/badvpn/ncd/examples/make_dhcp_config.ncd
diff --git a/src/main/jni/badvpn/ncd/examples/make_igmpproxy_config.ncd b/jni/badvpn/ncd/examples/make_igmpproxy_config.ncd
similarity index 100%
rename from src/main/jni/badvpn/ncd/examples/make_igmpproxy_config.ncd
rename to jni/badvpn/ncd/examples/make_igmpproxy_config.ncd
diff --git a/src/main/jni/badvpn/ncd/examples/network.ncd b/jni/badvpn/ncd/examples/network.ncd
similarity index 100%
rename from src/main/jni/badvpn/ncd/examples/network.ncd
rename to jni/badvpn/ncd/examples/network.ncd
diff --git a/src/main/jni/badvpn/ncd/examples/onoff_server.ncdi b/jni/badvpn/ncd/examples/onoff_server.ncdi
similarity index 100%
rename from src/main/jni/badvpn/ncd/examples/onoff_server.ncdi
rename to jni/badvpn/ncd/examples/onoff_server.ncdi
diff --git a/src/main/jni/badvpn/ncd/examples/onoff_server_test.ncd b/jni/badvpn/ncd/examples/onoff_server_test.ncd
similarity index 100%
rename from src/main/jni/badvpn/ncd/examples/onoff_server_test.ncd
rename to jni/badvpn/ncd/examples/onoff_server_test.ncd
diff --git a/src/main/jni/badvpn/ncd/examples/tcp_echo_client.ncd b/jni/badvpn/ncd/examples/tcp_echo_client.ncd
similarity index 100%
rename from src/main/jni/badvpn/ncd/examples/tcp_echo_client.ncd
rename to jni/badvpn/ncd/examples/tcp_echo_client.ncd
diff --git a/src/main/jni/badvpn/ncd/examples/tcp_echo_server.ncd b/jni/badvpn/ncd/examples/tcp_echo_server.ncd
similarity index 100%
rename from src/main/jni/badvpn/ncd/examples/tcp_echo_server.ncd
rename to jni/badvpn/ncd/examples/tcp_echo_server.ncd
diff --git a/src/main/jni/badvpn/ncd/extra/BEventLock.c b/jni/badvpn/ncd/extra/BEventLock.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/extra/BEventLock.c
rename to jni/badvpn/ncd/extra/BEventLock.c
diff --git a/src/main/jni/badvpn/ncd/extra/BEventLock.h b/jni/badvpn/ncd/extra/BEventLock.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/extra/BEventLock.h
rename to jni/badvpn/ncd/extra/BEventLock.h
diff --git a/src/main/jni/badvpn/ncd/extra/NCDBProcessOpts.c b/jni/badvpn/ncd/extra/NCDBProcessOpts.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/extra/NCDBProcessOpts.c
rename to jni/badvpn/ncd/extra/NCDBProcessOpts.c
diff --git a/src/main/jni/badvpn/ncd/extra/NCDBProcessOpts.h b/jni/badvpn/ncd/extra/NCDBProcessOpts.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/extra/NCDBProcessOpts.h
rename to jni/badvpn/ncd/extra/NCDBProcessOpts.h
diff --git a/src/main/jni/badvpn/ncd/extra/NCDBuf.c b/jni/badvpn/ncd/extra/NCDBuf.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/extra/NCDBuf.c
rename to jni/badvpn/ncd/extra/NCDBuf.c
diff --git a/src/main/jni/badvpn/ncd/extra/NCDBuf.h b/jni/badvpn/ncd/extra/NCDBuf.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/extra/NCDBuf.h
rename to jni/badvpn/ncd/extra/NCDBuf.h
diff --git a/src/main/jni/badvpn/ncd/extra/NCDIfConfig.c b/jni/badvpn/ncd/extra/NCDIfConfig.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/extra/NCDIfConfig.c
rename to jni/badvpn/ncd/extra/NCDIfConfig.c
diff --git a/src/main/jni/badvpn/ncd/extra/NCDIfConfig.h b/jni/badvpn/ncd/extra/NCDIfConfig.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/extra/NCDIfConfig.h
rename to jni/badvpn/ncd/extra/NCDIfConfig.h
diff --git a/src/main/jni/badvpn/ncd/extra/NCDInterfaceMonitor.c b/jni/badvpn/ncd/extra/NCDInterfaceMonitor.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/extra/NCDInterfaceMonitor.c
rename to jni/badvpn/ncd/extra/NCDInterfaceMonitor.c
diff --git a/src/main/jni/badvpn/ncd/extra/NCDInterfaceMonitor.h b/jni/badvpn/ncd/extra/NCDInterfaceMonitor.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/extra/NCDInterfaceMonitor.h
rename to jni/badvpn/ncd/extra/NCDInterfaceMonitor.h
diff --git a/src/main/jni/badvpn/ncd/extra/NCDRequestClient.c b/jni/badvpn/ncd/extra/NCDRequestClient.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/extra/NCDRequestClient.c
rename to jni/badvpn/ncd/extra/NCDRequestClient.c
diff --git a/src/main/jni/badvpn/ncd/extra/NCDRequestClient.h b/jni/badvpn/ncd/extra/NCDRequestClient.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/extra/NCDRequestClient.h
rename to jni/badvpn/ncd/extra/NCDRequestClient.h
diff --git a/src/main/jni/badvpn/ncd/extra/NCDRfkillMonitor.c b/jni/badvpn/ncd/extra/NCDRfkillMonitor.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/extra/NCDRfkillMonitor.c
rename to jni/badvpn/ncd/extra/NCDRfkillMonitor.c
diff --git a/src/main/jni/badvpn/ncd/extra/NCDRfkillMonitor.h b/jni/badvpn/ncd/extra/NCDRfkillMonitor.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/extra/NCDRfkillMonitor.h
rename to jni/badvpn/ncd/extra/NCDRfkillMonitor.h
diff --git a/src/main/jni/badvpn/ncd/extra/address_utils.h b/jni/badvpn/ncd/extra/address_utils.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/extra/address_utils.h
rename to jni/badvpn/ncd/extra/address_utils.h
diff --git a/src/main/jni/badvpn/ncd/extra/build_cmdline.c b/jni/badvpn/ncd/extra/build_cmdline.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/extra/build_cmdline.c
rename to jni/badvpn/ncd/extra/build_cmdline.c
diff --git a/src/main/jni/badvpn/ncd/extra/build_cmdline.h b/jni/badvpn/ncd/extra/build_cmdline.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/extra/build_cmdline.h
rename to jni/badvpn/ncd/extra/build_cmdline.h
diff --git a/src/main/jni/badvpn/ncd/extra/make_fast_names.h b/jni/badvpn/ncd/extra/make_fast_names.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/extra/make_fast_names.h
rename to jni/badvpn/ncd/extra/make_fast_names.h
diff --git a/src/main/jni/badvpn/ncd/extra/value_utils.h b/jni/badvpn/ncd/extra/value_utils.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/extra/value_utils.h
rename to jni/badvpn/ncd/extra/value_utils.h
diff --git a/src/main/jni/badvpn/ncd/include_linux_input.c b/jni/badvpn/ncd/include_linux_input.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/include_linux_input.c
rename to jni/badvpn/ncd/include_linux_input.c
diff --git a/src/main/jni/badvpn/ncd/make_name_indices.h b/jni/badvpn/ncd/make_name_indices.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/make_name_indices.h
rename to jni/badvpn/ncd/make_name_indices.h
diff --git a/src/main/jni/badvpn/ncd/modules/alias.c b/jni/badvpn/ncd/modules/alias.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/alias.c
rename to jni/badvpn/ncd/modules/alias.c
diff --git a/src/main/jni/badvpn/ncd/modules/arithmetic.c b/jni/badvpn/ncd/modules/arithmetic.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/arithmetic.c
rename to jni/badvpn/ncd/modules/arithmetic.c
diff --git a/src/main/jni/badvpn/ncd/modules/assert.c b/jni/badvpn/ncd/modules/assert.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/assert.c
rename to jni/badvpn/ncd/modules/assert.c
diff --git a/src/main/jni/badvpn/ncd/modules/backtrack.c b/jni/badvpn/ncd/modules/backtrack.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/backtrack.c
rename to jni/badvpn/ncd/modules/backtrack.c
diff --git a/src/main/jni/badvpn/ncd/modules/blocker.c b/jni/badvpn/ncd/modules/blocker.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/blocker.c
rename to jni/badvpn/ncd/modules/blocker.c
diff --git a/src/main/jni/badvpn/ncd/modules/buffer.c b/jni/badvpn/ncd/modules/buffer.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/buffer.c
rename to jni/badvpn/ncd/modules/buffer.c
diff --git a/src/main/jni/badvpn/ncd/modules/buffer_chunks_tree.h b/jni/badvpn/ncd/modules/buffer_chunks_tree.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/buffer_chunks_tree.h
rename to jni/badvpn/ncd/modules/buffer_chunks_tree.h
diff --git a/src/main/jni/badvpn/ncd/modules/call2.c b/jni/badvpn/ncd/modules/call2.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/call2.c
rename to jni/badvpn/ncd/modules/call2.c
diff --git a/src/main/jni/badvpn/ncd/modules/choose.c b/jni/badvpn/ncd/modules/choose.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/choose.c
rename to jni/badvpn/ncd/modules/choose.c
diff --git a/src/main/jni/badvpn/ncd/modules/command_template.c b/jni/badvpn/ncd/modules/command_template.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/command_template.c
rename to jni/badvpn/ncd/modules/command_template.c
diff --git a/src/main/jni/badvpn/ncd/modules/command_template.h b/jni/badvpn/ncd/modules/command_template.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/command_template.h
rename to jni/badvpn/ncd/modules/command_template.h
diff --git a/src/main/jni/badvpn/ncd/modules/concat.c b/jni/badvpn/ncd/modules/concat.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/concat.c
rename to jni/badvpn/ncd/modules/concat.c
diff --git a/src/main/jni/badvpn/ncd/modules/daemon.c b/jni/badvpn/ncd/modules/daemon.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/daemon.c
rename to jni/badvpn/ncd/modules/daemon.c
diff --git a/src/main/jni/badvpn/ncd/modules/depend.c b/jni/badvpn/ncd/modules/depend.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/depend.c
rename to jni/badvpn/ncd/modules/depend.c
diff --git a/src/main/jni/badvpn/ncd/modules/depend_scope.c b/jni/badvpn/ncd/modules/depend_scope.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/depend_scope.c
rename to jni/badvpn/ncd/modules/depend_scope.c
diff --git a/src/main/jni/badvpn/ncd/modules/dynamic_depend.c b/jni/badvpn/ncd/modules/dynamic_depend.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/dynamic_depend.c
rename to jni/badvpn/ncd/modules/dynamic_depend.c
diff --git a/src/main/jni/badvpn/ncd/modules/event_template.c b/jni/badvpn/ncd/modules/event_template.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/event_template.c
rename to jni/badvpn/ncd/modules/event_template.c
diff --git a/src/main/jni/badvpn/ncd/modules/event_template.h b/jni/badvpn/ncd/modules/event_template.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/event_template.h
rename to jni/badvpn/ncd/modules/event_template.h
diff --git a/src/main/jni/badvpn/ncd/modules/exit.c b/jni/badvpn/ncd/modules/exit.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/exit.c
rename to jni/badvpn/ncd/modules/exit.c
diff --git a/src/main/jni/badvpn/ncd/modules/explode.c b/jni/badvpn/ncd/modules/explode.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/explode.c
rename to jni/badvpn/ncd/modules/explode.c
diff --git a/src/main/jni/badvpn/ncd/modules/file.c b/jni/badvpn/ncd/modules/file.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/file.c
rename to jni/badvpn/ncd/modules/file.c
diff --git a/src/main/jni/badvpn/ncd/modules/file_open.c b/jni/badvpn/ncd/modules/file_open.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/file_open.c
rename to jni/badvpn/ncd/modules/file_open.c
diff --git a/src/main/jni/badvpn/ncd/modules/foreach.c b/jni/badvpn/ncd/modules/foreach.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/foreach.c
rename to jni/badvpn/ncd/modules/foreach.c
diff --git a/src/main/jni/badvpn/ncd/modules/from_string.c b/jni/badvpn/ncd/modules/from_string.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/from_string.c
rename to jni/badvpn/ncd/modules/from_string.c
diff --git a/src/main/jni/badvpn/ncd/modules/getargs.c b/jni/badvpn/ncd/modules/getargs.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/getargs.c
rename to jni/badvpn/ncd/modules/getargs.c
diff --git a/src/main/jni/badvpn/ncd/modules/getenv.c b/jni/badvpn/ncd/modules/getenv.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/getenv.c
rename to jni/badvpn/ncd/modules/getenv.c
diff --git a/src/main/jni/badvpn/ncd/modules/if.c b/jni/badvpn/ncd/modules/if.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/if.c
rename to jni/badvpn/ncd/modules/if.c
diff --git a/src/main/jni/badvpn/ncd/modules/imperative.c b/jni/badvpn/ncd/modules/imperative.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/imperative.c
rename to jni/badvpn/ncd/modules/imperative.c
diff --git a/src/main/jni/badvpn/ncd/modules/implode.c b/jni/badvpn/ncd/modules/implode.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/implode.c
rename to jni/badvpn/ncd/modules/implode.c
diff --git a/src/main/jni/badvpn/ncd/modules/index.c b/jni/badvpn/ncd/modules/index.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/index.c
rename to jni/badvpn/ncd/modules/index.c
diff --git a/src/main/jni/badvpn/ncd/modules/list.c b/jni/badvpn/ncd/modules/list.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/list.c
rename to jni/badvpn/ncd/modules/list.c
diff --git a/src/main/jni/badvpn/ncd/modules/load_module.c b/jni/badvpn/ncd/modules/load_module.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/load_module.c
rename to jni/badvpn/ncd/modules/load_module.c
diff --git a/src/main/jni/badvpn/ncd/modules/log.c b/jni/badvpn/ncd/modules/log.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/log.c
rename to jni/badvpn/ncd/modules/log.c
diff --git a/src/main/jni/badvpn/ncd/modules/logical.c b/jni/badvpn/ncd/modules/logical.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/logical.c
rename to jni/badvpn/ncd/modules/logical.c
diff --git a/src/main/jni/badvpn/ncd/modules/modules.h b/jni/badvpn/ncd/modules/modules.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/modules.h
rename to jni/badvpn/ncd/modules/modules.h
diff --git a/src/main/jni/badvpn/ncd/modules/multidepend.c b/jni/badvpn/ncd/modules/multidepend.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/multidepend.c
rename to jni/badvpn/ncd/modules/multidepend.c
diff --git a/src/main/jni/badvpn/ncd/modules/net_backend_badvpn.c b/jni/badvpn/ncd/modules/net_backend_badvpn.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/net_backend_badvpn.c
rename to jni/badvpn/ncd/modules/net_backend_badvpn.c
diff --git a/src/main/jni/badvpn/ncd/modules/net_backend_rfkill.c b/jni/badvpn/ncd/modules/net_backend_rfkill.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/net_backend_rfkill.c
rename to jni/badvpn/ncd/modules/net_backend_rfkill.c
diff --git a/src/main/jni/badvpn/ncd/modules/net_backend_waitdevice.c b/jni/badvpn/ncd/modules/net_backend_waitdevice.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/net_backend_waitdevice.c
rename to jni/badvpn/ncd/modules/net_backend_waitdevice.c
diff --git a/src/main/jni/badvpn/ncd/modules/net_backend_waitlink.c b/jni/badvpn/ncd/modules/net_backend_waitlink.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/net_backend_waitlink.c
rename to jni/badvpn/ncd/modules/net_backend_waitlink.c
diff --git a/src/main/jni/badvpn/ncd/modules/net_backend_wpa_supplicant.c b/jni/badvpn/ncd/modules/net_backend_wpa_supplicant.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/net_backend_wpa_supplicant.c
rename to jni/badvpn/ncd/modules/net_backend_wpa_supplicant.c
diff --git a/src/main/jni/badvpn/ncd/modules/net_dns.c b/jni/badvpn/ncd/modules/net_dns.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/net_dns.c
rename to jni/badvpn/ncd/modules/net_dns.c
diff --git a/src/main/jni/badvpn/ncd/modules/net_iptables.c b/jni/badvpn/ncd/modules/net_iptables.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/net_iptables.c
rename to jni/badvpn/ncd/modules/net_iptables.c
diff --git a/src/main/jni/badvpn/ncd/modules/net_ipv4_addr.c b/jni/badvpn/ncd/modules/net_ipv4_addr.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/net_ipv4_addr.c
rename to jni/badvpn/ncd/modules/net_ipv4_addr.c
diff --git a/src/main/jni/badvpn/ncd/modules/net_ipv4_addr_in_network.c b/jni/badvpn/ncd/modules/net_ipv4_addr_in_network.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/net_ipv4_addr_in_network.c
rename to jni/badvpn/ncd/modules/net_ipv4_addr_in_network.c
diff --git a/src/main/jni/badvpn/ncd/modules/net_ipv4_arp_probe.c b/jni/badvpn/ncd/modules/net_ipv4_arp_probe.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/net_ipv4_arp_probe.c
rename to jni/badvpn/ncd/modules/net_ipv4_arp_probe.c
diff --git a/src/main/jni/badvpn/ncd/modules/net_ipv4_dhcp.c b/jni/badvpn/ncd/modules/net_ipv4_dhcp.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/net_ipv4_dhcp.c
rename to jni/badvpn/ncd/modules/net_ipv4_dhcp.c
diff --git a/src/main/jni/badvpn/ncd/modules/net_ipv4_route.c b/jni/badvpn/ncd/modules/net_ipv4_route.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/net_ipv4_route.c
rename to jni/badvpn/ncd/modules/net_ipv4_route.c
diff --git a/src/main/jni/badvpn/ncd/modules/net_ipv6_addr.c b/jni/badvpn/ncd/modules/net_ipv6_addr.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/net_ipv6_addr.c
rename to jni/badvpn/ncd/modules/net_ipv6_addr.c
diff --git a/src/main/jni/badvpn/ncd/modules/net_ipv6_addr_in_network.c b/jni/badvpn/ncd/modules/net_ipv6_addr_in_network.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/net_ipv6_addr_in_network.c
rename to jni/badvpn/ncd/modules/net_ipv6_addr_in_network.c
diff --git a/src/main/jni/badvpn/ncd/modules/net_ipv6_route.c b/jni/badvpn/ncd/modules/net_ipv6_route.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/net_ipv6_route.c
rename to jni/badvpn/ncd/modules/net_ipv6_route.c
diff --git a/src/main/jni/badvpn/ncd/modules/net_ipv6_wait_dynamic_addr.c b/jni/badvpn/ncd/modules/net_ipv6_wait_dynamic_addr.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/net_ipv6_wait_dynamic_addr.c
rename to jni/badvpn/ncd/modules/net_ipv6_wait_dynamic_addr.c
diff --git a/src/main/jni/badvpn/ncd/modules/net_up.c b/jni/badvpn/ncd/modules/net_up.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/net_up.c
rename to jni/badvpn/ncd/modules/net_up.c
diff --git a/src/main/jni/badvpn/ncd/modules/net_watch_interfaces.c b/jni/badvpn/ncd/modules/net_watch_interfaces.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/net_watch_interfaces.c
rename to jni/badvpn/ncd/modules/net_watch_interfaces.c
diff --git a/src/main/jni/badvpn/ncd/modules/netmask.c b/jni/badvpn/ncd/modules/netmask.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/netmask.c
rename to jni/badvpn/ncd/modules/netmask.c
diff --git a/src/main/jni/badvpn/ncd/modules/ondemand.c b/jni/badvpn/ncd/modules/ondemand.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/ondemand.c
rename to jni/badvpn/ncd/modules/ondemand.c
diff --git a/src/main/jni/badvpn/ncd/modules/parse.c b/jni/badvpn/ncd/modules/parse.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/parse.c
rename to jni/badvpn/ncd/modules/parse.c
diff --git a/src/main/jni/badvpn/ncd/modules/print.c b/jni/badvpn/ncd/modules/print.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/print.c
rename to jni/badvpn/ncd/modules/print.c
diff --git a/src/main/jni/badvpn/ncd/modules/process_manager.c b/jni/badvpn/ncd/modules/process_manager.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/process_manager.c
rename to jni/badvpn/ncd/modules/process_manager.c
diff --git a/src/main/jni/badvpn/ncd/modules/reboot.c b/jni/badvpn/ncd/modules/reboot.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/reboot.c
rename to jni/badvpn/ncd/modules/reboot.c
diff --git a/src/main/jni/badvpn/ncd/modules/ref.c b/jni/badvpn/ncd/modules/ref.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/ref.c
rename to jni/badvpn/ncd/modules/ref.c
diff --git a/src/main/jni/badvpn/ncd/modules/regex_match.c b/jni/badvpn/ncd/modules/regex_match.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/regex_match.c
rename to jni/badvpn/ncd/modules/regex_match.c
diff --git a/src/main/jni/badvpn/ncd/modules/run.c b/jni/badvpn/ncd/modules/run.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/run.c
rename to jni/badvpn/ncd/modules/run.c
diff --git a/src/main/jni/badvpn/ncd/modules/runonce.c b/jni/badvpn/ncd/modules/runonce.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/runonce.c
rename to jni/badvpn/ncd/modules/runonce.c
diff --git a/src/main/jni/badvpn/ncd/modules/sleep.c b/jni/badvpn/ncd/modules/sleep.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/sleep.c
rename to jni/badvpn/ncd/modules/sleep.c
diff --git a/src/main/jni/badvpn/ncd/modules/socket.c b/jni/badvpn/ncd/modules/socket.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/socket.c
rename to jni/badvpn/ncd/modules/socket.c
diff --git a/src/main/jni/badvpn/ncd/modules/spawn.c b/jni/badvpn/ncd/modules/spawn.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/spawn.c
rename to jni/badvpn/ncd/modules/spawn.c
diff --git a/src/main/jni/badvpn/ncd/modules/strcmp.c b/jni/badvpn/ncd/modules/strcmp.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/strcmp.c
rename to jni/badvpn/ncd/modules/strcmp.c
diff --git a/src/main/jni/badvpn/ncd/modules/substr.c b/jni/badvpn/ncd/modules/substr.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/substr.c
rename to jni/badvpn/ncd/modules/substr.c
diff --git a/src/main/jni/badvpn/ncd/modules/sys_evdev.c b/jni/badvpn/ncd/modules/sys_evdev.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/sys_evdev.c
rename to jni/badvpn/ncd/modules/sys_evdev.c
diff --git a/src/main/jni/badvpn/ncd/modules/sys_request_client.c b/jni/badvpn/ncd/modules/sys_request_client.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/sys_request_client.c
rename to jni/badvpn/ncd/modules/sys_request_client.c
diff --git a/src/main/jni/badvpn/ncd/modules/sys_request_server.c b/jni/badvpn/ncd/modules/sys_request_server.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/sys_request_server.c
rename to jni/badvpn/ncd/modules/sys_request_server.c
diff --git a/src/main/jni/badvpn/ncd/modules/sys_start_process.c b/jni/badvpn/ncd/modules/sys_start_process.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/sys_start_process.c
rename to jni/badvpn/ncd/modules/sys_start_process.c
diff --git a/src/main/jni/badvpn/ncd/modules/sys_watch_directory.c b/jni/badvpn/ncd/modules/sys_watch_directory.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/sys_watch_directory.c
rename to jni/badvpn/ncd/modules/sys_watch_directory.c
diff --git a/src/main/jni/badvpn/ncd/modules/sys_watch_input.c b/jni/badvpn/ncd/modules/sys_watch_input.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/sys_watch_input.c
rename to jni/badvpn/ncd/modules/sys_watch_input.c
diff --git a/src/main/jni/badvpn/ncd/modules/sys_watch_usb.c b/jni/badvpn/ncd/modules/sys_watch_usb.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/sys_watch_usb.c
rename to jni/badvpn/ncd/modules/sys_watch_usb.c
diff --git a/src/main/jni/badvpn/ncd/modules/timer.c b/jni/badvpn/ncd/modules/timer.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/timer.c
rename to jni/badvpn/ncd/modules/timer.c
diff --git a/src/main/jni/badvpn/ncd/modules/to_string.c b/jni/badvpn/ncd/modules/to_string.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/to_string.c
rename to jni/badvpn/ncd/modules/to_string.c
diff --git a/src/main/jni/badvpn/ncd/modules/try.c b/jni/badvpn/ncd/modules/try.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/try.c
rename to jni/badvpn/ncd/modules/try.c
diff --git a/src/main/jni/badvpn/ncd/modules/value.c b/jni/badvpn/ncd/modules/value.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/value.c
rename to jni/badvpn/ncd/modules/value.c
diff --git a/src/main/jni/badvpn/ncd/modules/value_maptree.h b/jni/badvpn/ncd/modules/value_maptree.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/value_maptree.h
rename to jni/badvpn/ncd/modules/value_maptree.h
diff --git a/src/main/jni/badvpn/ncd/modules/valuemetic.c b/jni/badvpn/ncd/modules/valuemetic.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/valuemetic.c
rename to jni/badvpn/ncd/modules/valuemetic.c
diff --git a/src/main/jni/badvpn/ncd/modules/var.c b/jni/badvpn/ncd/modules/var.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/modules/var.c
rename to jni/badvpn/ncd/modules/var.c
diff --git a/src/main/jni/badvpn/ncd/ncd.c b/jni/badvpn/ncd/ncd.c
similarity index 100%
rename from src/main/jni/badvpn/ncd/ncd.c
rename to jni/badvpn/ncd/ncd.c
diff --git a/src/main/jni/badvpn/ncd/ncd.h b/jni/badvpn/ncd/ncd.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/ncd.h
rename to jni/badvpn/ncd/ncd.h
diff --git a/src/main/jni/badvpn/ncd/parse_linux_input.sh b/jni/badvpn/ncd/parse_linux_input.sh
similarity index 100%
rename from src/main/jni/badvpn/ncd/parse_linux_input.sh
rename to jni/badvpn/ncd/parse_linux_input.sh
diff --git a/src/main/jni/badvpn/ncd/static_strings.h b/jni/badvpn/ncd/static_strings.h
similarity index 100%
rename from src/main/jni/badvpn/ncd/static_strings.h
rename to jni/badvpn/ncd/static_strings.h
diff --git a/src/main/jni/badvpn/ncd/tests/addr_in_network.ncd b/jni/badvpn/ncd/tests/addr_in_network.ncd
similarity index 100%
rename from src/main/jni/badvpn/ncd/tests/addr_in_network.ncd
rename to jni/badvpn/ncd/tests/addr_in_network.ncd
diff --git a/src/main/jni/badvpn/ncd/tests/alias.ncd b/jni/badvpn/ncd/tests/alias.ncd
similarity index 100%
rename from src/main/jni/badvpn/ncd/tests/alias.ncd
rename to jni/badvpn/ncd/tests/alias.ncd
diff --git a/src/main/jni/badvpn/ncd/tests/arithmetic.ncd b/jni/badvpn/ncd/tests/arithmetic.ncd
similarity index 100%
rename from src/main/jni/badvpn/ncd/tests/arithmetic.ncd
rename to jni/badvpn/ncd/tests/arithmetic.ncd
diff --git a/src/main/jni/badvpn/ncd/tests/backtracking.ncd b/jni/badvpn/ncd/tests/backtracking.ncd
similarity index 100%
rename from src/main/jni/badvpn/ncd/tests/backtracking.ncd
rename to jni/badvpn/ncd/tests/backtracking.ncd
diff --git a/src/main/jni/badvpn/ncd/tests/buffer.ncd b/jni/badvpn/ncd/tests/buffer.ncd
similarity index 100%
rename from src/main/jni/badvpn/ncd/tests/buffer.ncd
rename to jni/badvpn/ncd/tests/buffer.ncd
diff --git a/src/main/jni/badvpn/ncd/tests/call.ncd b/jni/badvpn/ncd/tests/call.ncd
similarity index 100%
rename from src/main/jni/badvpn/ncd/tests/call.ncd
rename to jni/badvpn/ncd/tests/call.ncd
diff --git a/src/main/jni/badvpn/ncd/tests/concat.ncd b/jni/badvpn/ncd/tests/concat.ncd
similarity index 100%
rename from src/main/jni/badvpn/ncd/tests/concat.ncd
rename to jni/badvpn/ncd/tests/concat.ncd
diff --git a/src/main/jni/badvpn/ncd/tests/depend.ncd b/jni/badvpn/ncd/tests/depend.ncd
similarity index 100%
rename from src/main/jni/badvpn/ncd/tests/depend.ncd
rename to jni/badvpn/ncd/tests/depend.ncd
diff --git a/src/main/jni/badvpn/ncd/tests/depend_scope.ncd b/jni/badvpn/ncd/tests/depend_scope.ncd
similarity index 100%
rename from src/main/jni/badvpn/ncd/tests/depend_scope.ncd
rename to jni/badvpn/ncd/tests/depend_scope.ncd
diff --git a/src/main/jni/badvpn/ncd/tests/escape_and_nulls.ncd b/jni/badvpn/ncd/tests/escape_and_nulls.ncd
similarity index 100%
rename from src/main/jni/badvpn/ncd/tests/escape_and_nulls.ncd
rename to jni/badvpn/ncd/tests/escape_and_nulls.ncd
diff --git a/src/main/jni/badvpn/ncd/tests/explode.ncd b/jni/badvpn/ncd/tests/explode.ncd
similarity index 100%
rename from src/main/jni/badvpn/ncd/tests/explode.ncd
rename to jni/badvpn/ncd/tests/explode.ncd
diff --git a/src/main/jni/badvpn/ncd/tests/foreach.ncd b/jni/badvpn/ncd/tests/foreach.ncd
similarity index 100%
rename from src/main/jni/badvpn/ncd/tests/foreach.ncd
rename to jni/badvpn/ncd/tests/foreach.ncd
diff --git a/src/main/jni/badvpn/ncd/tests/if.ncd b/jni/badvpn/ncd/tests/if.ncd
similarity index 100%
rename from src/main/jni/badvpn/ncd/tests/if.ncd
rename to jni/badvpn/ncd/tests/if.ncd
diff --git a/src/main/jni/badvpn/ncd/tests/implode.ncd b/jni/badvpn/ncd/tests/implode.ncd
similarity index 100%
rename from src/main/jni/badvpn/ncd/tests/implode.ncd
rename to jni/badvpn/ncd/tests/implode.ncd
diff --git a/src/main/jni/badvpn/ncd/tests/include.ncd b/jni/badvpn/ncd/tests/include.ncd
similarity index 100%
rename from src/main/jni/badvpn/ncd/tests/include.ncd
rename to jni/badvpn/ncd/tests/include.ncd
diff --git a/src/main/jni/badvpn/ncd/tests/include_included.ncdi b/jni/badvpn/ncd/tests/include_included.ncdi
similarity index 100%
rename from src/main/jni/badvpn/ncd/tests/include_included.ncdi
rename to jni/badvpn/ncd/tests/include_included.ncdi
diff --git a/src/main/jni/badvpn/ncd/tests/include_included2.ncdi b/jni/badvpn/ncd/tests/include_included2.ncdi
similarity index 100%
rename from src/main/jni/badvpn/ncd/tests/include_included2.ncdi
rename to jni/badvpn/ncd/tests/include_included2.ncdi
diff --git a/src/main/jni/badvpn/ncd/tests/logical.ncd b/jni/badvpn/ncd/tests/logical.ncd
similarity index 100%
rename from src/main/jni/badvpn/ncd/tests/logical.ncd
rename to jni/badvpn/ncd/tests/logical.ncd
diff --git a/src/main/jni/badvpn/ncd/tests/multidepend.ncd b/jni/badvpn/ncd/tests/multidepend.ncd
similarity index 100%
rename from src/main/jni/badvpn/ncd/tests/multidepend.ncd
rename to jni/badvpn/ncd/tests/multidepend.ncd
diff --git a/src/main/jni/badvpn/ncd/tests/netmask.ncd b/jni/badvpn/ncd/tests/netmask.ncd
similarity index 100%
rename from src/main/jni/badvpn/ncd/tests/netmask.ncd
rename to jni/badvpn/ncd/tests/netmask.ncd
diff --git a/src/main/jni/badvpn/ncd/tests/parse.ncd b/jni/badvpn/ncd/tests/parse.ncd
similarity index 100%
rename from src/main/jni/badvpn/ncd/tests/parse.ncd
rename to jni/badvpn/ncd/tests/parse.ncd
diff --git a/src/main/jni/badvpn/ncd/tests/process_manager.ncd b/jni/badvpn/ncd/tests/process_manager.ncd
similarity index 100%
rename from src/main/jni/badvpn/ncd/tests/process_manager.ncd
rename to jni/badvpn/ncd/tests/process_manager.ncd
diff --git a/src/main/jni/badvpn/ncd/tests/regex.ncd b/jni/badvpn/ncd/tests/regex.ncd
similarity index 100%
rename from src/main/jni/badvpn/ncd/tests/regex.ncd
rename to jni/badvpn/ncd/tests/regex.ncd
diff --git a/src/main/jni/badvpn/ncd/tests/run_tests b/jni/badvpn/ncd/tests/run_tests
similarity index 100%
rename from src/main/jni/badvpn/ncd/tests/run_tests
rename to jni/badvpn/ncd/tests/run_tests
diff --git a/src/main/jni/badvpn/ncd/tests/strings.ncd b/jni/badvpn/ncd/tests/strings.ncd
similarity index 100%
rename from src/main/jni/badvpn/ncd/tests/strings.ncd
rename to jni/badvpn/ncd/tests/strings.ncd
diff --git a/src/main/jni/badvpn/ncd/tests/substr.ncd b/jni/badvpn/ncd/tests/substr.ncd
similarity index 100%
rename from src/main/jni/badvpn/ncd/tests/substr.ncd
rename to jni/badvpn/ncd/tests/substr.ncd
diff --git a/src/main/jni/badvpn/ncd/tests/turing.ncd b/jni/badvpn/ncd/tests/turing.ncd
similarity index 100%
rename from src/main/jni/badvpn/ncd/tests/turing.ncd
rename to jni/badvpn/ncd/tests/turing.ncd
diff --git a/src/main/jni/badvpn/ncd/tests/value.ncd b/jni/badvpn/ncd/tests/value.ncd
similarity index 100%
rename from src/main/jni/badvpn/ncd/tests/value.ncd
rename to jni/badvpn/ncd/tests/value.ncd
diff --git a/src/main/jni/badvpn/ncd/tests/value_substr.ncd b/jni/badvpn/ncd/tests/value_substr.ncd
similarity index 100%
rename from src/main/jni/badvpn/ncd/tests/value_substr.ncd
rename to jni/badvpn/ncd/tests/value_substr.ncd
diff --git a/src/main/jni/badvpn/nspr_support/BSSLConnection.c b/jni/badvpn/nspr_support/BSSLConnection.c
similarity index 100%
rename from src/main/jni/badvpn/nspr_support/BSSLConnection.c
rename to jni/badvpn/nspr_support/BSSLConnection.c
diff --git a/src/main/jni/badvpn/nspr_support/BSSLConnection.h b/jni/badvpn/nspr_support/BSSLConnection.h
similarity index 100%
rename from src/main/jni/badvpn/nspr_support/BSSLConnection.h
rename to jni/badvpn/nspr_support/BSSLConnection.h
diff --git a/src/main/jni/badvpn/nspr_support/CMakeLists.txt b/jni/badvpn/nspr_support/CMakeLists.txt
similarity index 100%
rename from src/main/jni/badvpn/nspr_support/CMakeLists.txt
rename to jni/badvpn/nspr_support/CMakeLists.txt
diff --git a/src/main/jni/badvpn/nspr_support/DummyPRFileDesc.c b/jni/badvpn/nspr_support/DummyPRFileDesc.c
similarity index 100%
rename from src/main/jni/badvpn/nspr_support/DummyPRFileDesc.c
rename to jni/badvpn/nspr_support/DummyPRFileDesc.c
diff --git a/src/main/jni/badvpn/nspr_support/DummyPRFileDesc.h b/jni/badvpn/nspr_support/DummyPRFileDesc.h
similarity index 100%
rename from src/main/jni/badvpn/nspr_support/DummyPRFileDesc.h
rename to jni/badvpn/nspr_support/DummyPRFileDesc.h
diff --git a/src/main/jni/badvpn/predicate/BPredicate.c b/jni/badvpn/predicate/BPredicate.c
similarity index 100%
rename from src/main/jni/badvpn/predicate/BPredicate.c
rename to jni/badvpn/predicate/BPredicate.c
diff --git a/src/main/jni/badvpn/predicate/BPredicate.h b/jni/badvpn/predicate/BPredicate.h
similarity index 100%
rename from src/main/jni/badvpn/predicate/BPredicate.h
rename to jni/badvpn/predicate/BPredicate.h
diff --git a/src/main/jni/badvpn/predicate/BPredicate.l b/jni/badvpn/predicate/BPredicate.l
similarity index 100%
rename from src/main/jni/badvpn/predicate/BPredicate.l
rename to jni/badvpn/predicate/BPredicate.l
diff --git a/src/main/jni/badvpn/predicate/BPredicate.y b/jni/badvpn/predicate/BPredicate.y
similarity index 100%
rename from src/main/jni/badvpn/predicate/BPredicate.y
rename to jni/badvpn/predicate/BPredicate.y
diff --git a/src/main/jni/badvpn/predicate/BPredicate_internal.h b/jni/badvpn/predicate/BPredicate_internal.h
similarity index 100%
rename from src/main/jni/badvpn/predicate/BPredicate_internal.h
rename to jni/badvpn/predicate/BPredicate_internal.h
diff --git a/src/main/jni/badvpn/predicate/BPredicate_parser.h b/jni/badvpn/predicate/BPredicate_parser.h
similarity index 100%
rename from src/main/jni/badvpn/predicate/BPredicate_parser.h
rename to jni/badvpn/predicate/BPredicate_parser.h
diff --git a/src/main/jni/badvpn/predicate/CMakeLists.txt b/jni/badvpn/predicate/CMakeLists.txt
similarity index 100%
rename from src/main/jni/badvpn/predicate/CMakeLists.txt
rename to jni/badvpn/predicate/CMakeLists.txt
diff --git a/src/main/jni/badvpn/predicate/LexMemoryBufferInput.h b/jni/badvpn/predicate/LexMemoryBufferInput.h
similarity index 100%
rename from src/main/jni/badvpn/predicate/LexMemoryBufferInput.h
rename to jni/badvpn/predicate/LexMemoryBufferInput.h
diff --git a/src/main/jni/badvpn/protocol/addr.bproto b/jni/badvpn/protocol/addr.bproto
similarity index 100%
rename from src/main/jni/badvpn/protocol/addr.bproto
rename to jni/badvpn/protocol/addr.bproto
diff --git a/src/main/jni/badvpn/protocol/addr.h b/jni/badvpn/protocol/addr.h
similarity index 100%
rename from src/main/jni/badvpn/protocol/addr.h
rename to jni/badvpn/protocol/addr.h
diff --git a/src/main/jni/badvpn/protocol/dataproto.h b/jni/badvpn/protocol/dataproto.h
similarity index 100%
rename from src/main/jni/badvpn/protocol/dataproto.h
rename to jni/badvpn/protocol/dataproto.h
diff --git a/src/main/jni/badvpn/protocol/fragmentproto.h b/jni/badvpn/protocol/fragmentproto.h
similarity index 100%
rename from src/main/jni/badvpn/protocol/fragmentproto.h
rename to jni/badvpn/protocol/fragmentproto.h
diff --git a/src/main/jni/badvpn/protocol/msgproto.bproto b/jni/badvpn/protocol/msgproto.bproto
similarity index 100%
rename from src/main/jni/badvpn/protocol/msgproto.bproto
rename to jni/badvpn/protocol/msgproto.bproto
diff --git a/src/main/jni/badvpn/protocol/msgproto.h b/jni/badvpn/protocol/msgproto.h
similarity index 100%
rename from src/main/jni/badvpn/protocol/msgproto.h
rename to jni/badvpn/protocol/msgproto.h
diff --git a/src/main/jni/badvpn/protocol/packetproto.h b/jni/badvpn/protocol/packetproto.h
similarity index 100%
rename from src/main/jni/badvpn/protocol/packetproto.h
rename to jni/badvpn/protocol/packetproto.h
diff --git a/src/main/jni/badvpn/protocol/requestproto.h b/jni/badvpn/protocol/requestproto.h
similarity index 100%
rename from src/main/jni/badvpn/protocol/requestproto.h
rename to jni/badvpn/protocol/requestproto.h
diff --git a/src/main/jni/badvpn/protocol/scproto.h b/jni/badvpn/protocol/scproto.h
similarity index 100%
rename from src/main/jni/badvpn/protocol/scproto.h
rename to jni/badvpn/protocol/scproto.h
diff --git a/src/main/jni/badvpn/protocol/spproto.h b/jni/badvpn/protocol/spproto.h
similarity index 100%
rename from src/main/jni/badvpn/protocol/spproto.h
rename to jni/badvpn/protocol/spproto.h
diff --git a/src/main/jni/badvpn/protocol/udpgw_proto.h b/jni/badvpn/protocol/udpgw_proto.h
similarity index 100%
rename from src/main/jni/badvpn/protocol/udpgw_proto.h
rename to jni/badvpn/protocol/udpgw_proto.h
diff --git a/src/main/jni/badvpn/random/BRandom2.c b/jni/badvpn/random/BRandom2.c
similarity index 100%
rename from src/main/jni/badvpn/random/BRandom2.c
rename to jni/badvpn/random/BRandom2.c
diff --git a/src/main/jni/badvpn/random/BRandom2.h b/jni/badvpn/random/BRandom2.h
similarity index 100%
rename from src/main/jni/badvpn/random/BRandom2.h
rename to jni/badvpn/random/BRandom2.h
diff --git a/src/main/jni/badvpn/random/CMakeLists.txt b/jni/badvpn/random/CMakeLists.txt
similarity index 100%
rename from src/main/jni/badvpn/random/CMakeLists.txt
rename to jni/badvpn/random/CMakeLists.txt
diff --git a/src/main/jni/badvpn/scripts/cmake b/jni/badvpn/scripts/cmake
similarity index 100%
rename from src/main/jni/badvpn/scripts/cmake
rename to jni/badvpn/scripts/cmake
diff --git a/src/main/jni/badvpn/scripts/copy_nss b/jni/badvpn/scripts/copy_nss
similarity index 100%
rename from src/main/jni/badvpn/scripts/copy_nss
rename to jni/badvpn/scripts/copy_nss
diff --git a/src/main/jni/badvpn/scripts/toolchain.cmake b/jni/badvpn/scripts/toolchain.cmake
similarity index 100%
rename from src/main/jni/badvpn/scripts/toolchain.cmake
rename to jni/badvpn/scripts/toolchain.cmake
diff --git a/src/main/jni/badvpn/security/BEncryption.c b/jni/badvpn/security/BEncryption.c
similarity index 100%
rename from src/main/jni/badvpn/security/BEncryption.c
rename to jni/badvpn/security/BEncryption.c
diff --git a/src/main/jni/badvpn/security/BEncryption.h b/jni/badvpn/security/BEncryption.h
similarity index 100%
rename from src/main/jni/badvpn/security/BEncryption.h
rename to jni/badvpn/security/BEncryption.h
diff --git a/src/main/jni/badvpn/security/BHash.c b/jni/badvpn/security/BHash.c
similarity index 100%
rename from src/main/jni/badvpn/security/BHash.c
rename to jni/badvpn/security/BHash.c
diff --git a/src/main/jni/badvpn/security/BHash.h b/jni/badvpn/security/BHash.h
similarity index 100%
rename from src/main/jni/badvpn/security/BHash.h
rename to jni/badvpn/security/BHash.h
diff --git a/src/main/jni/badvpn/security/BRandom.c b/jni/badvpn/security/BRandom.c
similarity index 100%
rename from src/main/jni/badvpn/security/BRandom.c
rename to jni/badvpn/security/BRandom.c
diff --git a/src/main/jni/badvpn/security/BRandom.h b/jni/badvpn/security/BRandom.h
similarity index 100%
rename from src/main/jni/badvpn/security/BRandom.h
rename to jni/badvpn/security/BRandom.h
diff --git a/src/main/jni/badvpn/security/BSecurity.c b/jni/badvpn/security/BSecurity.c
similarity index 100%
rename from src/main/jni/badvpn/security/BSecurity.c
rename to jni/badvpn/security/BSecurity.c
diff --git a/src/main/jni/badvpn/security/BSecurity.h b/jni/badvpn/security/BSecurity.h
similarity index 100%
rename from src/main/jni/badvpn/security/BSecurity.h
rename to jni/badvpn/security/BSecurity.h
diff --git a/src/main/jni/badvpn/security/CMakeLists.txt b/jni/badvpn/security/CMakeLists.txt
similarity index 100%
rename from src/main/jni/badvpn/security/CMakeLists.txt
rename to jni/badvpn/security/CMakeLists.txt
diff --git a/src/main/jni/badvpn/security/OTPCalculator.c b/jni/badvpn/security/OTPCalculator.c
similarity index 100%
rename from src/main/jni/badvpn/security/OTPCalculator.c
rename to jni/badvpn/security/OTPCalculator.c
diff --git a/src/main/jni/badvpn/security/OTPCalculator.h b/jni/badvpn/security/OTPCalculator.h
similarity index 100%
rename from src/main/jni/badvpn/security/OTPCalculator.h
rename to jni/badvpn/security/OTPCalculator.h
diff --git a/src/main/jni/badvpn/security/OTPChecker.c b/jni/badvpn/security/OTPChecker.c
similarity index 100%
rename from src/main/jni/badvpn/security/OTPChecker.c
rename to jni/badvpn/security/OTPChecker.c
diff --git a/src/main/jni/badvpn/security/OTPChecker.h b/jni/badvpn/security/OTPChecker.h
similarity index 100%
rename from src/main/jni/badvpn/security/OTPChecker.h
rename to jni/badvpn/security/OTPChecker.h
diff --git a/src/main/jni/badvpn/security/OTPGenerator.c b/jni/badvpn/security/OTPGenerator.c
similarity index 100%
rename from src/main/jni/badvpn/security/OTPGenerator.c
rename to jni/badvpn/security/OTPGenerator.c
diff --git a/src/main/jni/badvpn/security/OTPGenerator.h b/jni/badvpn/security/OTPGenerator.h
similarity index 100%
rename from src/main/jni/badvpn/security/OTPGenerator.h
rename to jni/badvpn/security/OTPGenerator.h
diff --git a/src/main/jni/badvpn/server/CMakeLists.txt b/jni/badvpn/server/CMakeLists.txt
similarity index 100%
rename from src/main/jni/badvpn/server/CMakeLists.txt
rename to jni/badvpn/server/CMakeLists.txt
diff --git a/src/main/jni/badvpn/server/badvpn-server.8 b/jni/badvpn/server/badvpn-server.8
similarity index 100%
rename from src/main/jni/badvpn/server/badvpn-server.8
rename to jni/badvpn/server/badvpn-server.8
diff --git a/src/main/jni/badvpn/server/server.c b/jni/badvpn/server/server.c
similarity index 100%
rename from src/main/jni/badvpn/server/server.c
rename to jni/badvpn/server/server.c
diff --git a/src/main/jni/badvpn/server/server.h b/jni/badvpn/server/server.h
similarity index 100%
rename from src/main/jni/badvpn/server/server.h
rename to jni/badvpn/server/server.h
diff --git a/src/main/jni/badvpn/server_connection/CMakeLists.txt b/jni/badvpn/server_connection/CMakeLists.txt
similarity index 100%
rename from src/main/jni/badvpn/server_connection/CMakeLists.txt
rename to jni/badvpn/server_connection/CMakeLists.txt
diff --git a/src/main/jni/badvpn/server_connection/SCKeepaliveSource.c b/jni/badvpn/server_connection/SCKeepaliveSource.c
similarity index 100%
rename from src/main/jni/badvpn/server_connection/SCKeepaliveSource.c
rename to jni/badvpn/server_connection/SCKeepaliveSource.c
diff --git a/src/main/jni/badvpn/server_connection/SCKeepaliveSource.h b/jni/badvpn/server_connection/SCKeepaliveSource.h
similarity index 100%
rename from src/main/jni/badvpn/server_connection/SCKeepaliveSource.h
rename to jni/badvpn/server_connection/SCKeepaliveSource.h
diff --git a/src/main/jni/badvpn/server_connection/ServerConnection.c b/jni/badvpn/server_connection/ServerConnection.c
similarity index 100%
rename from src/main/jni/badvpn/server_connection/ServerConnection.c
rename to jni/badvpn/server_connection/ServerConnection.c
diff --git a/src/main/jni/badvpn/server_connection/ServerConnection.h b/jni/badvpn/server_connection/ServerConnection.h
similarity index 100%
rename from src/main/jni/badvpn/server_connection/ServerConnection.h
rename to jni/badvpn/server_connection/ServerConnection.h
diff --git a/src/main/jni/badvpn/socksclient/BSocksClient.c b/jni/badvpn/socksclient/BSocksClient.c
similarity index 100%
rename from src/main/jni/badvpn/socksclient/BSocksClient.c
rename to jni/badvpn/socksclient/BSocksClient.c
diff --git a/src/main/jni/badvpn/socksclient/BSocksClient.h b/jni/badvpn/socksclient/BSocksClient.h
similarity index 100%
rename from src/main/jni/badvpn/socksclient/BSocksClient.h
rename to jni/badvpn/socksclient/BSocksClient.h
diff --git a/src/main/jni/badvpn/socksclient/CMakeLists.txt b/jni/badvpn/socksclient/CMakeLists.txt
similarity index 100%
rename from src/main/jni/badvpn/socksclient/CMakeLists.txt
rename to jni/badvpn/socksclient/CMakeLists.txt
diff --git a/src/main/jni/badvpn/stringmap/BStringMap.c b/jni/badvpn/stringmap/BStringMap.c
similarity index 100%
rename from src/main/jni/badvpn/stringmap/BStringMap.c
rename to jni/badvpn/stringmap/BStringMap.c
diff --git a/src/main/jni/badvpn/stringmap/BStringMap.h b/jni/badvpn/stringmap/BStringMap.h
similarity index 100%
rename from src/main/jni/badvpn/stringmap/BStringMap.h
rename to jni/badvpn/stringmap/BStringMap.h
diff --git a/src/main/jni/badvpn/stringmap/CMakeLists.txt b/jni/badvpn/stringmap/CMakeLists.txt
similarity index 100%
rename from src/main/jni/badvpn/stringmap/CMakeLists.txt
rename to jni/badvpn/stringmap/CMakeLists.txt
diff --git a/src/main/jni/badvpn/structure/BAVL.h b/jni/badvpn/structure/BAVL.h
similarity index 100%
rename from src/main/jni/badvpn/structure/BAVL.h
rename to jni/badvpn/structure/BAVL.h
diff --git a/src/main/jni/badvpn/structure/CAvl.h b/jni/badvpn/structure/CAvl.h
similarity index 100%
rename from src/main/jni/badvpn/structure/CAvl.h
rename to jni/badvpn/structure/CAvl.h
diff --git a/src/main/jni/badvpn/structure/CAvl_decl.h b/jni/badvpn/structure/CAvl_decl.h
similarity index 100%
rename from src/main/jni/badvpn/structure/CAvl_decl.h
rename to jni/badvpn/structure/CAvl_decl.h
diff --git a/src/main/jni/badvpn/structure/CAvl_footer.h b/jni/badvpn/structure/CAvl_footer.h
similarity index 100%
rename from src/main/jni/badvpn/structure/CAvl_footer.h
rename to jni/badvpn/structure/CAvl_footer.h
diff --git a/src/main/jni/badvpn/structure/CAvl_header.h b/jni/badvpn/structure/CAvl_header.h
similarity index 100%
rename from src/main/jni/badvpn/structure/CAvl_header.h
rename to jni/badvpn/structure/CAvl_header.h
diff --git a/src/main/jni/badvpn/structure/CAvl_impl.h b/jni/badvpn/structure/CAvl_impl.h
similarity index 100%
rename from src/main/jni/badvpn/structure/CAvl_impl.h
rename to jni/badvpn/structure/CAvl_impl.h
diff --git a/src/main/jni/badvpn/structure/CHash.h b/jni/badvpn/structure/CHash.h
similarity index 100%
rename from src/main/jni/badvpn/structure/CHash.h
rename to jni/badvpn/structure/CHash.h
diff --git a/src/main/jni/badvpn/structure/CHash_decl.h b/jni/badvpn/structure/CHash_decl.h
similarity index 100%
rename from src/main/jni/badvpn/structure/CHash_decl.h
rename to jni/badvpn/structure/CHash_decl.h
diff --git a/src/main/jni/badvpn/structure/CHash_footer.h b/jni/badvpn/structure/CHash_footer.h
similarity index 100%
rename from src/main/jni/badvpn/structure/CHash_footer.h
rename to jni/badvpn/structure/CHash_footer.h
diff --git a/src/main/jni/badvpn/structure/CHash_header.h b/jni/badvpn/structure/CHash_header.h
similarity index 100%
rename from src/main/jni/badvpn/structure/CHash_header.h
rename to jni/badvpn/structure/CHash_header.h
diff --git a/src/main/jni/badvpn/structure/CHash_impl.h b/jni/badvpn/structure/CHash_impl.h
similarity index 100%
rename from src/main/jni/badvpn/structure/CHash_impl.h
rename to jni/badvpn/structure/CHash_impl.h
diff --git a/src/main/jni/badvpn/structure/ChunkBuffer2.h b/jni/badvpn/structure/ChunkBuffer2.h
similarity index 100%
rename from src/main/jni/badvpn/structure/ChunkBuffer2.h
rename to jni/badvpn/structure/ChunkBuffer2.h
diff --git a/src/main/jni/badvpn/structure/IndexedList.h b/jni/badvpn/structure/IndexedList.h
similarity index 100%
rename from src/main/jni/badvpn/structure/IndexedList.h
rename to jni/badvpn/structure/IndexedList.h
diff --git a/src/main/jni/badvpn/structure/IndexedList_tree.h b/jni/badvpn/structure/IndexedList_tree.h
similarity index 100%
rename from src/main/jni/badvpn/structure/IndexedList_tree.h
rename to jni/badvpn/structure/IndexedList_tree.h
diff --git a/src/main/jni/badvpn/structure/LinkedList0.h b/jni/badvpn/structure/LinkedList0.h
similarity index 100%
rename from src/main/jni/badvpn/structure/LinkedList0.h
rename to jni/badvpn/structure/LinkedList0.h
diff --git a/src/main/jni/badvpn/structure/LinkedList1.h b/jni/badvpn/structure/LinkedList1.h
similarity index 100%
rename from src/main/jni/badvpn/structure/LinkedList1.h
rename to jni/badvpn/structure/LinkedList1.h
diff --git a/src/main/jni/badvpn/structure/LinkedList3.h b/jni/badvpn/structure/LinkedList3.h
similarity index 100%
rename from src/main/jni/badvpn/structure/LinkedList3.h
rename to jni/badvpn/structure/LinkedList3.h
diff --git a/src/main/jni/badvpn/structure/SAvl.h b/jni/badvpn/structure/SAvl.h
similarity index 100%
rename from src/main/jni/badvpn/structure/SAvl.h
rename to jni/badvpn/structure/SAvl.h
diff --git a/src/main/jni/badvpn/structure/SAvl_decl.h b/jni/badvpn/structure/SAvl_decl.h
similarity index 100%
rename from src/main/jni/badvpn/structure/SAvl_decl.h
rename to jni/badvpn/structure/SAvl_decl.h
diff --git a/src/main/jni/badvpn/structure/SAvl_footer.h b/jni/badvpn/structure/SAvl_footer.h
similarity index 100%
rename from src/main/jni/badvpn/structure/SAvl_footer.h
rename to jni/badvpn/structure/SAvl_footer.h
diff --git a/src/main/jni/badvpn/structure/SAvl_header.h b/jni/badvpn/structure/SAvl_header.h
similarity index 100%
rename from src/main/jni/badvpn/structure/SAvl_header.h
rename to jni/badvpn/structure/SAvl_header.h
diff --git a/src/main/jni/badvpn/structure/SAvl_impl.h b/jni/badvpn/structure/SAvl_impl.h
similarity index 100%
rename from src/main/jni/badvpn/structure/SAvl_impl.h
rename to jni/badvpn/structure/SAvl_impl.h
diff --git a/src/main/jni/badvpn/structure/SAvl_tree.h b/jni/badvpn/structure/SAvl_tree.h
similarity index 100%
rename from src/main/jni/badvpn/structure/SAvl_tree.h
rename to jni/badvpn/structure/SAvl_tree.h
diff --git a/src/main/jni/badvpn/structure/SLinkedList.h b/jni/badvpn/structure/SLinkedList.h
similarity index 100%
rename from src/main/jni/badvpn/structure/SLinkedList.h
rename to jni/badvpn/structure/SLinkedList.h
diff --git a/src/main/jni/badvpn/structure/SLinkedList_decl.h b/jni/badvpn/structure/SLinkedList_decl.h
similarity index 100%
rename from src/main/jni/badvpn/structure/SLinkedList_decl.h
rename to jni/badvpn/structure/SLinkedList_decl.h
diff --git a/src/main/jni/badvpn/structure/SLinkedList_footer.h b/jni/badvpn/structure/SLinkedList_footer.h
similarity index 100%
rename from src/main/jni/badvpn/structure/SLinkedList_footer.h
rename to jni/badvpn/structure/SLinkedList_footer.h
diff --git a/src/main/jni/badvpn/structure/SLinkedList_header.h b/jni/badvpn/structure/SLinkedList_header.h
similarity index 100%
rename from src/main/jni/badvpn/structure/SLinkedList_header.h
rename to jni/badvpn/structure/SLinkedList_header.h
diff --git a/src/main/jni/badvpn/structure/SLinkedList_impl.h b/jni/badvpn/structure/SLinkedList_impl.h
similarity index 100%
rename from src/main/jni/badvpn/structure/SLinkedList_impl.h
rename to jni/badvpn/structure/SLinkedList_impl.h
diff --git a/src/main/jni/badvpn/system/BAddr.h b/jni/badvpn/system/BAddr.h
similarity index 100%
rename from src/main/jni/badvpn/system/BAddr.h
rename to jni/badvpn/system/BAddr.h
diff --git a/src/main/jni/badvpn/system/BConnection.h b/jni/badvpn/system/BConnection.h
similarity index 100%
rename from src/main/jni/badvpn/system/BConnection.h
rename to jni/badvpn/system/BConnection.h
diff --git a/src/main/jni/badvpn/system/BConnectionGeneric.h b/jni/badvpn/system/BConnectionGeneric.h
similarity index 100%
rename from src/main/jni/badvpn/system/BConnectionGeneric.h
rename to jni/badvpn/system/BConnectionGeneric.h
diff --git a/src/main/jni/badvpn/system/BConnection_unix.c b/jni/badvpn/system/BConnection_unix.c
similarity index 100%
rename from src/main/jni/badvpn/system/BConnection_unix.c
rename to jni/badvpn/system/BConnection_unix.c
diff --git a/src/main/jni/badvpn/system/BConnection_unix.h b/jni/badvpn/system/BConnection_unix.h
similarity index 100%
rename from src/main/jni/badvpn/system/BConnection_unix.h
rename to jni/badvpn/system/BConnection_unix.h
diff --git a/src/main/jni/badvpn/system/BConnection_win.c b/jni/badvpn/system/BConnection_win.c
similarity index 100%
rename from src/main/jni/badvpn/system/BConnection_win.c
rename to jni/badvpn/system/BConnection_win.c
diff --git a/src/main/jni/badvpn/system/BConnection_win.h b/jni/badvpn/system/BConnection_win.h
similarity index 100%
rename from src/main/jni/badvpn/system/BConnection_win.h
rename to jni/badvpn/system/BConnection_win.h
diff --git a/src/main/jni/badvpn/system/BDatagram.h b/jni/badvpn/system/BDatagram.h
similarity index 100%
rename from src/main/jni/badvpn/system/BDatagram.h
rename to jni/badvpn/system/BDatagram.h
diff --git a/src/main/jni/badvpn/system/BDatagram_unix.c b/jni/badvpn/system/BDatagram_unix.c
similarity index 100%
rename from src/main/jni/badvpn/system/BDatagram_unix.c
rename to jni/badvpn/system/BDatagram_unix.c
diff --git a/src/main/jni/badvpn/system/BDatagram_unix.h b/jni/badvpn/system/BDatagram_unix.h
similarity index 100%
rename from src/main/jni/badvpn/system/BDatagram_unix.h
rename to jni/badvpn/system/BDatagram_unix.h
diff --git a/src/main/jni/badvpn/system/BDatagram_win.c b/jni/badvpn/system/BDatagram_win.c
similarity index 100%
rename from src/main/jni/badvpn/system/BDatagram_win.c
rename to jni/badvpn/system/BDatagram_win.c
diff --git a/src/main/jni/badvpn/system/BDatagram_win.h b/jni/badvpn/system/BDatagram_win.h
similarity index 100%
rename from src/main/jni/badvpn/system/BDatagram_win.h
rename to jni/badvpn/system/BDatagram_win.h
diff --git a/src/main/jni/badvpn/system/BInputProcess.c b/jni/badvpn/system/BInputProcess.c
similarity index 100%
rename from src/main/jni/badvpn/system/BInputProcess.c
rename to jni/badvpn/system/BInputProcess.c
diff --git a/src/main/jni/badvpn/system/BInputProcess.h b/jni/badvpn/system/BInputProcess.h
similarity index 100%
rename from src/main/jni/badvpn/system/BInputProcess.h
rename to jni/badvpn/system/BInputProcess.h
diff --git a/src/main/jni/badvpn/system/BLockReactor.c b/jni/badvpn/system/BLockReactor.c
similarity index 100%
rename from src/main/jni/badvpn/system/BLockReactor.c
rename to jni/badvpn/system/BLockReactor.c
diff --git a/src/main/jni/badvpn/system/BLockReactor.h b/jni/badvpn/system/BLockReactor.h
similarity index 100%
rename from src/main/jni/badvpn/system/BLockReactor.h
rename to jni/badvpn/system/BLockReactor.h
diff --git a/src/main/jni/badvpn/system/BNetwork.c b/jni/badvpn/system/BNetwork.c
similarity index 100%
rename from src/main/jni/badvpn/system/BNetwork.c
rename to jni/badvpn/system/BNetwork.c
diff --git a/src/main/jni/badvpn/system/BNetwork.h b/jni/badvpn/system/BNetwork.h
similarity index 100%
rename from src/main/jni/badvpn/system/BNetwork.h
rename to jni/badvpn/system/BNetwork.h
diff --git a/src/main/jni/badvpn/system/BProcess.c b/jni/badvpn/system/BProcess.c
similarity index 100%
rename from src/main/jni/badvpn/system/BProcess.c
rename to jni/badvpn/system/BProcess.c
diff --git a/src/main/jni/badvpn/system/BProcess.h b/jni/badvpn/system/BProcess.h
similarity index 100%
rename from src/main/jni/badvpn/system/BProcess.h
rename to jni/badvpn/system/BProcess.h
diff --git a/src/main/jni/badvpn/system/BReactor.h b/jni/badvpn/system/BReactor.h
similarity index 100%
rename from src/main/jni/badvpn/system/BReactor.h
rename to jni/badvpn/system/BReactor.h
diff --git a/src/main/jni/badvpn/system/BReactor_badvpn.c b/jni/badvpn/system/BReactor_badvpn.c
similarity index 100%
rename from src/main/jni/badvpn/system/BReactor_badvpn.c
rename to jni/badvpn/system/BReactor_badvpn.c
diff --git a/src/main/jni/badvpn/system/BReactor_badvpn.h b/jni/badvpn/system/BReactor_badvpn.h
similarity index 100%
rename from src/main/jni/badvpn/system/BReactor_badvpn.h
rename to jni/badvpn/system/BReactor_badvpn.h
diff --git a/src/main/jni/badvpn/system/BReactor_badvpn_timerstree.h b/jni/badvpn/system/BReactor_badvpn_timerstree.h
similarity index 100%
rename from src/main/jni/badvpn/system/BReactor_badvpn_timerstree.h
rename to jni/badvpn/system/BReactor_badvpn_timerstree.h
diff --git a/src/main/jni/badvpn/system/BReactor_emscripten.c b/jni/badvpn/system/BReactor_emscripten.c
similarity index 100%
rename from src/main/jni/badvpn/system/BReactor_emscripten.c
rename to jni/badvpn/system/BReactor_emscripten.c
diff --git a/src/main/jni/badvpn/system/BReactor_emscripten.h b/jni/badvpn/system/BReactor_emscripten.h
similarity index 100%
rename from src/main/jni/badvpn/system/BReactor_emscripten.h
rename to jni/badvpn/system/BReactor_emscripten.h
diff --git a/src/main/jni/badvpn/system/BReactor_glib.c b/jni/badvpn/system/BReactor_glib.c
similarity index 100%
rename from src/main/jni/badvpn/system/BReactor_glib.c
rename to jni/badvpn/system/BReactor_glib.c
diff --git a/src/main/jni/badvpn/system/BReactor_glib.h b/jni/badvpn/system/BReactor_glib.h
similarity index 100%
rename from src/main/jni/badvpn/system/BReactor_glib.h
rename to jni/badvpn/system/BReactor_glib.h
diff --git a/src/main/jni/badvpn/system/BSignal.c b/jni/badvpn/system/BSignal.c
similarity index 100%
rename from src/main/jni/badvpn/system/BSignal.c
rename to jni/badvpn/system/BSignal.c
diff --git a/src/main/jni/badvpn/system/BSignal.h b/jni/badvpn/system/BSignal.h
similarity index 100%
rename from src/main/jni/badvpn/system/BSignal.h
rename to jni/badvpn/system/BSignal.h
diff --git a/src/main/jni/badvpn/system/BThreadSignal.c b/jni/badvpn/system/BThreadSignal.c
similarity index 100%
rename from src/main/jni/badvpn/system/BThreadSignal.c
rename to jni/badvpn/system/BThreadSignal.c
diff --git a/src/main/jni/badvpn/system/BThreadSignal.h b/jni/badvpn/system/BThreadSignal.h
similarity index 100%
rename from src/main/jni/badvpn/system/BThreadSignal.h
rename to jni/badvpn/system/BThreadSignal.h
diff --git a/src/main/jni/badvpn/system/BTime.c b/jni/badvpn/system/BTime.c
similarity index 100%
rename from src/main/jni/badvpn/system/BTime.c
rename to jni/badvpn/system/BTime.c
diff --git a/src/main/jni/badvpn/system/BTime.h b/jni/badvpn/system/BTime.h
similarity index 100%
rename from src/main/jni/badvpn/system/BTime.h
rename to jni/badvpn/system/BTime.h
diff --git a/src/main/jni/badvpn/system/BUnixSignal.c b/jni/badvpn/system/BUnixSignal.c
similarity index 100%
rename from src/main/jni/badvpn/system/BUnixSignal.c
rename to jni/badvpn/system/BUnixSignal.c
diff --git a/src/main/jni/badvpn/system/BUnixSignal.h b/jni/badvpn/system/BUnixSignal.h
similarity index 100%
rename from src/main/jni/badvpn/system/BUnixSignal.h
rename to jni/badvpn/system/BUnixSignal.h
diff --git a/src/main/jni/badvpn/system/CMakeLists.txt b/jni/badvpn/system/CMakeLists.txt
similarity index 100%
rename from src/main/jni/badvpn/system/CMakeLists.txt
rename to jni/badvpn/system/CMakeLists.txt
diff --git a/src/main/jni/badvpn/tests/CMakeLists.txt b/jni/badvpn/tests/CMakeLists.txt
similarity index 100%
rename from src/main/jni/badvpn/tests/CMakeLists.txt
rename to jni/badvpn/tests/CMakeLists.txt
diff --git a/src/main/jni/badvpn/tests/bproto_test.bproto b/jni/badvpn/tests/bproto_test.bproto
similarity index 100%
rename from src/main/jni/badvpn/tests/bproto_test.bproto
rename to jni/badvpn/tests/bproto_test.bproto
diff --git a/src/main/jni/badvpn/tests/bproto_test.c b/jni/badvpn/tests/bproto_test.c
similarity index 100%
rename from src/main/jni/badvpn/tests/bproto_test.c
rename to jni/badvpn/tests/bproto_test.c
diff --git a/src/main/jni/badvpn/tests/chunkbuffer2_test.c b/jni/badvpn/tests/chunkbuffer2_test.c
similarity index 100%
rename from src/main/jni/badvpn/tests/chunkbuffer2_test.c
rename to jni/badvpn/tests/chunkbuffer2_test.c
diff --git a/src/main/jni/badvpn/tests/threadwork_test.c b/jni/badvpn/tests/threadwork_test.c
similarity index 100%
rename from src/main/jni/badvpn/tests/threadwork_test.c
rename to jni/badvpn/tests/threadwork_test.c
diff --git a/src/main/jni/badvpn/threadwork/BThreadWork.c b/jni/badvpn/threadwork/BThreadWork.c
similarity index 100%
rename from src/main/jni/badvpn/threadwork/BThreadWork.c
rename to jni/badvpn/threadwork/BThreadWork.c
diff --git a/src/main/jni/badvpn/threadwork/BThreadWork.h b/jni/badvpn/threadwork/BThreadWork.h
similarity index 100%
rename from src/main/jni/badvpn/threadwork/BThreadWork.h
rename to jni/badvpn/threadwork/BThreadWork.h
diff --git a/src/main/jni/badvpn/threadwork/CMakeLists.txt b/jni/badvpn/threadwork/CMakeLists.txt
similarity index 100%
rename from src/main/jni/badvpn/threadwork/CMakeLists.txt
rename to jni/badvpn/threadwork/CMakeLists.txt
diff --git a/src/main/jni/badvpn/tun2socks/CMakeLists.txt b/jni/badvpn/tun2socks/CMakeLists.txt
similarity index 100%
rename from src/main/jni/badvpn/tun2socks/CMakeLists.txt
rename to jni/badvpn/tun2socks/CMakeLists.txt
diff --git a/src/main/jni/badvpn/tun2socks/SocksUdpGwClient.c b/jni/badvpn/tun2socks/SocksUdpGwClient.c
similarity index 100%
rename from src/main/jni/badvpn/tun2socks/SocksUdpGwClient.c
rename to jni/badvpn/tun2socks/SocksUdpGwClient.c
diff --git a/src/main/jni/badvpn/tun2socks/SocksUdpGwClient.h b/jni/badvpn/tun2socks/SocksUdpGwClient.h
similarity index 100%
rename from src/main/jni/badvpn/tun2socks/SocksUdpGwClient.h
rename to jni/badvpn/tun2socks/SocksUdpGwClient.h
diff --git a/src/main/jni/badvpn/tun2socks/badvpn-tun2socks.8 b/jni/badvpn/tun2socks/badvpn-tun2socks.8
similarity index 100%
rename from src/main/jni/badvpn/tun2socks/badvpn-tun2socks.8
rename to jni/badvpn/tun2socks/badvpn-tun2socks.8
diff --git a/src/main/jni/badvpn/tun2socks/tun2socks.c b/jni/badvpn/tun2socks/tun2socks.c
similarity index 100%
rename from src/main/jni/badvpn/tun2socks/tun2socks.c
rename to jni/badvpn/tun2socks/tun2socks.c
diff --git a/src/main/jni/badvpn/tun2socks/tun2socks.h b/jni/badvpn/tun2socks/tun2socks.h
similarity index 100%
rename from src/main/jni/badvpn/tun2socks/tun2socks.h
rename to jni/badvpn/tun2socks/tun2socks.h
diff --git a/src/main/jni/badvpn/tunctl/CMakeLists.txt b/jni/badvpn/tunctl/CMakeLists.txt
similarity index 100%
rename from src/main/jni/badvpn/tunctl/CMakeLists.txt
rename to jni/badvpn/tunctl/CMakeLists.txt
diff --git a/src/main/jni/badvpn/tunctl/tunctl.c b/jni/badvpn/tunctl/tunctl.c
similarity index 100%
rename from src/main/jni/badvpn/tunctl/tunctl.c
rename to jni/badvpn/tunctl/tunctl.c
diff --git a/src/main/jni/badvpn/tuntap/BTap.c b/jni/badvpn/tuntap/BTap.c
similarity index 100%
rename from src/main/jni/badvpn/tuntap/BTap.c
rename to jni/badvpn/tuntap/BTap.c
diff --git a/src/main/jni/badvpn/tuntap/BTap.h b/jni/badvpn/tuntap/BTap.h
similarity index 100%
rename from src/main/jni/badvpn/tuntap/BTap.h
rename to jni/badvpn/tuntap/BTap.h
diff --git a/src/main/jni/badvpn/tuntap/CMakeLists.txt b/jni/badvpn/tuntap/CMakeLists.txt
similarity index 100%
rename from src/main/jni/badvpn/tuntap/CMakeLists.txt
rename to jni/badvpn/tuntap/CMakeLists.txt
diff --git a/src/main/jni/badvpn/tuntap/tapwin32-funcs.c b/jni/badvpn/tuntap/tapwin32-funcs.c
similarity index 100%
rename from src/main/jni/badvpn/tuntap/tapwin32-funcs.c
rename to jni/badvpn/tuntap/tapwin32-funcs.c
diff --git a/src/main/jni/badvpn/tuntap/tapwin32-funcs.h b/jni/badvpn/tuntap/tapwin32-funcs.h
similarity index 100%
rename from src/main/jni/badvpn/tuntap/tapwin32-funcs.h
rename to jni/badvpn/tuntap/tapwin32-funcs.h
diff --git a/src/main/jni/badvpn/tuntap/wintap-common.h b/jni/badvpn/tuntap/wintap-common.h
similarity index 100%
rename from src/main/jni/badvpn/tuntap/wintap-common.h
rename to jni/badvpn/tuntap/wintap-common.h
diff --git a/src/main/jni/badvpn/udevmonitor/CMakeLists.txt b/jni/badvpn/udevmonitor/CMakeLists.txt
similarity index 100%
rename from src/main/jni/badvpn/udevmonitor/CMakeLists.txt
rename to jni/badvpn/udevmonitor/CMakeLists.txt
diff --git a/src/main/jni/badvpn/udevmonitor/NCDUdevCache.c b/jni/badvpn/udevmonitor/NCDUdevCache.c
similarity index 100%
rename from src/main/jni/badvpn/udevmonitor/NCDUdevCache.c
rename to jni/badvpn/udevmonitor/NCDUdevCache.c
diff --git a/src/main/jni/badvpn/udevmonitor/NCDUdevCache.h b/jni/badvpn/udevmonitor/NCDUdevCache.h
similarity index 100%
rename from src/main/jni/badvpn/udevmonitor/NCDUdevCache.h
rename to jni/badvpn/udevmonitor/NCDUdevCache.h
diff --git a/src/main/jni/badvpn/udevmonitor/NCDUdevManager.c b/jni/badvpn/udevmonitor/NCDUdevManager.c
similarity index 100%
rename from src/main/jni/badvpn/udevmonitor/NCDUdevManager.c
rename to jni/badvpn/udevmonitor/NCDUdevManager.c
diff --git a/src/main/jni/badvpn/udevmonitor/NCDUdevManager.h b/jni/badvpn/udevmonitor/NCDUdevManager.h
similarity index 100%
rename from src/main/jni/badvpn/udevmonitor/NCDUdevManager.h
rename to jni/badvpn/udevmonitor/NCDUdevManager.h
diff --git a/src/main/jni/badvpn/udevmonitor/NCDUdevMonitor.c b/jni/badvpn/udevmonitor/NCDUdevMonitor.c
similarity index 100%
rename from src/main/jni/badvpn/udevmonitor/NCDUdevMonitor.c
rename to jni/badvpn/udevmonitor/NCDUdevMonitor.c
diff --git a/src/main/jni/badvpn/udevmonitor/NCDUdevMonitor.h b/jni/badvpn/udevmonitor/NCDUdevMonitor.h
similarity index 100%
rename from src/main/jni/badvpn/udevmonitor/NCDUdevMonitor.h
rename to jni/badvpn/udevmonitor/NCDUdevMonitor.h
diff --git a/src/main/jni/badvpn/udevmonitor/NCDUdevMonitorParser.c b/jni/badvpn/udevmonitor/NCDUdevMonitorParser.c
similarity index 100%
rename from src/main/jni/badvpn/udevmonitor/NCDUdevMonitorParser.c
rename to jni/badvpn/udevmonitor/NCDUdevMonitorParser.c
diff --git a/src/main/jni/badvpn/udevmonitor/NCDUdevMonitorParser.h b/jni/badvpn/udevmonitor/NCDUdevMonitorParser.h
similarity index 100%
rename from src/main/jni/badvpn/udevmonitor/NCDUdevMonitorParser.h
rename to jni/badvpn/udevmonitor/NCDUdevMonitorParser.h
diff --git a/src/main/jni/badvpn/udpgw/CMakeLists.txt b/jni/badvpn/udpgw/CMakeLists.txt
similarity index 100%
rename from src/main/jni/badvpn/udpgw/CMakeLists.txt
rename to jni/badvpn/udpgw/CMakeLists.txt
diff --git a/src/main/jni/badvpn/udpgw/udpgw.c b/jni/badvpn/udpgw/udpgw.c
similarity index 100%
rename from src/main/jni/badvpn/udpgw/udpgw.c
rename to jni/badvpn/udpgw/udpgw.c
diff --git a/src/main/jni/badvpn/udpgw/udpgw.h b/jni/badvpn/udpgw/udpgw.h
similarity index 100%
rename from src/main/jni/badvpn/udpgw/udpgw.h
rename to jni/badvpn/udpgw/udpgw.h
diff --git a/src/main/jni/badvpn/udpgw_client/CMakeLists.txt b/jni/badvpn/udpgw_client/CMakeLists.txt
similarity index 100%
rename from src/main/jni/badvpn/udpgw_client/CMakeLists.txt
rename to jni/badvpn/udpgw_client/CMakeLists.txt
diff --git a/src/main/jni/badvpn/udpgw_client/UdpGwClient.c b/jni/badvpn/udpgw_client/UdpGwClient.c
similarity index 100%
rename from src/main/jni/badvpn/udpgw_client/UdpGwClient.c
rename to jni/badvpn/udpgw_client/UdpGwClient.c
diff --git a/src/main/jni/badvpn/udpgw_client/UdpGwClient.h b/jni/badvpn/udpgw_client/UdpGwClient.h
similarity index 100%
rename from src/main/jni/badvpn/udpgw_client/UdpGwClient.h
rename to jni/badvpn/udpgw_client/UdpGwClient.h
diff --git a/src/main/jni/iptables/Android.mk b/jni/iptables/Android.mk
similarity index 100%
rename from src/main/jni/iptables/Android.mk
rename to jni/iptables/Android.mk
diff --git a/src/main/jni/iptables/COMMIT_NOTES b/jni/iptables/COMMIT_NOTES
similarity index 100%
rename from src/main/jni/iptables/COMMIT_NOTES
rename to jni/iptables/COMMIT_NOTES
diff --git a/src/main/jni/iptables/COPYING b/jni/iptables/COPYING
similarity index 100%
rename from src/main/jni/iptables/COPYING
rename to jni/iptables/COPYING
diff --git a/src/main/jni/iptables/INCOMPATIBILITIES b/jni/iptables/INCOMPATIBILITIES
similarity index 100%
rename from src/main/jni/iptables/INCOMPATIBILITIES
rename to jni/iptables/INCOMPATIBILITIES
diff --git a/src/main/jni/iptables/INSTALL b/jni/iptables/INSTALL
similarity index 100%
rename from src/main/jni/iptables/INSTALL
rename to jni/iptables/INSTALL
diff --git a/src/main/jni/iptables/Makefile.am b/jni/iptables/Makefile.am
similarity index 100%
rename from src/main/jni/iptables/Makefile.am
rename to jni/iptables/Makefile.am
diff --git a/src/main/jni/iptables/autogen.sh b/jni/iptables/autogen.sh
similarity index 100%
rename from src/main/jni/iptables/autogen.sh
rename to jni/iptables/autogen.sh
diff --git a/src/main/jni/iptables/configure.ac b/jni/iptables/configure.ac
similarity index 100%
rename from src/main/jni/iptables/configure.ac
rename to jni/iptables/configure.ac
diff --git a/src/main/jni/iptables/extensions/Android.mk b/jni/iptables/extensions/Android.mk
similarity index 100%
rename from src/main/jni/iptables/extensions/Android.mk
rename to jni/iptables/extensions/Android.mk
diff --git a/src/main/jni/iptables/extensions/GNUmakefile.in b/jni/iptables/extensions/GNUmakefile.in
similarity index 100%
rename from src/main/jni/iptables/extensions/GNUmakefile.in
rename to jni/iptables/extensions/GNUmakefile.in
diff --git a/src/main/jni/iptables/extensions/dscp_helper.c b/jni/iptables/extensions/dscp_helper.c
similarity index 100%
rename from src/main/jni/iptables/extensions/dscp_helper.c
rename to jni/iptables/extensions/dscp_helper.c
diff --git a/src/main/jni/iptables/extensions/filter_init b/jni/iptables/extensions/filter_init
similarity index 100%
rename from src/main/jni/iptables/extensions/filter_init
rename to jni/iptables/extensions/filter_init
diff --git a/src/main/jni/iptables/extensions/libip6t_LOG.c b/jni/iptables/extensions/libip6t_LOG.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libip6t_LOG.c
rename to jni/iptables/extensions/libip6t_LOG.c
diff --git a/src/main/jni/iptables/extensions/libip6t_LOG.man b/jni/iptables/extensions/libip6t_LOG.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libip6t_LOG.man
rename to jni/iptables/extensions/libip6t_LOG.man
diff --git a/src/main/jni/iptables/extensions/libip6t_REJECT.c b/jni/iptables/extensions/libip6t_REJECT.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libip6t_REJECT.c
rename to jni/iptables/extensions/libip6t_REJECT.c
diff --git a/src/main/jni/iptables/extensions/libip6t_REJECT.man b/jni/iptables/extensions/libip6t_REJECT.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libip6t_REJECT.man
rename to jni/iptables/extensions/libip6t_REJECT.man
diff --git a/src/main/jni/iptables/extensions/libip6t_ah.c b/jni/iptables/extensions/libip6t_ah.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libip6t_ah.c
rename to jni/iptables/extensions/libip6t_ah.c
diff --git a/src/main/jni/iptables/extensions/libip6t_ah.man b/jni/iptables/extensions/libip6t_ah.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libip6t_ah.man
rename to jni/iptables/extensions/libip6t_ah.man
diff --git a/src/main/jni/iptables/extensions/libip6t_dst.c b/jni/iptables/extensions/libip6t_dst.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libip6t_dst.c
rename to jni/iptables/extensions/libip6t_dst.c
diff --git a/src/main/jni/iptables/extensions/libip6t_dst.man b/jni/iptables/extensions/libip6t_dst.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libip6t_dst.man
rename to jni/iptables/extensions/libip6t_dst.man
diff --git a/src/main/jni/iptables/extensions/libip6t_eui64.c b/jni/iptables/extensions/libip6t_eui64.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libip6t_eui64.c
rename to jni/iptables/extensions/libip6t_eui64.c
diff --git a/src/main/jni/iptables/extensions/libip6t_eui64.man b/jni/iptables/extensions/libip6t_eui64.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libip6t_eui64.man
rename to jni/iptables/extensions/libip6t_eui64.man
diff --git a/src/main/jni/iptables/extensions/libip6t_frag.c b/jni/iptables/extensions/libip6t_frag.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libip6t_frag.c
rename to jni/iptables/extensions/libip6t_frag.c
diff --git a/src/main/jni/iptables/extensions/libip6t_frag.man b/jni/iptables/extensions/libip6t_frag.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libip6t_frag.man
rename to jni/iptables/extensions/libip6t_frag.man
diff --git a/src/main/jni/iptables/extensions/libip6t_hbh.c b/jni/iptables/extensions/libip6t_hbh.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libip6t_hbh.c
rename to jni/iptables/extensions/libip6t_hbh.c
diff --git a/src/main/jni/iptables/extensions/libip6t_hbh.man b/jni/iptables/extensions/libip6t_hbh.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libip6t_hbh.man
rename to jni/iptables/extensions/libip6t_hbh.man
diff --git a/src/main/jni/iptables/extensions/libip6t_hl.c b/jni/iptables/extensions/libip6t_hl.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libip6t_hl.c
rename to jni/iptables/extensions/libip6t_hl.c
diff --git a/src/main/jni/iptables/extensions/libip6t_hl.man b/jni/iptables/extensions/libip6t_hl.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libip6t_hl.man
rename to jni/iptables/extensions/libip6t_hl.man
diff --git a/src/main/jni/iptables/extensions/libip6t_icmp6.c b/jni/iptables/extensions/libip6t_icmp6.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libip6t_icmp6.c
rename to jni/iptables/extensions/libip6t_icmp6.c
diff --git a/src/main/jni/iptables/extensions/libip6t_icmp6.man b/jni/iptables/extensions/libip6t_icmp6.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libip6t_icmp6.man
rename to jni/iptables/extensions/libip6t_icmp6.man
diff --git a/src/main/jni/iptables/extensions/libip6t_ipv6header.c b/jni/iptables/extensions/libip6t_ipv6header.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libip6t_ipv6header.c
rename to jni/iptables/extensions/libip6t_ipv6header.c
diff --git a/src/main/jni/iptables/extensions/libip6t_ipv6header.man b/jni/iptables/extensions/libip6t_ipv6header.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libip6t_ipv6header.man
rename to jni/iptables/extensions/libip6t_ipv6header.man
diff --git a/src/main/jni/iptables/extensions/libip6t_mh.c b/jni/iptables/extensions/libip6t_mh.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libip6t_mh.c
rename to jni/iptables/extensions/libip6t_mh.c
diff --git a/src/main/jni/iptables/extensions/libip6t_mh.man b/jni/iptables/extensions/libip6t_mh.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libip6t_mh.man
rename to jni/iptables/extensions/libip6t_mh.man
diff --git a/src/main/jni/iptables/extensions/libip6t_rt.c b/jni/iptables/extensions/libip6t_rt.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libip6t_rt.c
rename to jni/iptables/extensions/libip6t_rt.c
diff --git a/src/main/jni/iptables/extensions/libip6t_rt.man b/jni/iptables/extensions/libip6t_rt.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libip6t_rt.man
rename to jni/iptables/extensions/libip6t_rt.man
diff --git a/src/main/jni/iptables/extensions/libipt_CLUSTERIP.c b/jni/iptables/extensions/libipt_CLUSTERIP.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libipt_CLUSTERIP.c
rename to jni/iptables/extensions/libipt_CLUSTERIP.c
diff --git a/src/main/jni/iptables/extensions/libipt_CLUSTERIP.man b/jni/iptables/extensions/libipt_CLUSTERIP.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libipt_CLUSTERIP.man
rename to jni/iptables/extensions/libipt_CLUSTERIP.man
diff --git a/src/main/jni/iptables/extensions/libipt_DNAT.c b/jni/iptables/extensions/libipt_DNAT.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libipt_DNAT.c
rename to jni/iptables/extensions/libipt_DNAT.c
diff --git a/src/main/jni/iptables/extensions/libipt_DNAT.man b/jni/iptables/extensions/libipt_DNAT.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libipt_DNAT.man
rename to jni/iptables/extensions/libipt_DNAT.man
diff --git a/src/main/jni/iptables/extensions/libipt_LOG.c b/jni/iptables/extensions/libipt_LOG.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libipt_LOG.c
rename to jni/iptables/extensions/libipt_LOG.c
diff --git a/src/main/jni/iptables/extensions/libipt_LOG.man b/jni/iptables/extensions/libipt_LOG.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libipt_LOG.man
rename to jni/iptables/extensions/libipt_LOG.man
diff --git a/src/main/jni/iptables/extensions/libipt_MASQUERADE.c b/jni/iptables/extensions/libipt_MASQUERADE.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libipt_MASQUERADE.c
rename to jni/iptables/extensions/libipt_MASQUERADE.c
diff --git a/src/main/jni/iptables/extensions/libipt_MASQUERADE.man b/jni/iptables/extensions/libipt_MASQUERADE.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libipt_MASQUERADE.man
rename to jni/iptables/extensions/libipt_MASQUERADE.man
diff --git a/src/main/jni/iptables/extensions/libipt_MIRROR.c b/jni/iptables/extensions/libipt_MIRROR.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libipt_MIRROR.c
rename to jni/iptables/extensions/libipt_MIRROR.c
diff --git a/src/main/jni/iptables/extensions/libipt_MIRROR.man b/jni/iptables/extensions/libipt_MIRROR.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libipt_MIRROR.man
rename to jni/iptables/extensions/libipt_MIRROR.man
diff --git a/src/main/jni/iptables/extensions/libipt_NETMAP.c b/jni/iptables/extensions/libipt_NETMAP.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libipt_NETMAP.c
rename to jni/iptables/extensions/libipt_NETMAP.c
diff --git a/src/main/jni/iptables/extensions/libipt_NETMAP.man b/jni/iptables/extensions/libipt_NETMAP.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libipt_NETMAP.man
rename to jni/iptables/extensions/libipt_NETMAP.man
diff --git a/src/main/jni/iptables/extensions/libipt_REDIRECT.c b/jni/iptables/extensions/libipt_REDIRECT.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libipt_REDIRECT.c
rename to jni/iptables/extensions/libipt_REDIRECT.c
diff --git a/src/main/jni/iptables/extensions/libipt_REDIRECT.man b/jni/iptables/extensions/libipt_REDIRECT.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libipt_REDIRECT.man
rename to jni/iptables/extensions/libipt_REDIRECT.man
diff --git a/src/main/jni/iptables/extensions/libipt_REJECT.c b/jni/iptables/extensions/libipt_REJECT.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libipt_REJECT.c
rename to jni/iptables/extensions/libipt_REJECT.c
diff --git a/src/main/jni/iptables/extensions/libipt_REJECT.man b/jni/iptables/extensions/libipt_REJECT.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libipt_REJECT.man
rename to jni/iptables/extensions/libipt_REJECT.man
diff --git a/src/main/jni/iptables/extensions/libipt_SAME.c b/jni/iptables/extensions/libipt_SAME.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libipt_SAME.c
rename to jni/iptables/extensions/libipt_SAME.c
diff --git a/src/main/jni/iptables/extensions/libipt_SAME.man b/jni/iptables/extensions/libipt_SAME.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libipt_SAME.man
rename to jni/iptables/extensions/libipt_SAME.man
diff --git a/src/main/jni/iptables/extensions/libipt_SNAT.c b/jni/iptables/extensions/libipt_SNAT.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libipt_SNAT.c
rename to jni/iptables/extensions/libipt_SNAT.c
diff --git a/src/main/jni/iptables/extensions/libipt_SNAT.man b/jni/iptables/extensions/libipt_SNAT.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libipt_SNAT.man
rename to jni/iptables/extensions/libipt_SNAT.man
diff --git a/src/main/jni/iptables/extensions/libipt_ULOG.c b/jni/iptables/extensions/libipt_ULOG.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libipt_ULOG.c
rename to jni/iptables/extensions/libipt_ULOG.c
diff --git a/src/main/jni/iptables/extensions/libipt_ULOG.man b/jni/iptables/extensions/libipt_ULOG.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libipt_ULOG.man
rename to jni/iptables/extensions/libipt_ULOG.man
diff --git a/src/main/jni/iptables/extensions/libipt_addrtype.c b/jni/iptables/extensions/libipt_addrtype.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libipt_addrtype.c
rename to jni/iptables/extensions/libipt_addrtype.c
diff --git a/src/main/jni/iptables/extensions/libipt_addrtype.man b/jni/iptables/extensions/libipt_addrtype.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libipt_addrtype.man
rename to jni/iptables/extensions/libipt_addrtype.man
diff --git a/src/main/jni/iptables/extensions/libipt_ah.c b/jni/iptables/extensions/libipt_ah.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libipt_ah.c
rename to jni/iptables/extensions/libipt_ah.c
diff --git a/src/main/jni/iptables/extensions/libipt_ah.man b/jni/iptables/extensions/libipt_ah.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libipt_ah.man
rename to jni/iptables/extensions/libipt_ah.man
diff --git a/src/main/jni/iptables/extensions/libipt_ecn.c b/jni/iptables/extensions/libipt_ecn.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libipt_ecn.c
rename to jni/iptables/extensions/libipt_ecn.c
diff --git a/src/main/jni/iptables/extensions/libipt_ecn.man b/jni/iptables/extensions/libipt_ecn.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libipt_ecn.man
rename to jni/iptables/extensions/libipt_ecn.man
diff --git a/src/main/jni/iptables/extensions/libipt_icmp.c b/jni/iptables/extensions/libipt_icmp.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libipt_icmp.c
rename to jni/iptables/extensions/libipt_icmp.c
diff --git a/src/main/jni/iptables/extensions/libipt_icmp.man b/jni/iptables/extensions/libipt_icmp.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libipt_icmp.man
rename to jni/iptables/extensions/libipt_icmp.man
diff --git a/src/main/jni/iptables/extensions/libipt_realm.c b/jni/iptables/extensions/libipt_realm.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libipt_realm.c
rename to jni/iptables/extensions/libipt_realm.c
diff --git a/src/main/jni/iptables/extensions/libipt_realm.man b/jni/iptables/extensions/libipt_realm.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libipt_realm.man
rename to jni/iptables/extensions/libipt_realm.man
diff --git a/src/main/jni/iptables/extensions/libipt_ttl.c b/jni/iptables/extensions/libipt_ttl.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libipt_ttl.c
rename to jni/iptables/extensions/libipt_ttl.c
diff --git a/src/main/jni/iptables/extensions/libipt_ttl.man b/jni/iptables/extensions/libipt_ttl.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libipt_ttl.man
rename to jni/iptables/extensions/libipt_ttl.man
diff --git a/src/main/jni/iptables/extensions/libipt_unclean.c b/jni/iptables/extensions/libipt_unclean.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libipt_unclean.c
rename to jni/iptables/extensions/libipt_unclean.c
diff --git a/src/main/jni/iptables/extensions/libipt_unclean.man b/jni/iptables/extensions/libipt_unclean.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libipt_unclean.man
rename to jni/iptables/extensions/libipt_unclean.man
diff --git a/src/main/jni/iptables/extensions/libxt_AUDIT.c b/jni/iptables/extensions/libxt_AUDIT.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_AUDIT.c
rename to jni/iptables/extensions/libxt_AUDIT.c
diff --git a/src/main/jni/iptables/extensions/libxt_AUDIT.man b/jni/iptables/extensions/libxt_AUDIT.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_AUDIT.man
rename to jni/iptables/extensions/libxt_AUDIT.man
diff --git a/src/main/jni/iptables/extensions/libxt_CHECKSUM.c b/jni/iptables/extensions/libxt_CHECKSUM.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_CHECKSUM.c
rename to jni/iptables/extensions/libxt_CHECKSUM.c
diff --git a/src/main/jni/iptables/extensions/libxt_CHECKSUM.man b/jni/iptables/extensions/libxt_CHECKSUM.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_CHECKSUM.man
rename to jni/iptables/extensions/libxt_CHECKSUM.man
diff --git a/src/main/jni/iptables/extensions/libxt_CLASSIFY.c b/jni/iptables/extensions/libxt_CLASSIFY.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_CLASSIFY.c
rename to jni/iptables/extensions/libxt_CLASSIFY.c
diff --git a/src/main/jni/iptables/extensions/libxt_CLASSIFY.man b/jni/iptables/extensions/libxt_CLASSIFY.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_CLASSIFY.man
rename to jni/iptables/extensions/libxt_CLASSIFY.man
diff --git a/src/main/jni/iptables/extensions/libxt_CONNSECMARK.c b/jni/iptables/extensions/libxt_CONNSECMARK.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_CONNSECMARK.c
rename to jni/iptables/extensions/libxt_CONNSECMARK.c
diff --git a/src/main/jni/iptables/extensions/libxt_CONNSECMARK.man b/jni/iptables/extensions/libxt_CONNSECMARK.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_CONNSECMARK.man
rename to jni/iptables/extensions/libxt_CONNSECMARK.man
diff --git a/src/main/jni/iptables/extensions/libxt_CT.c b/jni/iptables/extensions/libxt_CT.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_CT.c
rename to jni/iptables/extensions/libxt_CT.c
diff --git a/src/main/jni/iptables/extensions/libxt_CT.man b/jni/iptables/extensions/libxt_CT.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_CT.man
rename to jni/iptables/extensions/libxt_CT.man
diff --git a/src/main/jni/iptables/extensions/libxt_IDLETIMER.c b/jni/iptables/extensions/libxt_IDLETIMER.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_IDLETIMER.c
rename to jni/iptables/extensions/libxt_IDLETIMER.c
diff --git a/src/main/jni/iptables/extensions/libxt_IDLETIMER.man b/jni/iptables/extensions/libxt_IDLETIMER.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_IDLETIMER.man
rename to jni/iptables/extensions/libxt_IDLETIMER.man
diff --git a/src/main/jni/iptables/extensions/libxt_LED.c b/jni/iptables/extensions/libxt_LED.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_LED.c
rename to jni/iptables/extensions/libxt_LED.c
diff --git a/src/main/jni/iptables/extensions/libxt_LED.man b/jni/iptables/extensions/libxt_LED.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_LED.man
rename to jni/iptables/extensions/libxt_LED.man
diff --git a/src/main/jni/iptables/extensions/libxt_NFLOG.c b/jni/iptables/extensions/libxt_NFLOG.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_NFLOG.c
rename to jni/iptables/extensions/libxt_NFLOG.c
diff --git a/src/main/jni/iptables/extensions/libxt_NFLOG.man b/jni/iptables/extensions/libxt_NFLOG.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_NFLOG.man
rename to jni/iptables/extensions/libxt_NFLOG.man
diff --git a/src/main/jni/iptables/extensions/libxt_NFQUEUE.c b/jni/iptables/extensions/libxt_NFQUEUE.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_NFQUEUE.c
rename to jni/iptables/extensions/libxt_NFQUEUE.c
diff --git a/src/main/jni/iptables/extensions/libxt_NFQUEUE.man b/jni/iptables/extensions/libxt_NFQUEUE.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_NFQUEUE.man
rename to jni/iptables/extensions/libxt_NFQUEUE.man
diff --git a/src/main/jni/iptables/extensions/libxt_NOTRACK.c b/jni/iptables/extensions/libxt_NOTRACK.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_NOTRACK.c
rename to jni/iptables/extensions/libxt_NOTRACK.c
diff --git a/src/main/jni/iptables/extensions/libxt_NOTRACK.man b/jni/iptables/extensions/libxt_NOTRACK.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_NOTRACK.man
rename to jni/iptables/extensions/libxt_NOTRACK.man
diff --git a/src/main/jni/iptables/extensions/libxt_SECMARK.c b/jni/iptables/extensions/libxt_SECMARK.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_SECMARK.c
rename to jni/iptables/extensions/libxt_SECMARK.c
diff --git a/src/main/jni/iptables/extensions/libxt_SECMARK.man b/jni/iptables/extensions/libxt_SECMARK.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_SECMARK.man
rename to jni/iptables/extensions/libxt_SECMARK.man
diff --git a/src/main/jni/iptables/extensions/libxt_TCPOPTSTRIP.c b/jni/iptables/extensions/libxt_TCPOPTSTRIP.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_TCPOPTSTRIP.c
rename to jni/iptables/extensions/libxt_TCPOPTSTRIP.c
diff --git a/src/main/jni/iptables/extensions/libxt_TCPOPTSTRIP.man b/jni/iptables/extensions/libxt_TCPOPTSTRIP.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_TCPOPTSTRIP.man
rename to jni/iptables/extensions/libxt_TCPOPTSTRIP.man
diff --git a/src/main/jni/iptables/extensions/libxt_TEE.c b/jni/iptables/extensions/libxt_TEE.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_TEE.c
rename to jni/iptables/extensions/libxt_TEE.c
diff --git a/src/main/jni/iptables/extensions/libxt_TEE.man b/jni/iptables/extensions/libxt_TEE.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_TEE.man
rename to jni/iptables/extensions/libxt_TEE.man
diff --git a/src/main/jni/iptables/extensions/libxt_TPROXY.c b/jni/iptables/extensions/libxt_TPROXY.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_TPROXY.c
rename to jni/iptables/extensions/libxt_TPROXY.c
diff --git a/src/main/jni/iptables/extensions/libxt_TPROXY.man b/jni/iptables/extensions/libxt_TPROXY.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_TPROXY.man
rename to jni/iptables/extensions/libxt_TPROXY.man
diff --git a/src/main/jni/iptables/extensions/libxt_TRACE.c b/jni/iptables/extensions/libxt_TRACE.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_TRACE.c
rename to jni/iptables/extensions/libxt_TRACE.c
diff --git a/src/main/jni/iptables/extensions/libxt_TRACE.man b/jni/iptables/extensions/libxt_TRACE.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_TRACE.man
rename to jni/iptables/extensions/libxt_TRACE.man
diff --git a/src/main/jni/iptables/extensions/libxt_cluster.c b/jni/iptables/extensions/libxt_cluster.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_cluster.c
rename to jni/iptables/extensions/libxt_cluster.c
diff --git a/src/main/jni/iptables/extensions/libxt_cluster.man b/jni/iptables/extensions/libxt_cluster.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_cluster.man
rename to jni/iptables/extensions/libxt_cluster.man
diff --git a/src/main/jni/iptables/extensions/libxt_comment.c b/jni/iptables/extensions/libxt_comment.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_comment.c
rename to jni/iptables/extensions/libxt_comment.c
diff --git a/src/main/jni/iptables/extensions/libxt_comment.man b/jni/iptables/extensions/libxt_comment.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_comment.man
rename to jni/iptables/extensions/libxt_comment.man
diff --git a/src/main/jni/iptables/extensions/libxt_connbytes.c b/jni/iptables/extensions/libxt_connbytes.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_connbytes.c
rename to jni/iptables/extensions/libxt_connbytes.c
diff --git a/src/main/jni/iptables/extensions/libxt_connbytes.man b/jni/iptables/extensions/libxt_connbytes.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_connbytes.man
rename to jni/iptables/extensions/libxt_connbytes.man
diff --git a/src/main/jni/iptables/extensions/libxt_connlimit.c b/jni/iptables/extensions/libxt_connlimit.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_connlimit.c
rename to jni/iptables/extensions/libxt_connlimit.c
diff --git a/src/main/jni/iptables/extensions/libxt_connlimit.man b/jni/iptables/extensions/libxt_connlimit.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_connlimit.man
rename to jni/iptables/extensions/libxt_connlimit.man
diff --git a/src/main/jni/iptables/extensions/libxt_connmark.c b/jni/iptables/extensions/libxt_connmark.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_connmark.c
rename to jni/iptables/extensions/libxt_connmark.c
diff --git a/src/main/jni/iptables/extensions/libxt_connmark.man b/jni/iptables/extensions/libxt_connmark.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_connmark.man
rename to jni/iptables/extensions/libxt_connmark.man
diff --git a/src/main/jni/iptables/extensions/libxt_conntrack.c b/jni/iptables/extensions/libxt_conntrack.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_conntrack.c
rename to jni/iptables/extensions/libxt_conntrack.c
diff --git a/src/main/jni/iptables/extensions/libxt_conntrack.man b/jni/iptables/extensions/libxt_conntrack.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_conntrack.man
rename to jni/iptables/extensions/libxt_conntrack.man
diff --git a/src/main/jni/iptables/extensions/libxt_cpu.c b/jni/iptables/extensions/libxt_cpu.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_cpu.c
rename to jni/iptables/extensions/libxt_cpu.c
diff --git a/src/main/jni/iptables/extensions/libxt_cpu.man b/jni/iptables/extensions/libxt_cpu.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_cpu.man
rename to jni/iptables/extensions/libxt_cpu.man
diff --git a/src/main/jni/iptables/extensions/libxt_dccp.c b/jni/iptables/extensions/libxt_dccp.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_dccp.c
rename to jni/iptables/extensions/libxt_dccp.c
diff --git a/src/main/jni/iptables/extensions/libxt_dccp.man b/jni/iptables/extensions/libxt_dccp.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_dccp.man
rename to jni/iptables/extensions/libxt_dccp.man
diff --git a/src/main/jni/iptables/extensions/libxt_devgroup.c b/jni/iptables/extensions/libxt_devgroup.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_devgroup.c
rename to jni/iptables/extensions/libxt_devgroup.c
diff --git a/src/main/jni/iptables/extensions/libxt_dscp.c b/jni/iptables/extensions/libxt_dscp.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_dscp.c
rename to jni/iptables/extensions/libxt_dscp.c
diff --git a/src/main/jni/iptables/extensions/libxt_dscp.man b/jni/iptables/extensions/libxt_dscp.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_dscp.man
rename to jni/iptables/extensions/libxt_dscp.man
diff --git a/src/main/jni/iptables/extensions/libxt_esp.c b/jni/iptables/extensions/libxt_esp.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_esp.c
rename to jni/iptables/extensions/libxt_esp.c
diff --git a/src/main/jni/iptables/extensions/libxt_esp.man b/jni/iptables/extensions/libxt_esp.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_esp.man
rename to jni/iptables/extensions/libxt_esp.man
diff --git a/src/main/jni/iptables/extensions/libxt_hashlimit.c b/jni/iptables/extensions/libxt_hashlimit.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_hashlimit.c
rename to jni/iptables/extensions/libxt_hashlimit.c
diff --git a/src/main/jni/iptables/extensions/libxt_hashlimit.man b/jni/iptables/extensions/libxt_hashlimit.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_hashlimit.man
rename to jni/iptables/extensions/libxt_hashlimit.man
diff --git a/src/main/jni/iptables/extensions/libxt_helper.c b/jni/iptables/extensions/libxt_helper.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_helper.c
rename to jni/iptables/extensions/libxt_helper.c
diff --git a/src/main/jni/iptables/extensions/libxt_helper.man b/jni/iptables/extensions/libxt_helper.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_helper.man
rename to jni/iptables/extensions/libxt_helper.man
diff --git a/src/main/jni/iptables/extensions/libxt_iprange.c b/jni/iptables/extensions/libxt_iprange.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_iprange.c
rename to jni/iptables/extensions/libxt_iprange.c
diff --git a/src/main/jni/iptables/extensions/libxt_iprange.man b/jni/iptables/extensions/libxt_iprange.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_iprange.man
rename to jni/iptables/extensions/libxt_iprange.man
diff --git a/src/main/jni/iptables/extensions/libxt_ipvs.c b/jni/iptables/extensions/libxt_ipvs.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_ipvs.c
rename to jni/iptables/extensions/libxt_ipvs.c
diff --git a/src/main/jni/iptables/extensions/libxt_ipvs.man b/jni/iptables/extensions/libxt_ipvs.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_ipvs.man
rename to jni/iptables/extensions/libxt_ipvs.man
diff --git a/src/main/jni/iptables/extensions/libxt_length.c b/jni/iptables/extensions/libxt_length.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_length.c
rename to jni/iptables/extensions/libxt_length.c
diff --git a/src/main/jni/iptables/extensions/libxt_length.man b/jni/iptables/extensions/libxt_length.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_length.man
rename to jni/iptables/extensions/libxt_length.man
diff --git a/src/main/jni/iptables/extensions/libxt_limit.c b/jni/iptables/extensions/libxt_limit.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_limit.c
rename to jni/iptables/extensions/libxt_limit.c
diff --git a/src/main/jni/iptables/extensions/libxt_limit.man b/jni/iptables/extensions/libxt_limit.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_limit.man
rename to jni/iptables/extensions/libxt_limit.man
diff --git a/src/main/jni/iptables/extensions/libxt_mac.c b/jni/iptables/extensions/libxt_mac.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_mac.c
rename to jni/iptables/extensions/libxt_mac.c
diff --git a/src/main/jni/iptables/extensions/libxt_mac.man b/jni/iptables/extensions/libxt_mac.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_mac.man
rename to jni/iptables/extensions/libxt_mac.man
diff --git a/src/main/jni/iptables/extensions/libxt_mark.c b/jni/iptables/extensions/libxt_mark.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_mark.c
rename to jni/iptables/extensions/libxt_mark.c
diff --git a/src/main/jni/iptables/extensions/libxt_mark.man b/jni/iptables/extensions/libxt_mark.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_mark.man
rename to jni/iptables/extensions/libxt_mark.man
diff --git a/src/main/jni/iptables/extensions/libxt_multiport.c b/jni/iptables/extensions/libxt_multiport.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_multiport.c
rename to jni/iptables/extensions/libxt_multiport.c
diff --git a/src/main/jni/iptables/extensions/libxt_multiport.man b/jni/iptables/extensions/libxt_multiport.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_multiport.man
rename to jni/iptables/extensions/libxt_multiport.man
diff --git a/src/main/jni/iptables/extensions/libxt_osf.c b/jni/iptables/extensions/libxt_osf.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_osf.c
rename to jni/iptables/extensions/libxt_osf.c
diff --git a/src/main/jni/iptables/extensions/libxt_osf.man b/jni/iptables/extensions/libxt_osf.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_osf.man
rename to jni/iptables/extensions/libxt_osf.man
diff --git a/src/main/jni/iptables/extensions/libxt_owner.c b/jni/iptables/extensions/libxt_owner.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_owner.c
rename to jni/iptables/extensions/libxt_owner.c
diff --git a/src/main/jni/iptables/extensions/libxt_owner.man b/jni/iptables/extensions/libxt_owner.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_owner.man
rename to jni/iptables/extensions/libxt_owner.man
diff --git a/src/main/jni/iptables/extensions/libxt_physdev.c b/jni/iptables/extensions/libxt_physdev.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_physdev.c
rename to jni/iptables/extensions/libxt_physdev.c
diff --git a/src/main/jni/iptables/extensions/libxt_physdev.man b/jni/iptables/extensions/libxt_physdev.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_physdev.man
rename to jni/iptables/extensions/libxt_physdev.man
diff --git a/src/main/jni/iptables/extensions/libxt_pkttype.c b/jni/iptables/extensions/libxt_pkttype.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_pkttype.c
rename to jni/iptables/extensions/libxt_pkttype.c
diff --git a/src/main/jni/iptables/extensions/libxt_pkttype.man b/jni/iptables/extensions/libxt_pkttype.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_pkttype.man
rename to jni/iptables/extensions/libxt_pkttype.man
diff --git a/src/main/jni/iptables/extensions/libxt_policy.c b/jni/iptables/extensions/libxt_policy.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_policy.c
rename to jni/iptables/extensions/libxt_policy.c
diff --git a/src/main/jni/iptables/extensions/libxt_policy.man b/jni/iptables/extensions/libxt_policy.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_policy.man
rename to jni/iptables/extensions/libxt_policy.man
diff --git a/src/main/jni/iptables/extensions/libxt_quota.c b/jni/iptables/extensions/libxt_quota.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_quota.c
rename to jni/iptables/extensions/libxt_quota.c
diff --git a/src/main/jni/iptables/extensions/libxt_quota.man b/jni/iptables/extensions/libxt_quota.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_quota.man
rename to jni/iptables/extensions/libxt_quota.man
diff --git a/src/main/jni/iptables/extensions/libxt_quota2.c b/jni/iptables/extensions/libxt_quota2.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_quota2.c
rename to jni/iptables/extensions/libxt_quota2.c
diff --git a/src/main/jni/iptables/extensions/libxt_quota2.man b/jni/iptables/extensions/libxt_quota2.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_quota2.man
rename to jni/iptables/extensions/libxt_quota2.man
diff --git a/src/main/jni/iptables/extensions/libxt_rateest.c b/jni/iptables/extensions/libxt_rateest.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_rateest.c
rename to jni/iptables/extensions/libxt_rateest.c
diff --git a/src/main/jni/iptables/extensions/libxt_rateest.man b/jni/iptables/extensions/libxt_rateest.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_rateest.man
rename to jni/iptables/extensions/libxt_rateest.man
diff --git a/src/main/jni/iptables/extensions/libxt_recent.c b/jni/iptables/extensions/libxt_recent.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_recent.c
rename to jni/iptables/extensions/libxt_recent.c
diff --git a/src/main/jni/iptables/extensions/libxt_recent.man b/jni/iptables/extensions/libxt_recent.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_recent.man
rename to jni/iptables/extensions/libxt_recent.man
diff --git a/src/main/jni/iptables/extensions/libxt_sctp.c b/jni/iptables/extensions/libxt_sctp.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_sctp.c
rename to jni/iptables/extensions/libxt_sctp.c
diff --git a/src/main/jni/iptables/extensions/libxt_sctp.man b/jni/iptables/extensions/libxt_sctp.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_sctp.man
rename to jni/iptables/extensions/libxt_sctp.man
diff --git a/src/main/jni/iptables/extensions/libxt_set.c b/jni/iptables/extensions/libxt_set.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_set.c
rename to jni/iptables/extensions/libxt_set.c
diff --git a/src/main/jni/iptables/extensions/libxt_set.h b/jni/iptables/extensions/libxt_set.h
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_set.h
rename to jni/iptables/extensions/libxt_set.h
diff --git a/src/main/jni/iptables/extensions/libxt_set.man b/jni/iptables/extensions/libxt_set.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_set.man
rename to jni/iptables/extensions/libxt_set.man
diff --git a/src/main/jni/iptables/extensions/libxt_socket.c b/jni/iptables/extensions/libxt_socket.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_socket.c
rename to jni/iptables/extensions/libxt_socket.c
diff --git a/src/main/jni/iptables/extensions/libxt_socket.man b/jni/iptables/extensions/libxt_socket.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_socket.man
rename to jni/iptables/extensions/libxt_socket.man
diff --git a/src/main/jni/iptables/extensions/libxt_standard.c b/jni/iptables/extensions/libxt_standard.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_standard.c
rename to jni/iptables/extensions/libxt_standard.c
diff --git a/src/main/jni/iptables/extensions/libxt_state.c b/jni/iptables/extensions/libxt_state.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_state.c
rename to jni/iptables/extensions/libxt_state.c
diff --git a/src/main/jni/iptables/extensions/libxt_state.man b/jni/iptables/extensions/libxt_state.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_state.man
rename to jni/iptables/extensions/libxt_state.man
diff --git a/src/main/jni/iptables/extensions/libxt_statistic.c b/jni/iptables/extensions/libxt_statistic.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_statistic.c
rename to jni/iptables/extensions/libxt_statistic.c
diff --git a/src/main/jni/iptables/extensions/libxt_statistic.man b/jni/iptables/extensions/libxt_statistic.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_statistic.man
rename to jni/iptables/extensions/libxt_statistic.man
diff --git a/src/main/jni/iptables/extensions/libxt_string.c b/jni/iptables/extensions/libxt_string.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_string.c
rename to jni/iptables/extensions/libxt_string.c
diff --git a/src/main/jni/iptables/extensions/libxt_string.man b/jni/iptables/extensions/libxt_string.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_string.man
rename to jni/iptables/extensions/libxt_string.man
diff --git a/src/main/jni/iptables/extensions/libxt_tcp.c b/jni/iptables/extensions/libxt_tcp.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_tcp.c
rename to jni/iptables/extensions/libxt_tcp.c
diff --git a/src/main/jni/iptables/extensions/libxt_tcp.man b/jni/iptables/extensions/libxt_tcp.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_tcp.man
rename to jni/iptables/extensions/libxt_tcp.man
diff --git a/src/main/jni/iptables/extensions/libxt_tcpmss.c b/jni/iptables/extensions/libxt_tcpmss.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_tcpmss.c
rename to jni/iptables/extensions/libxt_tcpmss.c
diff --git a/src/main/jni/iptables/extensions/libxt_tcpmss.man b/jni/iptables/extensions/libxt_tcpmss.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_tcpmss.man
rename to jni/iptables/extensions/libxt_tcpmss.man
diff --git a/src/main/jni/iptables/extensions/libxt_time.c b/jni/iptables/extensions/libxt_time.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_time.c
rename to jni/iptables/extensions/libxt_time.c
diff --git a/src/main/jni/iptables/extensions/libxt_time.man b/jni/iptables/extensions/libxt_time.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_time.man
rename to jni/iptables/extensions/libxt_time.man
diff --git a/src/main/jni/iptables/extensions/libxt_tos.c b/jni/iptables/extensions/libxt_tos.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_tos.c
rename to jni/iptables/extensions/libxt_tos.c
diff --git a/src/main/jni/iptables/extensions/libxt_tos.man b/jni/iptables/extensions/libxt_tos.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_tos.man
rename to jni/iptables/extensions/libxt_tos.man
diff --git a/src/main/jni/iptables/extensions/libxt_u32.c b/jni/iptables/extensions/libxt_u32.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_u32.c
rename to jni/iptables/extensions/libxt_u32.c
diff --git a/src/main/jni/iptables/extensions/libxt_u32.man b/jni/iptables/extensions/libxt_u32.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_u32.man
rename to jni/iptables/extensions/libxt_u32.man
diff --git a/src/main/jni/iptables/extensions/libxt_udp.c b/jni/iptables/extensions/libxt_udp.c
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_udp.c
rename to jni/iptables/extensions/libxt_udp.c
diff --git a/src/main/jni/iptables/extensions/libxt_udp.man b/jni/iptables/extensions/libxt_udp.man
similarity index 100%
rename from src/main/jni/iptables/extensions/libxt_udp.man
rename to jni/iptables/extensions/libxt_udp.man
diff --git a/src/main/jni/iptables/extensions/tos_values.c b/jni/iptables/extensions/tos_values.c
similarity index 100%
rename from src/main/jni/iptables/extensions/tos_values.c
rename to jni/iptables/extensions/tos_values.c
diff --git a/src/main/jni/iptables/include/Makefile.am b/jni/iptables/include/Makefile.am
similarity index 100%
rename from src/main/jni/iptables/include/Makefile.am
rename to jni/iptables/include/Makefile.am
diff --git a/src/main/jni/iptables/include/ip6tables.h b/jni/iptables/include/ip6tables.h
similarity index 100%
rename from src/main/jni/iptables/include/ip6tables.h
rename to jni/iptables/include/ip6tables.h
diff --git a/src/main/jni/iptables/include/iptables.h b/jni/iptables/include/iptables.h
similarity index 100%
rename from src/main/jni/iptables/include/iptables.h
rename to jni/iptables/include/iptables.h
diff --git a/src/main/jni/iptables/include/iptables/internal.h b/jni/iptables/include/iptables/internal.h
similarity index 100%
rename from src/main/jni/iptables/include/iptables/internal.h
rename to jni/iptables/include/iptables/internal.h
diff --git a/src/main/jni/iptables/include/iptables/internal.h.in b/jni/iptables/include/iptables/internal.h.in
similarity index 100%
rename from src/main/jni/iptables/include/iptables/internal.h.in
rename to jni/iptables/include/iptables/internal.h.in
diff --git a/src/main/jni/iptables/include/libipq/libipq.h b/jni/iptables/include/libipq/libipq.h
similarity index 100%
rename from src/main/jni/iptables/include/libipq/libipq.h
rename to jni/iptables/include/libipq/libipq.h
diff --git a/src/main/jni/iptables/include/libiptc/ipt_kernel_headers.h b/jni/iptables/include/libiptc/ipt_kernel_headers.h
similarity index 100%
rename from src/main/jni/iptables/include/libiptc/ipt_kernel_headers.h
rename to jni/iptables/include/libiptc/ipt_kernel_headers.h
diff --git a/src/main/jni/iptables/include/libiptc/libip6tc.h b/jni/iptables/include/libiptc/libip6tc.h
similarity index 100%
rename from src/main/jni/iptables/include/libiptc/libip6tc.h
rename to jni/iptables/include/libiptc/libip6tc.h
diff --git a/src/main/jni/iptables/include/libiptc/libiptc.h b/jni/iptables/include/libiptc/libiptc.h
similarity index 100%
rename from src/main/jni/iptables/include/libiptc/libiptc.h
rename to jni/iptables/include/libiptc/libiptc.h
diff --git a/src/main/jni/iptables/include/libiptc/libxtc.h b/jni/iptables/include/libiptc/libxtc.h
similarity index 100%
rename from src/main/jni/iptables/include/libiptc/libxtc.h
rename to jni/iptables/include/libiptc/libxtc.h
diff --git a/src/main/jni/iptables/include/libipulog/libipulog.h b/jni/iptables/include/libipulog/libipulog.h
similarity index 100%
rename from src/main/jni/iptables/include/libipulog/libipulog.h
rename to jni/iptables/include/libipulog/libipulog.h
diff --git a/src/main/jni/iptables/include/linux/kernel.h b/jni/iptables/include/linux/kernel.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/kernel.h
rename to jni/iptables/include/linux/kernel.h
diff --git a/src/main/jni/iptables/include/linux/netfilter.h b/jni/iptables/include/linux/netfilter.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter.h
rename to jni/iptables/include/linux/netfilter.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/nf_conntrack_common.h b/jni/iptables/include/linux/netfilter/nf_conntrack_common.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/nf_conntrack_common.h
rename to jni/iptables/include/linux/netfilter/nf_conntrack_common.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/nf_conntrack_tuple_common.h b/jni/iptables/include/linux/netfilter/nf_conntrack_tuple_common.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/nf_conntrack_tuple_common.h
rename to jni/iptables/include/linux/netfilter/nf_conntrack_tuple_common.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/x_tables.h b/jni/iptables/include/linux/netfilter/x_tables.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/x_tables.h
rename to jni/iptables/include/linux/netfilter/x_tables.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_AUDIT.h b/jni/iptables/include/linux/netfilter/xt_AUDIT.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_AUDIT.h
rename to jni/iptables/include/linux/netfilter/xt_AUDIT.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_CHECKSUM.h b/jni/iptables/include/linux/netfilter/xt_CHECKSUM.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_CHECKSUM.h
rename to jni/iptables/include/linux/netfilter/xt_CHECKSUM.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_CLASSIFY.h b/jni/iptables/include/linux/netfilter/xt_CLASSIFY.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_CLASSIFY.h
rename to jni/iptables/include/linux/netfilter/xt_CLASSIFY.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_CONNSECMARK.h b/jni/iptables/include/linux/netfilter/xt_CONNSECMARK.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_CONNSECMARK.h
rename to jni/iptables/include/linux/netfilter/xt_CONNSECMARK.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_CT.h b/jni/iptables/include/linux/netfilter/xt_CT.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_CT.h
rename to jni/iptables/include/linux/netfilter/xt_CT.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_IDLETIMER.h b/jni/iptables/include/linux/netfilter/xt_IDLETIMER.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_IDLETIMER.h
rename to jni/iptables/include/linux/netfilter/xt_IDLETIMER.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_LED.h b/jni/iptables/include/linux/netfilter/xt_LED.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_LED.h
rename to jni/iptables/include/linux/netfilter/xt_LED.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_NFLOG.h b/jni/iptables/include/linux/netfilter/xt_NFLOG.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_NFLOG.h
rename to jni/iptables/include/linux/netfilter/xt_NFLOG.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_NFQUEUE.h b/jni/iptables/include/linux/netfilter/xt_NFQUEUE.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_NFQUEUE.h
rename to jni/iptables/include/linux/netfilter/xt_NFQUEUE.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_SECMARK.h b/jni/iptables/include/linux/netfilter/xt_SECMARK.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_SECMARK.h
rename to jni/iptables/include/linux/netfilter/xt_SECMARK.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_TCPOPTSTRIP.h b/jni/iptables/include/linux/netfilter/xt_TCPOPTSTRIP.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_TCPOPTSTRIP.h
rename to jni/iptables/include/linux/netfilter/xt_TCPOPTSTRIP.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_TEE.h b/jni/iptables/include/linux/netfilter/xt_TEE.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_TEE.h
rename to jni/iptables/include/linux/netfilter/xt_TEE.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_TPROXY.h b/jni/iptables/include/linux/netfilter/xt_TPROXY.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_TPROXY.h
rename to jni/iptables/include/linux/netfilter/xt_TPROXY.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_cluster.h b/jni/iptables/include/linux/netfilter/xt_cluster.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_cluster.h
rename to jni/iptables/include/linux/netfilter/xt_cluster.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_comment.h b/jni/iptables/include/linux/netfilter/xt_comment.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_comment.h
rename to jni/iptables/include/linux/netfilter/xt_comment.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_connbytes.h b/jni/iptables/include/linux/netfilter/xt_connbytes.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_connbytes.h
rename to jni/iptables/include/linux/netfilter/xt_connbytes.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_connlimit.h b/jni/iptables/include/linux/netfilter/xt_connlimit.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_connlimit.h
rename to jni/iptables/include/linux/netfilter/xt_connlimit.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_connmark.h b/jni/iptables/include/linux/netfilter/xt_connmark.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_connmark.h
rename to jni/iptables/include/linux/netfilter/xt_connmark.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_conntrack.h b/jni/iptables/include/linux/netfilter/xt_conntrack.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_conntrack.h
rename to jni/iptables/include/linux/netfilter/xt_conntrack.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_cpu.h b/jni/iptables/include/linux/netfilter/xt_cpu.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_cpu.h
rename to jni/iptables/include/linux/netfilter/xt_cpu.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_dccp.h b/jni/iptables/include/linux/netfilter/xt_dccp.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_dccp.h
rename to jni/iptables/include/linux/netfilter/xt_dccp.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_devgroup.h b/jni/iptables/include/linux/netfilter/xt_devgroup.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_devgroup.h
rename to jni/iptables/include/linux/netfilter/xt_devgroup.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_dscp.h b/jni/iptables/include/linux/netfilter/xt_dscp.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_dscp.h
rename to jni/iptables/include/linux/netfilter/xt_dscp.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_esp.h b/jni/iptables/include/linux/netfilter/xt_esp.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_esp.h
rename to jni/iptables/include/linux/netfilter/xt_esp.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_hashlimit.h b/jni/iptables/include/linux/netfilter/xt_hashlimit.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_hashlimit.h
rename to jni/iptables/include/linux/netfilter/xt_hashlimit.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_helper.h b/jni/iptables/include/linux/netfilter/xt_helper.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_helper.h
rename to jni/iptables/include/linux/netfilter/xt_helper.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_iprange.h b/jni/iptables/include/linux/netfilter/xt_iprange.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_iprange.h
rename to jni/iptables/include/linux/netfilter/xt_iprange.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_ipvs.h b/jni/iptables/include/linux/netfilter/xt_ipvs.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_ipvs.h
rename to jni/iptables/include/linux/netfilter/xt_ipvs.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_length.h b/jni/iptables/include/linux/netfilter/xt_length.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_length.h
rename to jni/iptables/include/linux/netfilter/xt_length.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_limit.h b/jni/iptables/include/linux/netfilter/xt_limit.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_limit.h
rename to jni/iptables/include/linux/netfilter/xt_limit.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_mac.h b/jni/iptables/include/linux/netfilter/xt_mac.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_mac.h
rename to jni/iptables/include/linux/netfilter/xt_mac.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_mark.h b/jni/iptables/include/linux/netfilter/xt_mark.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_mark.h
rename to jni/iptables/include/linux/netfilter/xt_mark.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_multiport.h b/jni/iptables/include/linux/netfilter/xt_multiport.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_multiport.h
rename to jni/iptables/include/linux/netfilter/xt_multiport.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_osf.h b/jni/iptables/include/linux/netfilter/xt_osf.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_osf.h
rename to jni/iptables/include/linux/netfilter/xt_osf.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_owner.h b/jni/iptables/include/linux/netfilter/xt_owner.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_owner.h
rename to jni/iptables/include/linux/netfilter/xt_owner.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_physdev.h b/jni/iptables/include/linux/netfilter/xt_physdev.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_physdev.h
rename to jni/iptables/include/linux/netfilter/xt_physdev.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_pkttype.h b/jni/iptables/include/linux/netfilter/xt_pkttype.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_pkttype.h
rename to jni/iptables/include/linux/netfilter/xt_pkttype.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_policy.h b/jni/iptables/include/linux/netfilter/xt_policy.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_policy.h
rename to jni/iptables/include/linux/netfilter/xt_policy.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_quota.h b/jni/iptables/include/linux/netfilter/xt_quota.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_quota.h
rename to jni/iptables/include/linux/netfilter/xt_quota.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_quota2.h b/jni/iptables/include/linux/netfilter/xt_quota2.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_quota2.h
rename to jni/iptables/include/linux/netfilter/xt_quota2.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_rateest.h b/jni/iptables/include/linux/netfilter/xt_rateest.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_rateest.h
rename to jni/iptables/include/linux/netfilter/xt_rateest.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_realm.h b/jni/iptables/include/linux/netfilter/xt_realm.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_realm.h
rename to jni/iptables/include/linux/netfilter/xt_realm.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_recent.h b/jni/iptables/include/linux/netfilter/xt_recent.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_recent.h
rename to jni/iptables/include/linux/netfilter/xt_recent.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_sctp.h b/jni/iptables/include/linux/netfilter/xt_sctp.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_sctp.h
rename to jni/iptables/include/linux/netfilter/xt_sctp.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_set.h b/jni/iptables/include/linux/netfilter/xt_set.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_set.h
rename to jni/iptables/include/linux/netfilter/xt_set.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_socket.h b/jni/iptables/include/linux/netfilter/xt_socket.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_socket.h
rename to jni/iptables/include/linux/netfilter/xt_socket.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_state.h b/jni/iptables/include/linux/netfilter/xt_state.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_state.h
rename to jni/iptables/include/linux/netfilter/xt_state.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_statistic.h b/jni/iptables/include/linux/netfilter/xt_statistic.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_statistic.h
rename to jni/iptables/include/linux/netfilter/xt_statistic.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_string.h b/jni/iptables/include/linux/netfilter/xt_string.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_string.h
rename to jni/iptables/include/linux/netfilter/xt_string.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_tcpmss.h b/jni/iptables/include/linux/netfilter/xt_tcpmss.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_tcpmss.h
rename to jni/iptables/include/linux/netfilter/xt_tcpmss.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_tcpudp.h b/jni/iptables/include/linux/netfilter/xt_tcpudp.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_tcpudp.h
rename to jni/iptables/include/linux/netfilter/xt_tcpudp.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_time.h b/jni/iptables/include/linux/netfilter/xt_time.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_time.h
rename to jni/iptables/include/linux/netfilter/xt_time.h
diff --git a/src/main/jni/iptables/include/linux/netfilter/xt_u32.h b/jni/iptables/include/linux/netfilter/xt_u32.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter/xt_u32.h
rename to jni/iptables/include/linux/netfilter/xt_u32.h
diff --git a/src/main/jni/iptables/include/linux/netfilter_ipv4.h b/jni/iptables/include/linux/netfilter_ipv4.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter_ipv4.h
rename to jni/iptables/include/linux/netfilter_ipv4.h
diff --git a/src/main/jni/iptables/include/linux/netfilter_ipv4/ip_tables.h b/jni/iptables/include/linux/netfilter_ipv4/ip_tables.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter_ipv4/ip_tables.h
rename to jni/iptables/include/linux/netfilter_ipv4/ip_tables.h
diff --git a/src/main/jni/iptables/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h b/jni/iptables/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h
rename to jni/iptables/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h
diff --git a/src/main/jni/iptables/include/linux/netfilter_ipv4/ipt_LOG.h b/jni/iptables/include/linux/netfilter_ipv4/ipt_LOG.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter_ipv4/ipt_LOG.h
rename to jni/iptables/include/linux/netfilter_ipv4/ipt_LOG.h
diff --git a/src/main/jni/iptables/include/linux/netfilter_ipv4/ipt_REJECT.h b/jni/iptables/include/linux/netfilter_ipv4/ipt_REJECT.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter_ipv4/ipt_REJECT.h
rename to jni/iptables/include/linux/netfilter_ipv4/ipt_REJECT.h
diff --git a/src/main/jni/iptables/include/linux/netfilter_ipv4/ipt_SAME.h b/jni/iptables/include/linux/netfilter_ipv4/ipt_SAME.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter_ipv4/ipt_SAME.h
rename to jni/iptables/include/linux/netfilter_ipv4/ipt_SAME.h
diff --git a/src/main/jni/iptables/include/linux/netfilter_ipv4/ipt_ULOG.h b/jni/iptables/include/linux/netfilter_ipv4/ipt_ULOG.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter_ipv4/ipt_ULOG.h
rename to jni/iptables/include/linux/netfilter_ipv4/ipt_ULOG.h
diff --git a/src/main/jni/iptables/include/linux/netfilter_ipv4/ipt_addrtype.h b/jni/iptables/include/linux/netfilter_ipv4/ipt_addrtype.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter_ipv4/ipt_addrtype.h
rename to jni/iptables/include/linux/netfilter_ipv4/ipt_addrtype.h
diff --git a/src/main/jni/iptables/include/linux/netfilter_ipv4/ipt_ah.h b/jni/iptables/include/linux/netfilter_ipv4/ipt_ah.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter_ipv4/ipt_ah.h
rename to jni/iptables/include/linux/netfilter_ipv4/ipt_ah.h
diff --git a/src/main/jni/iptables/include/linux/netfilter_ipv4/ipt_ecn.h b/jni/iptables/include/linux/netfilter_ipv4/ipt_ecn.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter_ipv4/ipt_ecn.h
rename to jni/iptables/include/linux/netfilter_ipv4/ipt_ecn.h
diff --git a/src/main/jni/iptables/include/linux/netfilter_ipv4/ipt_realm.h b/jni/iptables/include/linux/netfilter_ipv4/ipt_realm.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter_ipv4/ipt_realm.h
rename to jni/iptables/include/linux/netfilter_ipv4/ipt_realm.h
diff --git a/src/main/jni/iptables/include/linux/netfilter_ipv4/ipt_ttl.h b/jni/iptables/include/linux/netfilter_ipv4/ipt_ttl.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter_ipv4/ipt_ttl.h
rename to jni/iptables/include/linux/netfilter_ipv4/ipt_ttl.h
diff --git a/src/main/jni/iptables/include/linux/netfilter_ipv6.h b/jni/iptables/include/linux/netfilter_ipv6.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter_ipv6.h
rename to jni/iptables/include/linux/netfilter_ipv6.h
diff --git a/src/main/jni/iptables/include/linux/netfilter_ipv6/ip6_tables.h b/jni/iptables/include/linux/netfilter_ipv6/ip6_tables.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter_ipv6/ip6_tables.h
rename to jni/iptables/include/linux/netfilter_ipv6/ip6_tables.h
diff --git a/src/main/jni/iptables/include/linux/netfilter_ipv6/ip6t_LOG.h b/jni/iptables/include/linux/netfilter_ipv6/ip6t_LOG.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter_ipv6/ip6t_LOG.h
rename to jni/iptables/include/linux/netfilter_ipv6/ip6t_LOG.h
diff --git a/src/main/jni/iptables/include/linux/netfilter_ipv6/ip6t_REJECT.h b/jni/iptables/include/linux/netfilter_ipv6/ip6t_REJECT.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter_ipv6/ip6t_REJECT.h
rename to jni/iptables/include/linux/netfilter_ipv6/ip6t_REJECT.h
diff --git a/src/main/jni/iptables/include/linux/netfilter_ipv6/ip6t_ah.h b/jni/iptables/include/linux/netfilter_ipv6/ip6t_ah.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter_ipv6/ip6t_ah.h
rename to jni/iptables/include/linux/netfilter_ipv6/ip6t_ah.h
diff --git a/src/main/jni/iptables/include/linux/netfilter_ipv6/ip6t_frag.h b/jni/iptables/include/linux/netfilter_ipv6/ip6t_frag.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter_ipv6/ip6t_frag.h
rename to jni/iptables/include/linux/netfilter_ipv6/ip6t_frag.h
diff --git a/src/main/jni/iptables/include/linux/netfilter_ipv6/ip6t_hl.h b/jni/iptables/include/linux/netfilter_ipv6/ip6t_hl.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter_ipv6/ip6t_hl.h
rename to jni/iptables/include/linux/netfilter_ipv6/ip6t_hl.h
diff --git a/src/main/jni/iptables/include/linux/netfilter_ipv6/ip6t_ipv6header.h b/jni/iptables/include/linux/netfilter_ipv6/ip6t_ipv6header.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter_ipv6/ip6t_ipv6header.h
rename to jni/iptables/include/linux/netfilter_ipv6/ip6t_ipv6header.h
diff --git a/src/main/jni/iptables/include/linux/netfilter_ipv6/ip6t_mh.h b/jni/iptables/include/linux/netfilter_ipv6/ip6t_mh.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter_ipv6/ip6t_mh.h
rename to jni/iptables/include/linux/netfilter_ipv6/ip6t_mh.h
diff --git a/src/main/jni/iptables/include/linux/netfilter_ipv6/ip6t_opts.h b/jni/iptables/include/linux/netfilter_ipv6/ip6t_opts.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter_ipv6/ip6t_opts.h
rename to jni/iptables/include/linux/netfilter_ipv6/ip6t_opts.h
diff --git a/src/main/jni/iptables/include/linux/netfilter_ipv6/ip6t_rt.h b/jni/iptables/include/linux/netfilter_ipv6/ip6t_rt.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/netfilter_ipv6/ip6t_rt.h
rename to jni/iptables/include/linux/netfilter_ipv6/ip6t_rt.h
diff --git a/src/main/jni/iptables/include/linux/types.h b/jni/iptables/include/linux/types.h
similarity index 100%
rename from src/main/jni/iptables/include/linux/types.h
rename to jni/iptables/include/linux/types.h
diff --git a/src/main/jni/iptables/include/net/netfilter/nf_conntrack_tuple.h b/jni/iptables/include/net/netfilter/nf_conntrack_tuple.h
similarity index 100%
rename from src/main/jni/iptables/include/net/netfilter/nf_conntrack_tuple.h
rename to jni/iptables/include/net/netfilter/nf_conntrack_tuple.h
diff --git a/src/main/jni/iptables/include/net/netfilter/nf_nat.h b/jni/iptables/include/net/netfilter/nf_nat.h
similarity index 100%
rename from src/main/jni/iptables/include/net/netfilter/nf_nat.h
rename to jni/iptables/include/net/netfilter/nf_nat.h
diff --git a/src/main/jni/iptables/include/xtables.h b/jni/iptables/include/xtables.h
similarity index 100%
rename from src/main/jni/iptables/include/xtables.h
rename to jni/iptables/include/xtables.h
diff --git a/src/main/jni/iptables/include/xtables.h.in b/jni/iptables/include/xtables.h.in
similarity index 100%
rename from src/main/jni/iptables/include/xtables.h.in
rename to jni/iptables/include/xtables.h.in
diff --git a/src/main/jni/iptables/iptables/.gitignore b/jni/iptables/iptables/.gitignore
similarity index 100%
rename from src/main/jni/iptables/iptables/.gitignore
rename to jni/iptables/iptables/.gitignore
diff --git a/src/main/jni/iptables/iptables/Android.mk b/jni/iptables/iptables/Android.mk
similarity index 100%
rename from src/main/jni/iptables/iptables/Android.mk
rename to jni/iptables/iptables/Android.mk
diff --git a/src/main/jni/iptables/iptables/Makefile.am b/jni/iptables/iptables/Makefile.am
similarity index 100%
rename from src/main/jni/iptables/iptables/Makefile.am
rename to jni/iptables/iptables/Makefile.am
diff --git a/src/main/jni/iptables/iptables/ip6tables-multi.h b/jni/iptables/iptables/ip6tables-multi.h
similarity index 100%
rename from src/main/jni/iptables/iptables/ip6tables-multi.h
rename to jni/iptables/iptables/ip6tables-multi.h
diff --git a/src/main/jni/iptables/iptables/ip6tables-restore.8 b/jni/iptables/iptables/ip6tables-restore.8
similarity index 100%
rename from src/main/jni/iptables/iptables/ip6tables-restore.8
rename to jni/iptables/iptables/ip6tables-restore.8
diff --git a/src/main/jni/iptables/iptables/ip6tables-restore.c b/jni/iptables/iptables/ip6tables-restore.c
similarity index 100%
rename from src/main/jni/iptables/iptables/ip6tables-restore.c
rename to jni/iptables/iptables/ip6tables-restore.c
diff --git a/src/main/jni/iptables/iptables/ip6tables-save.8 b/jni/iptables/iptables/ip6tables-save.8
similarity index 100%
rename from src/main/jni/iptables/iptables/ip6tables-save.8
rename to jni/iptables/iptables/ip6tables-save.8
diff --git a/src/main/jni/iptables/iptables/ip6tables-save.c b/jni/iptables/iptables/ip6tables-save.c
similarity index 100%
rename from src/main/jni/iptables/iptables/ip6tables-save.c
rename to jni/iptables/iptables/ip6tables-save.c
diff --git a/src/main/jni/iptables/iptables/ip6tables-standalone.c b/jni/iptables/iptables/ip6tables-standalone.c
similarity index 100%
rename from src/main/jni/iptables/iptables/ip6tables-standalone.c
rename to jni/iptables/iptables/ip6tables-standalone.c
diff --git a/src/main/jni/iptables/iptables/ip6tables.8.in b/jni/iptables/iptables/ip6tables.8.in
similarity index 100%
rename from src/main/jni/iptables/iptables/ip6tables.8.in
rename to jni/iptables/iptables/ip6tables.8.in
diff --git a/src/main/jni/iptables/iptables/ip6tables.c b/jni/iptables/iptables/ip6tables.c
similarity index 100%
rename from src/main/jni/iptables/iptables/ip6tables.c
rename to jni/iptables/iptables/ip6tables.c
diff --git a/src/main/jni/iptables/iptables/iptables-apply b/jni/iptables/iptables/iptables-apply
similarity index 100%
rename from src/main/jni/iptables/iptables/iptables-apply
rename to jni/iptables/iptables/iptables-apply
diff --git a/src/main/jni/iptables/iptables/iptables-apply.8 b/jni/iptables/iptables/iptables-apply.8
similarity index 100%
rename from src/main/jni/iptables/iptables/iptables-apply.8
rename to jni/iptables/iptables/iptables-apply.8
diff --git a/src/main/jni/iptables/iptables/iptables-multi.h b/jni/iptables/iptables/iptables-multi.h
similarity index 100%
rename from src/main/jni/iptables/iptables/iptables-multi.h
rename to jni/iptables/iptables/iptables-multi.h
diff --git a/src/main/jni/iptables/iptables/iptables-restore.8 b/jni/iptables/iptables/iptables-restore.8
similarity index 100%
rename from src/main/jni/iptables/iptables/iptables-restore.8
rename to jni/iptables/iptables/iptables-restore.8
diff --git a/src/main/jni/iptables/iptables/iptables-restore.c b/jni/iptables/iptables/iptables-restore.c
similarity index 100%
rename from src/main/jni/iptables/iptables/iptables-restore.c
rename to jni/iptables/iptables/iptables-restore.c
diff --git a/src/main/jni/iptables/iptables/iptables-save.8 b/jni/iptables/iptables/iptables-save.8
similarity index 100%
rename from src/main/jni/iptables/iptables/iptables-save.8
rename to jni/iptables/iptables/iptables-save.8
diff --git a/src/main/jni/iptables/iptables/iptables-save.c b/jni/iptables/iptables/iptables-save.c
similarity index 100%
rename from src/main/jni/iptables/iptables/iptables-save.c
rename to jni/iptables/iptables/iptables-save.c
diff --git a/src/main/jni/iptables/iptables/iptables-standalone.c b/jni/iptables/iptables/iptables-standalone.c
similarity index 100%
rename from src/main/jni/iptables/iptables/iptables-standalone.c
rename to jni/iptables/iptables/iptables-standalone.c
diff --git a/src/main/jni/iptables/iptables/iptables-xml.1 b/jni/iptables/iptables/iptables-xml.1
similarity index 100%
rename from src/main/jni/iptables/iptables/iptables-xml.1
rename to jni/iptables/iptables/iptables-xml.1
diff --git a/src/main/jni/iptables/iptables/iptables-xml.c b/jni/iptables/iptables/iptables-xml.c
similarity index 100%
rename from src/main/jni/iptables/iptables/iptables-xml.c
rename to jni/iptables/iptables/iptables-xml.c
diff --git a/src/main/jni/iptables/iptables/iptables.8.in b/jni/iptables/iptables/iptables.8.in
similarity index 100%
rename from src/main/jni/iptables/iptables/iptables.8.in
rename to jni/iptables/iptables/iptables.8.in
diff --git a/src/main/jni/iptables/iptables/iptables.c b/jni/iptables/iptables/iptables.c
similarity index 100%
rename from src/main/jni/iptables/iptables/iptables.c
rename to jni/iptables/iptables/iptables.c
diff --git a/src/main/jni/iptables/iptables/iptables.xslt b/jni/iptables/iptables/iptables.xslt
similarity index 100%
rename from src/main/jni/iptables/iptables/iptables.xslt
rename to jni/iptables/iptables/iptables.xslt
diff --git a/src/main/jni/iptables/iptables/xshared.c b/jni/iptables/iptables/xshared.c
similarity index 100%
rename from src/main/jni/iptables/iptables/xshared.c
rename to jni/iptables/iptables/xshared.c
diff --git a/src/main/jni/iptables/iptables/xshared.h b/jni/iptables/iptables/xshared.h
similarity index 100%
rename from src/main/jni/iptables/iptables/xshared.h
rename to jni/iptables/iptables/xshared.h
diff --git a/src/main/jni/iptables/iptables/xtables-multi.c b/jni/iptables/iptables/xtables-multi.c
similarity index 100%
rename from src/main/jni/iptables/iptables/xtables-multi.c
rename to jni/iptables/iptables/xtables-multi.c
diff --git a/src/main/jni/iptables/iptables/xtables-multi.h b/jni/iptables/iptables/xtables-multi.h
similarity index 100%
rename from src/main/jni/iptables/iptables/xtables-multi.h
rename to jni/iptables/iptables/xtables-multi.h
diff --git a/src/main/jni/iptables/iptables/xtables.c b/jni/iptables/iptables/xtables.c
similarity index 100%
rename from src/main/jni/iptables/iptables/xtables.c
rename to jni/iptables/iptables/xtables.c
diff --git a/src/main/jni/iptables/iptables/xtables.pc.in b/jni/iptables/iptables/xtables.pc.in
similarity index 100%
rename from src/main/jni/iptables/iptables/xtables.pc.in
rename to jni/iptables/iptables/xtables.pc.in
diff --git a/src/main/jni/iptables/iptables/xtoptions.c b/jni/iptables/iptables/xtoptions.c
similarity index 100%
rename from src/main/jni/iptables/iptables/xtoptions.c
rename to jni/iptables/iptables/xtoptions.c
diff --git a/src/main/jni/iptables/libipq/Makefile.am b/jni/iptables/libipq/Makefile.am
similarity index 100%
rename from src/main/jni/iptables/libipq/Makefile.am
rename to jni/iptables/libipq/Makefile.am
diff --git a/src/main/jni/iptables/libipq/ipq_create_handle.3 b/jni/iptables/libipq/ipq_create_handle.3
similarity index 100%
rename from src/main/jni/iptables/libipq/ipq_create_handle.3
rename to jni/iptables/libipq/ipq_create_handle.3
diff --git a/src/main/jni/iptables/libipq/ipq_destroy_handle.3 b/jni/iptables/libipq/ipq_destroy_handle.3
similarity index 100%
rename from src/main/jni/iptables/libipq/ipq_destroy_handle.3
rename to jni/iptables/libipq/ipq_destroy_handle.3
diff --git a/src/main/jni/iptables/libipq/ipq_errstr.3 b/jni/iptables/libipq/ipq_errstr.3
similarity index 100%
rename from src/main/jni/iptables/libipq/ipq_errstr.3
rename to jni/iptables/libipq/ipq_errstr.3
diff --git a/src/main/jni/iptables/libipq/ipq_get_msgerr.3 b/jni/iptables/libipq/ipq_get_msgerr.3
similarity index 100%
rename from src/main/jni/iptables/libipq/ipq_get_msgerr.3
rename to jni/iptables/libipq/ipq_get_msgerr.3
diff --git a/src/main/jni/iptables/libipq/ipq_get_packet.3 b/jni/iptables/libipq/ipq_get_packet.3
similarity index 100%
rename from src/main/jni/iptables/libipq/ipq_get_packet.3
rename to jni/iptables/libipq/ipq_get_packet.3
diff --git a/src/main/jni/iptables/libipq/ipq_message_type.3 b/jni/iptables/libipq/ipq_message_type.3
similarity index 100%
rename from src/main/jni/iptables/libipq/ipq_message_type.3
rename to jni/iptables/libipq/ipq_message_type.3
diff --git a/src/main/jni/iptables/libipq/ipq_perror.3 b/jni/iptables/libipq/ipq_perror.3
similarity index 100%
rename from src/main/jni/iptables/libipq/ipq_perror.3
rename to jni/iptables/libipq/ipq_perror.3
diff --git a/src/main/jni/iptables/libipq/ipq_read.3 b/jni/iptables/libipq/ipq_read.3
similarity index 100%
rename from src/main/jni/iptables/libipq/ipq_read.3
rename to jni/iptables/libipq/ipq_read.3
diff --git a/src/main/jni/iptables/libipq/ipq_set_mode.3 b/jni/iptables/libipq/ipq_set_mode.3
similarity index 100%
rename from src/main/jni/iptables/libipq/ipq_set_mode.3
rename to jni/iptables/libipq/ipq_set_mode.3
diff --git a/src/main/jni/iptables/libipq/ipq_set_verdict.3 b/jni/iptables/libipq/ipq_set_verdict.3
similarity index 100%
rename from src/main/jni/iptables/libipq/ipq_set_verdict.3
rename to jni/iptables/libipq/ipq_set_verdict.3
diff --git a/src/main/jni/iptables/libipq/libipq.3 b/jni/iptables/libipq/libipq.3
similarity index 100%
rename from src/main/jni/iptables/libipq/libipq.3
rename to jni/iptables/libipq/libipq.3
diff --git a/src/main/jni/iptables/libipq/libipq.c b/jni/iptables/libipq/libipq.c
similarity index 100%
rename from src/main/jni/iptables/libipq/libipq.c
rename to jni/iptables/libipq/libipq.c
diff --git a/src/main/jni/iptables/libiptc/.gitignore b/jni/iptables/libiptc/.gitignore
similarity index 100%
rename from src/main/jni/iptables/libiptc/.gitignore
rename to jni/iptables/libiptc/.gitignore
diff --git a/src/main/jni/iptables/libiptc/Android.mk b/jni/iptables/libiptc/Android.mk
similarity index 100%
rename from src/main/jni/iptables/libiptc/Android.mk
rename to jni/iptables/libiptc/Android.mk
diff --git a/src/main/jni/iptables/libiptc/Makefile.am b/jni/iptables/libiptc/Makefile.am
similarity index 100%
rename from src/main/jni/iptables/libiptc/Makefile.am
rename to jni/iptables/libiptc/Makefile.am
diff --git a/src/main/jni/iptables/libiptc/libip4tc.c b/jni/iptables/libiptc/libip4tc.c
similarity index 100%
rename from src/main/jni/iptables/libiptc/libip4tc.c
rename to jni/iptables/libiptc/libip4tc.c
diff --git a/src/main/jni/iptables/libiptc/libip6tc.c b/jni/iptables/libiptc/libip6tc.c
similarity index 100%
rename from src/main/jni/iptables/libiptc/libip6tc.c
rename to jni/iptables/libiptc/libip6tc.c
diff --git a/src/main/jni/iptables/libiptc/libiptc.c b/jni/iptables/libiptc/libiptc.c
similarity index 100%
rename from src/main/jni/iptables/libiptc/libiptc.c
rename to jni/iptables/libiptc/libiptc.c
diff --git a/src/main/jni/iptables/libiptc/libiptc.pc.in b/jni/iptables/libiptc/libiptc.pc.in
similarity index 100%
rename from src/main/jni/iptables/libiptc/libiptc.pc.in
rename to jni/iptables/libiptc/libiptc.pc.in
diff --git a/src/main/jni/iptables/libiptc/linux_list.h b/jni/iptables/libiptc/linux_list.h
similarity index 100%
rename from src/main/jni/iptables/libiptc/linux_list.h
rename to jni/iptables/libiptc/linux_list.h
diff --git a/src/main/jni/iptables/libiptc/linux_stddef.h b/jni/iptables/libiptc/linux_stddef.h
similarity index 100%
rename from src/main/jni/iptables/libiptc/linux_stddef.h
rename to jni/iptables/libiptc/linux_stddef.h
diff --git a/src/main/jni/iptables/m4/.gitignore b/jni/iptables/m4/.gitignore
similarity index 100%
rename from src/main/jni/iptables/m4/.gitignore
rename to jni/iptables/m4/.gitignore
diff --git a/src/main/jni/iptables/m4/ax_check_linker_flags.m4 b/jni/iptables/m4/ax_check_linker_flags.m4
similarity index 100%
rename from src/main/jni/iptables/m4/ax_check_linker_flags.m4
rename to jni/iptables/m4/ax_check_linker_flags.m4
diff --git a/src/main/jni/iptables/release.sh b/jni/iptables/release.sh
similarity index 100%
rename from src/main/jni/iptables/release.sh
rename to jni/iptables/release.sh
diff --git a/src/main/jni/iptables/tests/options-ipv4.rules b/jni/iptables/tests/options-ipv4.rules
similarity index 100%
rename from src/main/jni/iptables/tests/options-ipv4.rules
rename to jni/iptables/tests/options-ipv4.rules
diff --git a/src/main/jni/iptables/tests/options-most.rules b/jni/iptables/tests/options-most.rules
similarity index 100%
rename from src/main/jni/iptables/tests/options-most.rules
rename to jni/iptables/tests/options-most.rules
diff --git a/src/main/jni/iptables/utils/.gitignore b/jni/iptables/utils/.gitignore
similarity index 100%
rename from src/main/jni/iptables/utils/.gitignore
rename to jni/iptables/utils/.gitignore
diff --git a/src/main/jni/iptables/utils/Makefile.am b/jni/iptables/utils/Makefile.am
similarity index 100%
rename from src/main/jni/iptables/utils/Makefile.am
rename to jni/iptables/utils/Makefile.am
diff --git a/src/main/jni/iptables/utils/nfnl_osf.c b/jni/iptables/utils/nfnl_osf.c
similarity index 100%
rename from src/main/jni/iptables/utils/nfnl_osf.c
rename to jni/iptables/utils/nfnl_osf.c
diff --git a/src/main/jni/iptables/utils/pf.os b/jni/iptables/utils/pf.os
similarity index 100%
rename from src/main/jni/iptables/utils/pf.os
rename to jni/iptables/utils/pf.os
diff --git a/src/main/jni/libev/Changes b/jni/libev/Changes
similarity index 100%
rename from src/main/jni/libev/Changes
rename to jni/libev/Changes
diff --git a/src/main/jni/libev/LICENSE b/jni/libev/LICENSE
similarity index 100%
rename from src/main/jni/libev/LICENSE
rename to jni/libev/LICENSE
diff --git a/src/main/jni/libev/README b/jni/libev/README
similarity index 100%
rename from src/main/jni/libev/README
rename to jni/libev/README
diff --git a/src/main/jni/libev/config.h b/jni/libev/config.h
similarity index 100%
rename from src/main/jni/libev/config.h
rename to jni/libev/config.h
diff --git a/src/main/jni/libev/ev++.h b/jni/libev/ev++.h
similarity index 100%
rename from src/main/jni/libev/ev++.h
rename to jni/libev/ev++.h
diff --git a/src/main/jni/libev/ev.c b/jni/libev/ev.c
similarity index 100%
rename from src/main/jni/libev/ev.c
rename to jni/libev/ev.c
diff --git a/src/main/jni/libev/ev.h b/jni/libev/ev.h
similarity index 100%
rename from src/main/jni/libev/ev.h
rename to jni/libev/ev.h
diff --git a/src/main/jni/libev/ev_epoll.c b/jni/libev/ev_epoll.c
similarity index 100%
rename from src/main/jni/libev/ev_epoll.c
rename to jni/libev/ev_epoll.c
diff --git a/src/main/jni/libev/ev_kqueue.c b/jni/libev/ev_kqueue.c
similarity index 100%
rename from src/main/jni/libev/ev_kqueue.c
rename to jni/libev/ev_kqueue.c
diff --git a/src/main/jni/libev/ev_poll.c b/jni/libev/ev_poll.c
similarity index 100%
rename from src/main/jni/libev/ev_poll.c
rename to jni/libev/ev_poll.c
diff --git a/src/main/jni/libev/ev_port.c b/jni/libev/ev_port.c
similarity index 100%
rename from src/main/jni/libev/ev_port.c
rename to jni/libev/ev_port.c
diff --git a/src/main/jni/libev/ev_select.c b/jni/libev/ev_select.c
similarity index 100%
rename from src/main/jni/libev/ev_select.c
rename to jni/libev/ev_select.c
diff --git a/src/main/jni/libev/ev_vars.h b/jni/libev/ev_vars.h
similarity index 100%
rename from src/main/jni/libev/ev_vars.h
rename to jni/libev/ev_vars.h
diff --git a/src/main/jni/libev/ev_win32.c b/jni/libev/ev_win32.c
similarity index 100%
rename from src/main/jni/libev/ev_win32.c
rename to jni/libev/ev_win32.c
diff --git a/src/main/jni/libev/ev_wrap.h b/jni/libev/ev_wrap.h
similarity index 100%
rename from src/main/jni/libev/ev_wrap.h
rename to jni/libev/ev_wrap.h
diff --git a/src/main/jni/libev/event.c b/jni/libev/event.c
similarity index 100%
rename from src/main/jni/libev/event.c
rename to jni/libev/event.c
diff --git a/src/main/jni/libev/event.h b/jni/libev/event.h
similarity index 100%
rename from src/main/jni/libev/event.h
rename to jni/libev/event.h
diff --git a/src/main/jni/libevent/ChangeLog b/jni/libevent/ChangeLog
similarity index 100%
rename from src/main/jni/libevent/ChangeLog
rename to jni/libevent/ChangeLog
diff --git a/src/main/jni/libevent/LICENSE b/jni/libevent/LICENSE
similarity index 100%
rename from src/main/jni/libevent/LICENSE
rename to jni/libevent/LICENSE
diff --git a/src/main/jni/libevent/README b/jni/libevent/README
similarity index 100%
rename from src/main/jni/libevent/README
rename to jni/libevent/README
diff --git a/src/main/jni/libevent/arc4random.c b/jni/libevent/arc4random.c
similarity index 100%
rename from src/main/jni/libevent/arc4random.c
rename to jni/libevent/arc4random.c
diff --git a/src/main/jni/libevent/buffer.c b/jni/libevent/buffer.c
similarity index 100%
rename from src/main/jni/libevent/buffer.c
rename to jni/libevent/buffer.c
diff --git a/src/main/jni/libevent/buffer_iocp.c b/jni/libevent/buffer_iocp.c
similarity index 100%
rename from src/main/jni/libevent/buffer_iocp.c
rename to jni/libevent/buffer_iocp.c
diff --git a/src/main/jni/libevent/bufferevent-internal.h b/jni/libevent/bufferevent-internal.h
similarity index 100%
rename from src/main/jni/libevent/bufferevent-internal.h
rename to jni/libevent/bufferevent-internal.h
diff --git a/src/main/jni/libevent/bufferevent.c b/jni/libevent/bufferevent.c
similarity index 100%
rename from src/main/jni/libevent/bufferevent.c
rename to jni/libevent/bufferevent.c
diff --git a/src/main/jni/libevent/bufferevent_async.c b/jni/libevent/bufferevent_async.c
similarity index 100%
rename from src/main/jni/libevent/bufferevent_async.c
rename to jni/libevent/bufferevent_async.c
diff --git a/src/main/jni/libevent/bufferevent_filter.c b/jni/libevent/bufferevent_filter.c
similarity index 100%
rename from src/main/jni/libevent/bufferevent_filter.c
rename to jni/libevent/bufferevent_filter.c
diff --git a/src/main/jni/libevent/bufferevent_openssl.c b/jni/libevent/bufferevent_openssl.c
similarity index 100%
rename from src/main/jni/libevent/bufferevent_openssl.c
rename to jni/libevent/bufferevent_openssl.c
diff --git a/src/main/jni/libevent/bufferevent_pair.c b/jni/libevent/bufferevent_pair.c
similarity index 100%
rename from src/main/jni/libevent/bufferevent_pair.c
rename to jni/libevent/bufferevent_pair.c
diff --git a/src/main/jni/libevent/bufferevent_ratelim.c b/jni/libevent/bufferevent_ratelim.c
similarity index 100%
rename from src/main/jni/libevent/bufferevent_ratelim.c
rename to jni/libevent/bufferevent_ratelim.c
diff --git a/src/main/jni/libevent/bufferevent_sock.c b/jni/libevent/bufferevent_sock.c
similarity index 100%
rename from src/main/jni/libevent/bufferevent_sock.c
rename to jni/libevent/bufferevent_sock.c
diff --git a/src/main/jni/libevent/changelist-internal.h b/jni/libevent/changelist-internal.h
similarity index 100%
rename from src/main/jni/libevent/changelist-internal.h
rename to jni/libevent/changelist-internal.h
diff --git a/src/main/jni/libevent/compat/sys/queue.h b/jni/libevent/compat/sys/queue.h
similarity index 100%
rename from src/main/jni/libevent/compat/sys/queue.h
rename to jni/libevent/compat/sys/queue.h
diff --git a/src/main/jni/libevent/config.h b/jni/libevent/config.h
similarity index 100%
rename from src/main/jni/libevent/config.h
rename to jni/libevent/config.h
diff --git a/src/main/jni/libevent/defer-internal.h b/jni/libevent/defer-internal.h
similarity index 100%
rename from src/main/jni/libevent/defer-internal.h
rename to jni/libevent/defer-internal.h
diff --git a/src/main/jni/libevent/devpoll.c b/jni/libevent/devpoll.c
similarity index 100%
rename from src/main/jni/libevent/devpoll.c
rename to jni/libevent/devpoll.c
diff --git a/src/main/jni/libevent/epoll.c b/jni/libevent/epoll.c
similarity index 100%
rename from src/main/jni/libevent/epoll.c
rename to jni/libevent/epoll.c
diff --git a/src/main/jni/libevent/epoll_sub.c b/jni/libevent/epoll_sub.c
similarity index 100%
rename from src/main/jni/libevent/epoll_sub.c
rename to jni/libevent/epoll_sub.c
diff --git a/src/main/jni/libevent/evbuffer-internal.h b/jni/libevent/evbuffer-internal.h
similarity index 100%
rename from src/main/jni/libevent/evbuffer-internal.h
rename to jni/libevent/evbuffer-internal.h
diff --git a/src/main/jni/libevent/evdns.c b/jni/libevent/evdns.c
similarity index 100%
rename from src/main/jni/libevent/evdns.c
rename to jni/libevent/evdns.c
diff --git a/src/main/jni/libevent/evdns.h b/jni/libevent/evdns.h
similarity index 100%
rename from src/main/jni/libevent/evdns.h
rename to jni/libevent/evdns.h
diff --git a/src/main/jni/libevent/event-internal.h b/jni/libevent/event-internal.h
similarity index 100%
rename from src/main/jni/libevent/event-internal.h
rename to jni/libevent/event-internal.h
diff --git a/src/main/jni/libevent/event.c b/jni/libevent/event.c
similarity index 100%
rename from src/main/jni/libevent/event.c
rename to jni/libevent/event.c
diff --git a/src/main/jni/libevent/event.h b/jni/libevent/event.h
similarity index 100%
rename from src/main/jni/libevent/event.h
rename to jni/libevent/event.h
diff --git a/src/main/jni/libevent/event_iocp.c b/jni/libevent/event_iocp.c
similarity index 100%
rename from src/main/jni/libevent/event_iocp.c
rename to jni/libevent/event_iocp.c
diff --git a/src/main/jni/libevent/event_tagging.c b/jni/libevent/event_tagging.c
similarity index 100%
rename from src/main/jni/libevent/event_tagging.c
rename to jni/libevent/event_tagging.c
diff --git a/src/main/jni/libevent/evhttp.h b/jni/libevent/evhttp.h
similarity index 100%
rename from src/main/jni/libevent/evhttp.h
rename to jni/libevent/evhttp.h
diff --git a/src/main/jni/libevent/evmap-internal.h b/jni/libevent/evmap-internal.h
similarity index 100%
rename from src/main/jni/libevent/evmap-internal.h
rename to jni/libevent/evmap-internal.h
diff --git a/src/main/jni/libevent/evmap.c b/jni/libevent/evmap.c
similarity index 100%
rename from src/main/jni/libevent/evmap.c
rename to jni/libevent/evmap.c
diff --git a/src/main/jni/libevent/evport.c b/jni/libevent/evport.c
similarity index 100%
rename from src/main/jni/libevent/evport.c
rename to jni/libevent/evport.c
diff --git a/src/main/jni/libevent/evrpc-internal.h b/jni/libevent/evrpc-internal.h
similarity index 100%
rename from src/main/jni/libevent/evrpc-internal.h
rename to jni/libevent/evrpc-internal.h
diff --git a/src/main/jni/libevent/evrpc.c b/jni/libevent/evrpc.c
similarity index 100%
rename from src/main/jni/libevent/evrpc.c
rename to jni/libevent/evrpc.c
diff --git a/src/main/jni/libevent/evrpc.h b/jni/libevent/evrpc.h
similarity index 100%
rename from src/main/jni/libevent/evrpc.h
rename to jni/libevent/evrpc.h
diff --git a/src/main/jni/libevent/evsignal-internal.h b/jni/libevent/evsignal-internal.h
similarity index 100%
rename from src/main/jni/libevent/evsignal-internal.h
rename to jni/libevent/evsignal-internal.h
diff --git a/src/main/jni/libevent/evthread-internal.h b/jni/libevent/evthread-internal.h
similarity index 100%
rename from src/main/jni/libevent/evthread-internal.h
rename to jni/libevent/evthread-internal.h
diff --git a/src/main/jni/libevent/evthread.c b/jni/libevent/evthread.c
similarity index 100%
rename from src/main/jni/libevent/evthread.c
rename to jni/libevent/evthread.c
diff --git a/src/main/jni/libevent/evthread_pthread.c b/jni/libevent/evthread_pthread.c
similarity index 100%
rename from src/main/jni/libevent/evthread_pthread.c
rename to jni/libevent/evthread_pthread.c
diff --git a/src/main/jni/libevent/evthread_win32.c b/jni/libevent/evthread_win32.c
similarity index 100%
rename from src/main/jni/libevent/evthread_win32.c
rename to jni/libevent/evthread_win32.c
diff --git a/src/main/jni/libevent/evutil.c b/jni/libevent/evutil.c
similarity index 100%
rename from src/main/jni/libevent/evutil.c
rename to jni/libevent/evutil.c
diff --git a/src/main/jni/libevent/evutil.h b/jni/libevent/evutil.h
similarity index 100%
rename from src/main/jni/libevent/evutil.h
rename to jni/libevent/evutil.h
diff --git a/src/main/jni/libevent/evutil_rand.c b/jni/libevent/evutil_rand.c
similarity index 100%
rename from src/main/jni/libevent/evutil_rand.c
rename to jni/libevent/evutil_rand.c
diff --git a/src/main/jni/libevent/ht-internal.h b/jni/libevent/ht-internal.h
similarity index 100%
rename from src/main/jni/libevent/ht-internal.h
rename to jni/libevent/ht-internal.h
diff --git a/src/main/jni/libevent/http-internal.h b/jni/libevent/http-internal.h
similarity index 100%
rename from src/main/jni/libevent/http-internal.h
rename to jni/libevent/http-internal.h
diff --git a/src/main/jni/libevent/http.c b/jni/libevent/http.c
similarity index 100%
rename from src/main/jni/libevent/http.c
rename to jni/libevent/http.c
diff --git a/src/main/jni/libevent/include/event2/buffer.h b/jni/libevent/include/event2/buffer.h
similarity index 100%
rename from src/main/jni/libevent/include/event2/buffer.h
rename to jni/libevent/include/event2/buffer.h
diff --git a/src/main/jni/libevent/include/event2/buffer_compat.h b/jni/libevent/include/event2/buffer_compat.h
similarity index 100%
rename from src/main/jni/libevent/include/event2/buffer_compat.h
rename to jni/libevent/include/event2/buffer_compat.h
diff --git a/src/main/jni/libevent/include/event2/bufferevent.h b/jni/libevent/include/event2/bufferevent.h
similarity index 100%
rename from src/main/jni/libevent/include/event2/bufferevent.h
rename to jni/libevent/include/event2/bufferevent.h
diff --git a/src/main/jni/libevent/include/event2/bufferevent_compat.h b/jni/libevent/include/event2/bufferevent_compat.h
similarity index 100%
rename from src/main/jni/libevent/include/event2/bufferevent_compat.h
rename to jni/libevent/include/event2/bufferevent_compat.h
diff --git a/src/main/jni/libevent/include/event2/bufferevent_ssl.h b/jni/libevent/include/event2/bufferevent_ssl.h
similarity index 100%
rename from src/main/jni/libevent/include/event2/bufferevent_ssl.h
rename to jni/libevent/include/event2/bufferevent_ssl.h
diff --git a/src/main/jni/libevent/include/event2/bufferevent_struct.h b/jni/libevent/include/event2/bufferevent_struct.h
similarity index 100%
rename from src/main/jni/libevent/include/event2/bufferevent_struct.h
rename to jni/libevent/include/event2/bufferevent_struct.h
diff --git a/src/main/jni/libevent/include/event2/dns.h b/jni/libevent/include/event2/dns.h
similarity index 100%
rename from src/main/jni/libevent/include/event2/dns.h
rename to jni/libevent/include/event2/dns.h
diff --git a/src/main/jni/libevent/include/event2/dns_compat.h b/jni/libevent/include/event2/dns_compat.h
similarity index 100%
rename from src/main/jni/libevent/include/event2/dns_compat.h
rename to jni/libevent/include/event2/dns_compat.h
diff --git a/src/main/jni/libevent/include/event2/dns_struct.h b/jni/libevent/include/event2/dns_struct.h
similarity index 100%
rename from src/main/jni/libevent/include/event2/dns_struct.h
rename to jni/libevent/include/event2/dns_struct.h
diff --git a/src/main/jni/libevent/include/event2/event-config.h b/jni/libevent/include/event2/event-config.h
similarity index 100%
rename from src/main/jni/libevent/include/event2/event-config.h
rename to jni/libevent/include/event2/event-config.h
diff --git a/src/main/jni/libevent/include/event2/event.h b/jni/libevent/include/event2/event.h
similarity index 100%
rename from src/main/jni/libevent/include/event2/event.h
rename to jni/libevent/include/event2/event.h
diff --git a/src/main/jni/libevent/include/event2/event_compat.h b/jni/libevent/include/event2/event_compat.h
similarity index 100%
rename from src/main/jni/libevent/include/event2/event_compat.h
rename to jni/libevent/include/event2/event_compat.h
diff --git a/src/main/jni/libevent/include/event2/event_struct.h b/jni/libevent/include/event2/event_struct.h
similarity index 100%
rename from src/main/jni/libevent/include/event2/event_struct.h
rename to jni/libevent/include/event2/event_struct.h
diff --git a/src/main/jni/libevent/include/event2/http.h b/jni/libevent/include/event2/http.h
similarity index 100%
rename from src/main/jni/libevent/include/event2/http.h
rename to jni/libevent/include/event2/http.h
diff --git a/src/main/jni/libevent/include/event2/http_compat.h b/jni/libevent/include/event2/http_compat.h
similarity index 100%
rename from src/main/jni/libevent/include/event2/http_compat.h
rename to jni/libevent/include/event2/http_compat.h
diff --git a/src/main/jni/libevent/include/event2/http_struct.h b/jni/libevent/include/event2/http_struct.h
similarity index 100%
rename from src/main/jni/libevent/include/event2/http_struct.h
rename to jni/libevent/include/event2/http_struct.h
diff --git a/src/main/jni/libevent/include/event2/keyvalq_struct.h b/jni/libevent/include/event2/keyvalq_struct.h
similarity index 100%
rename from src/main/jni/libevent/include/event2/keyvalq_struct.h
rename to jni/libevent/include/event2/keyvalq_struct.h
diff --git a/src/main/jni/libevent/include/event2/listener.h b/jni/libevent/include/event2/listener.h
similarity index 100%
rename from src/main/jni/libevent/include/event2/listener.h
rename to jni/libevent/include/event2/listener.h
diff --git a/src/main/jni/libevent/include/event2/rpc.h b/jni/libevent/include/event2/rpc.h
similarity index 100%
rename from src/main/jni/libevent/include/event2/rpc.h
rename to jni/libevent/include/event2/rpc.h
diff --git a/src/main/jni/libevent/include/event2/rpc_compat.h b/jni/libevent/include/event2/rpc_compat.h
similarity index 100%
rename from src/main/jni/libevent/include/event2/rpc_compat.h
rename to jni/libevent/include/event2/rpc_compat.h
diff --git a/src/main/jni/libevent/include/event2/rpc_struct.h b/jni/libevent/include/event2/rpc_struct.h
similarity index 100%
rename from src/main/jni/libevent/include/event2/rpc_struct.h
rename to jni/libevent/include/event2/rpc_struct.h
diff --git a/src/main/jni/libevent/include/event2/tag.h b/jni/libevent/include/event2/tag.h
similarity index 100%
rename from src/main/jni/libevent/include/event2/tag.h
rename to jni/libevent/include/event2/tag.h
diff --git a/src/main/jni/libevent/include/event2/tag_compat.h b/jni/libevent/include/event2/tag_compat.h
similarity index 100%
rename from src/main/jni/libevent/include/event2/tag_compat.h
rename to jni/libevent/include/event2/tag_compat.h
diff --git a/src/main/jni/libevent/include/event2/thread.h b/jni/libevent/include/event2/thread.h
similarity index 100%
rename from src/main/jni/libevent/include/event2/thread.h
rename to jni/libevent/include/event2/thread.h
diff --git a/src/main/jni/libevent/include/event2/util.h b/jni/libevent/include/event2/util.h
similarity index 100%
rename from src/main/jni/libevent/include/event2/util.h
rename to jni/libevent/include/event2/util.h
diff --git a/src/main/jni/libevent/iocp-internal.h b/jni/libevent/iocp-internal.h
similarity index 100%
rename from src/main/jni/libevent/iocp-internal.h
rename to jni/libevent/iocp-internal.h
diff --git a/src/main/jni/libevent/ipv6-internal.h b/jni/libevent/ipv6-internal.h
similarity index 100%
rename from src/main/jni/libevent/ipv6-internal.h
rename to jni/libevent/ipv6-internal.h
diff --git a/src/main/jni/libevent/kqueue.c b/jni/libevent/kqueue.c
similarity index 100%
rename from src/main/jni/libevent/kqueue.c
rename to jni/libevent/kqueue.c
diff --git a/src/main/jni/libevent/listener.c b/jni/libevent/listener.c
similarity index 100%
rename from src/main/jni/libevent/listener.c
rename to jni/libevent/listener.c
diff --git a/src/main/jni/libevent/log-internal.h b/jni/libevent/log-internal.h
similarity index 100%
rename from src/main/jni/libevent/log-internal.h
rename to jni/libevent/log-internal.h
diff --git a/src/main/jni/libevent/log.c b/jni/libevent/log.c
similarity index 100%
rename from src/main/jni/libevent/log.c
rename to jni/libevent/log.c
diff --git a/src/main/jni/libevent/minheap-internal.h b/jni/libevent/minheap-internal.h
similarity index 100%
rename from src/main/jni/libevent/minheap-internal.h
rename to jni/libevent/minheap-internal.h
diff --git a/src/main/jni/libevent/mm-internal.h b/jni/libevent/mm-internal.h
similarity index 100%
rename from src/main/jni/libevent/mm-internal.h
rename to jni/libevent/mm-internal.h
diff --git a/src/main/jni/libevent/poll.c b/jni/libevent/poll.c
similarity index 100%
rename from src/main/jni/libevent/poll.c
rename to jni/libevent/poll.c
diff --git a/src/main/jni/libevent/ratelim-internal.h b/jni/libevent/ratelim-internal.h
similarity index 100%
rename from src/main/jni/libevent/ratelim-internal.h
rename to jni/libevent/ratelim-internal.h
diff --git a/src/main/jni/libevent/select.c b/jni/libevent/select.c
similarity index 100%
rename from src/main/jni/libevent/select.c
rename to jni/libevent/select.c
diff --git a/src/main/jni/libevent/signal.c b/jni/libevent/signal.c
similarity index 100%
rename from src/main/jni/libevent/signal.c
rename to jni/libevent/signal.c
diff --git a/src/main/jni/libevent/strlcpy-internal.h b/jni/libevent/strlcpy-internal.h
similarity index 100%
rename from src/main/jni/libevent/strlcpy-internal.h
rename to jni/libevent/strlcpy-internal.h
diff --git a/src/main/jni/libevent/strlcpy.c b/jni/libevent/strlcpy.c
similarity index 100%
rename from src/main/jni/libevent/strlcpy.c
rename to jni/libevent/strlcpy.c
diff --git a/src/main/jni/libevent/util-internal.h b/jni/libevent/util-internal.h
similarity index 100%
rename from src/main/jni/libevent/util-internal.h
rename to jni/libevent/util-internal.h
diff --git a/src/main/jni/libevent/win32select.c b/jni/libevent/win32select.c
similarity index 100%
rename from src/main/jni/libevent/win32select.c
rename to jni/libevent/win32select.c
diff --git a/src/main/jni/openssl/ACKNOWLEDGMENTS b/jni/openssl/ACKNOWLEDGMENTS
similarity index 100%
rename from src/main/jni/openssl/ACKNOWLEDGMENTS
rename to jni/openssl/ACKNOWLEDGMENTS
diff --git a/src/main/jni/openssl/MODULE_LICENSE_BSD_LIKE b/jni/openssl/MODULE_LICENSE_BSD_LIKE
similarity index 100%
rename from src/main/jni/openssl/MODULE_LICENSE_BSD_LIKE
rename to jni/openssl/MODULE_LICENSE_BSD_LIKE
diff --git a/src/main/jni/openssl/NOTICE b/jni/openssl/NOTICE
similarity index 100%
rename from src/main/jni/openssl/NOTICE
rename to jni/openssl/NOTICE
diff --git a/src/main/jni/openssl/README.ANDROID.txt b/jni/openssl/README.ANDROID.txt
similarity index 100%
rename from src/main/jni/openssl/README.ANDROID.txt
rename to jni/openssl/README.ANDROID.txt
diff --git a/src/main/jni/openssl/README.md b/jni/openssl/README.md
similarity index 100%
rename from src/main/jni/openssl/README.md
rename to jni/openssl/README.md
diff --git a/src/main/jni/openssl/android-config.mk b/jni/openssl/android-config.mk
similarity index 100%
rename from src/main/jni/openssl/android-config.mk
rename to jni/openssl/android-config.mk
diff --git a/src/main/jni/openssl/crypto/Android.mk b/jni/openssl/crypto/Android.mk
similarity index 100%
rename from src/main/jni/openssl/crypto/Android.mk
rename to jni/openssl/crypto/Android.mk
diff --git a/src/main/jni/openssl/crypto/LPdir_nyi.c b/jni/openssl/crypto/LPdir_nyi.c
similarity index 100%
rename from src/main/jni/openssl/crypto/LPdir_nyi.c
rename to jni/openssl/crypto/LPdir_nyi.c
diff --git a/src/main/jni/openssl/crypto/LPdir_unix.c b/jni/openssl/crypto/LPdir_unix.c
similarity index 100%
rename from src/main/jni/openssl/crypto/LPdir_unix.c
rename to jni/openssl/crypto/LPdir_unix.c
diff --git a/src/main/jni/openssl/crypto/LPdir_vms.c b/jni/openssl/crypto/LPdir_vms.c
similarity index 100%
rename from src/main/jni/openssl/crypto/LPdir_vms.c
rename to jni/openssl/crypto/LPdir_vms.c
diff --git a/src/main/jni/openssl/crypto/LPdir_win.c b/jni/openssl/crypto/LPdir_win.c
similarity index 100%
rename from src/main/jni/openssl/crypto/LPdir_win.c
rename to jni/openssl/crypto/LPdir_win.c
diff --git a/src/main/jni/openssl/crypto/LPdir_win32.c b/jni/openssl/crypto/LPdir_win32.c
similarity index 100%
rename from src/main/jni/openssl/crypto/LPdir_win32.c
rename to jni/openssl/crypto/LPdir_win32.c
diff --git a/src/main/jni/openssl/crypto/LPdir_wince.c b/jni/openssl/crypto/LPdir_wince.c
similarity index 100%
rename from src/main/jni/openssl/crypto/LPdir_wince.c
rename to jni/openssl/crypto/LPdir_wince.c
diff --git a/src/main/jni/openssl/crypto/Makefile b/jni/openssl/crypto/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/Makefile
rename to jni/openssl/crypto/Makefile
diff --git a/src/main/jni/openssl/crypto/aes/Makefile b/jni/openssl/crypto/aes/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/aes/Makefile
rename to jni/openssl/crypto/aes/Makefile
diff --git a/src/main/jni/openssl/crypto/aes/README b/jni/openssl/crypto/aes/README
similarity index 100%
rename from src/main/jni/openssl/crypto/aes/README
rename to jni/openssl/crypto/aes/README
diff --git a/src/main/jni/openssl/crypto/aes/aes.h b/jni/openssl/crypto/aes/aes.h
similarity index 100%
rename from src/main/jni/openssl/crypto/aes/aes.h
rename to jni/openssl/crypto/aes/aes.h
diff --git a/src/main/jni/openssl/crypto/aes/aes_cbc.c b/jni/openssl/crypto/aes/aes_cbc.c
similarity index 100%
rename from src/main/jni/openssl/crypto/aes/aes_cbc.c
rename to jni/openssl/crypto/aes/aes_cbc.c
diff --git a/src/main/jni/openssl/crypto/aes/aes_cfb.c b/jni/openssl/crypto/aes/aes_cfb.c
similarity index 100%
rename from src/main/jni/openssl/crypto/aes/aes_cfb.c
rename to jni/openssl/crypto/aes/aes_cfb.c
diff --git a/src/main/jni/openssl/crypto/aes/aes_core.c b/jni/openssl/crypto/aes/aes_core.c
similarity index 100%
rename from src/main/jni/openssl/crypto/aes/aes_core.c
rename to jni/openssl/crypto/aes/aes_core.c
diff --git a/src/main/jni/openssl/crypto/aes/aes_ctr.c b/jni/openssl/crypto/aes/aes_ctr.c
similarity index 100%
rename from src/main/jni/openssl/crypto/aes/aes_ctr.c
rename to jni/openssl/crypto/aes/aes_ctr.c
diff --git a/src/main/jni/openssl/crypto/aes/aes_ecb.c b/jni/openssl/crypto/aes/aes_ecb.c
similarity index 100%
rename from src/main/jni/openssl/crypto/aes/aes_ecb.c
rename to jni/openssl/crypto/aes/aes_ecb.c
diff --git a/src/main/jni/openssl/crypto/aes/aes_ige.c b/jni/openssl/crypto/aes/aes_ige.c
similarity index 100%
rename from src/main/jni/openssl/crypto/aes/aes_ige.c
rename to jni/openssl/crypto/aes/aes_ige.c
diff --git a/src/main/jni/openssl/crypto/aes/aes_locl.h b/jni/openssl/crypto/aes/aes_locl.h
similarity index 100%
rename from src/main/jni/openssl/crypto/aes/aes_locl.h
rename to jni/openssl/crypto/aes/aes_locl.h
diff --git a/src/main/jni/openssl/crypto/aes/aes_misc.c b/jni/openssl/crypto/aes/aes_misc.c
similarity index 100%
rename from src/main/jni/openssl/crypto/aes/aes_misc.c
rename to jni/openssl/crypto/aes/aes_misc.c
diff --git a/src/main/jni/openssl/crypto/aes/aes_ofb.c b/jni/openssl/crypto/aes/aes_ofb.c
similarity index 100%
rename from src/main/jni/openssl/crypto/aes/aes_ofb.c
rename to jni/openssl/crypto/aes/aes_ofb.c
diff --git a/src/main/jni/openssl/crypto/aes/aes_wrap.c b/jni/openssl/crypto/aes/aes_wrap.c
similarity index 100%
rename from src/main/jni/openssl/crypto/aes/aes_wrap.c
rename to jni/openssl/crypto/aes/aes_wrap.c
diff --git a/src/main/jni/openssl/crypto/aes/aes_x86core.c b/jni/openssl/crypto/aes/aes_x86core.c
similarity index 100%
rename from src/main/jni/openssl/crypto/aes/aes_x86core.c
rename to jni/openssl/crypto/aes/aes_x86core.c
diff --git a/src/main/jni/openssl/crypto/aes/asm/aes-586.pl b/jni/openssl/crypto/aes/asm/aes-586.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/aes/asm/aes-586.pl
rename to jni/openssl/crypto/aes/asm/aes-586.pl
diff --git a/src/main/jni/openssl/crypto/aes/asm/aes-armv4.S b/jni/openssl/crypto/aes/asm/aes-armv4.S
similarity index 100%
rename from src/main/jni/openssl/crypto/aes/asm/aes-armv4.S
rename to jni/openssl/crypto/aes/asm/aes-armv4.S
diff --git a/src/main/jni/openssl/crypto/aes/asm/aes-armv4.pl b/jni/openssl/crypto/aes/asm/aes-armv4.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/aes/asm/aes-armv4.pl
rename to jni/openssl/crypto/aes/asm/aes-armv4.pl
diff --git a/src/main/jni/openssl/crypto/aes/asm/aes-ia64.S b/jni/openssl/crypto/aes/asm/aes-ia64.S
similarity index 100%
rename from src/main/jni/openssl/crypto/aes/asm/aes-ia64.S
rename to jni/openssl/crypto/aes/asm/aes-ia64.S
diff --git a/src/main/jni/openssl/crypto/aes/asm/aes-mips.pl b/jni/openssl/crypto/aes/asm/aes-mips.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/aes/asm/aes-mips.pl
rename to jni/openssl/crypto/aes/asm/aes-mips.pl
diff --git a/src/main/jni/openssl/crypto/aes/asm/aes-parisc.pl b/jni/openssl/crypto/aes/asm/aes-parisc.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/aes/asm/aes-parisc.pl
rename to jni/openssl/crypto/aes/asm/aes-parisc.pl
diff --git a/src/main/jni/openssl/crypto/aes/asm/aes-ppc.pl b/jni/openssl/crypto/aes/asm/aes-ppc.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/aes/asm/aes-ppc.pl
rename to jni/openssl/crypto/aes/asm/aes-ppc.pl
diff --git a/src/main/jni/openssl/crypto/aes/asm/aes-s390x.pl b/jni/openssl/crypto/aes/asm/aes-s390x.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/aes/asm/aes-s390x.pl
rename to jni/openssl/crypto/aes/asm/aes-s390x.pl
diff --git a/src/main/jni/openssl/crypto/aes/asm/aes-sparcv9.pl b/jni/openssl/crypto/aes/asm/aes-sparcv9.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/aes/asm/aes-sparcv9.pl
rename to jni/openssl/crypto/aes/asm/aes-sparcv9.pl
diff --git a/src/main/jni/openssl/crypto/aes/asm/aes-x86_64.pl b/jni/openssl/crypto/aes/asm/aes-x86_64.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/aes/asm/aes-x86_64.pl
rename to jni/openssl/crypto/aes/asm/aes-x86_64.pl
diff --git a/src/main/jni/openssl/crypto/aes/asm/aesni-sha1-x86_64.pl b/jni/openssl/crypto/aes/asm/aesni-sha1-x86_64.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/aes/asm/aesni-sha1-x86_64.pl
rename to jni/openssl/crypto/aes/asm/aesni-sha1-x86_64.pl
diff --git a/src/main/jni/openssl/crypto/aes/asm/aesni-x86.pl b/jni/openssl/crypto/aes/asm/aesni-x86.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/aes/asm/aesni-x86.pl
rename to jni/openssl/crypto/aes/asm/aesni-x86.pl
diff --git a/src/main/jni/openssl/crypto/aes/asm/aesni-x86_64.pl b/jni/openssl/crypto/aes/asm/aesni-x86_64.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/aes/asm/aesni-x86_64.pl
rename to jni/openssl/crypto/aes/asm/aesni-x86_64.pl
diff --git a/src/main/jni/openssl/crypto/aes/asm/bsaes-x86_64.pl b/jni/openssl/crypto/aes/asm/bsaes-x86_64.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/aes/asm/bsaes-x86_64.pl
rename to jni/openssl/crypto/aes/asm/bsaes-x86_64.pl
diff --git a/src/main/jni/openssl/crypto/aes/asm/vpaes-x86.pl b/jni/openssl/crypto/aes/asm/vpaes-x86.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/aes/asm/vpaes-x86.pl
rename to jni/openssl/crypto/aes/asm/vpaes-x86.pl
diff --git a/src/main/jni/openssl/crypto/aes/asm/vpaes-x86_64.pl b/jni/openssl/crypto/aes/asm/vpaes-x86_64.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/aes/asm/vpaes-x86_64.pl
rename to jni/openssl/crypto/aes/asm/vpaes-x86_64.pl
diff --git a/src/main/jni/openssl/crypto/alphacpuid.pl b/jni/openssl/crypto/alphacpuid.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/alphacpuid.pl
rename to jni/openssl/crypto/alphacpuid.pl
diff --git a/src/main/jni/openssl/crypto/arm_arch.h b/jni/openssl/crypto/arm_arch.h
similarity index 100%
rename from src/main/jni/openssl/crypto/arm_arch.h
rename to jni/openssl/crypto/arm_arch.h
diff --git a/src/main/jni/openssl/crypto/armcap.c b/jni/openssl/crypto/armcap.c
similarity index 100%
rename from src/main/jni/openssl/crypto/armcap.c
rename to jni/openssl/crypto/armcap.c
diff --git a/src/main/jni/openssl/crypto/armv4cpuid.S b/jni/openssl/crypto/armv4cpuid.S
similarity index 100%
rename from src/main/jni/openssl/crypto/armv4cpuid.S
rename to jni/openssl/crypto/armv4cpuid.S
diff --git a/src/main/jni/openssl/crypto/asn1/Makefile b/jni/openssl/crypto/asn1/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/Makefile
rename to jni/openssl/crypto/asn1/Makefile
diff --git a/src/main/jni/openssl/crypto/asn1/a_bitstr.c b/jni/openssl/crypto/asn1/a_bitstr.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/a_bitstr.c
rename to jni/openssl/crypto/asn1/a_bitstr.c
diff --git a/src/main/jni/openssl/crypto/asn1/a_bool.c b/jni/openssl/crypto/asn1/a_bool.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/a_bool.c
rename to jni/openssl/crypto/asn1/a_bool.c
diff --git a/src/main/jni/openssl/crypto/asn1/a_bytes.c b/jni/openssl/crypto/asn1/a_bytes.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/a_bytes.c
rename to jni/openssl/crypto/asn1/a_bytes.c
diff --git a/src/main/jni/openssl/crypto/asn1/a_d2i_fp.c b/jni/openssl/crypto/asn1/a_d2i_fp.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/a_d2i_fp.c
rename to jni/openssl/crypto/asn1/a_d2i_fp.c
diff --git a/src/main/jni/openssl/crypto/asn1/a_digest.c b/jni/openssl/crypto/asn1/a_digest.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/a_digest.c
rename to jni/openssl/crypto/asn1/a_digest.c
diff --git a/src/main/jni/openssl/crypto/asn1/a_dup.c b/jni/openssl/crypto/asn1/a_dup.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/a_dup.c
rename to jni/openssl/crypto/asn1/a_dup.c
diff --git a/src/main/jni/openssl/crypto/asn1/a_enum.c b/jni/openssl/crypto/asn1/a_enum.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/a_enum.c
rename to jni/openssl/crypto/asn1/a_enum.c
diff --git a/src/main/jni/openssl/crypto/asn1/a_gentm.c b/jni/openssl/crypto/asn1/a_gentm.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/a_gentm.c
rename to jni/openssl/crypto/asn1/a_gentm.c
diff --git a/src/main/jni/openssl/crypto/asn1/a_i2d_fp.c b/jni/openssl/crypto/asn1/a_i2d_fp.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/a_i2d_fp.c
rename to jni/openssl/crypto/asn1/a_i2d_fp.c
diff --git a/src/main/jni/openssl/crypto/asn1/a_int.c b/jni/openssl/crypto/asn1/a_int.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/a_int.c
rename to jni/openssl/crypto/asn1/a_int.c
diff --git a/src/main/jni/openssl/crypto/asn1/a_mbstr.c b/jni/openssl/crypto/asn1/a_mbstr.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/a_mbstr.c
rename to jni/openssl/crypto/asn1/a_mbstr.c
diff --git a/src/main/jni/openssl/crypto/asn1/a_object.c b/jni/openssl/crypto/asn1/a_object.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/a_object.c
rename to jni/openssl/crypto/asn1/a_object.c
diff --git a/src/main/jni/openssl/crypto/asn1/a_octet.c b/jni/openssl/crypto/asn1/a_octet.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/a_octet.c
rename to jni/openssl/crypto/asn1/a_octet.c
diff --git a/src/main/jni/openssl/crypto/asn1/a_print.c b/jni/openssl/crypto/asn1/a_print.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/a_print.c
rename to jni/openssl/crypto/asn1/a_print.c
diff --git a/src/main/jni/openssl/crypto/asn1/a_set.c b/jni/openssl/crypto/asn1/a_set.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/a_set.c
rename to jni/openssl/crypto/asn1/a_set.c
diff --git a/src/main/jni/openssl/crypto/asn1/a_sign.c b/jni/openssl/crypto/asn1/a_sign.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/a_sign.c
rename to jni/openssl/crypto/asn1/a_sign.c
diff --git a/src/main/jni/openssl/crypto/asn1/a_strex.c b/jni/openssl/crypto/asn1/a_strex.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/a_strex.c
rename to jni/openssl/crypto/asn1/a_strex.c
diff --git a/src/main/jni/openssl/crypto/asn1/a_strnid.c b/jni/openssl/crypto/asn1/a_strnid.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/a_strnid.c
rename to jni/openssl/crypto/asn1/a_strnid.c
diff --git a/src/main/jni/openssl/crypto/asn1/a_time.c b/jni/openssl/crypto/asn1/a_time.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/a_time.c
rename to jni/openssl/crypto/asn1/a_time.c
diff --git a/src/main/jni/openssl/crypto/asn1/a_type.c b/jni/openssl/crypto/asn1/a_type.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/a_type.c
rename to jni/openssl/crypto/asn1/a_type.c
diff --git a/src/main/jni/openssl/crypto/asn1/a_utctm.c b/jni/openssl/crypto/asn1/a_utctm.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/a_utctm.c
rename to jni/openssl/crypto/asn1/a_utctm.c
diff --git a/src/main/jni/openssl/crypto/asn1/a_utf8.c b/jni/openssl/crypto/asn1/a_utf8.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/a_utf8.c
rename to jni/openssl/crypto/asn1/a_utf8.c
diff --git a/src/main/jni/openssl/crypto/asn1/a_verify.c b/jni/openssl/crypto/asn1/a_verify.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/a_verify.c
rename to jni/openssl/crypto/asn1/a_verify.c
diff --git a/src/main/jni/openssl/crypto/asn1/ameth_lib.c b/jni/openssl/crypto/asn1/ameth_lib.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/ameth_lib.c
rename to jni/openssl/crypto/asn1/ameth_lib.c
diff --git a/src/main/jni/openssl/crypto/asn1/asn1.h b/jni/openssl/crypto/asn1/asn1.h
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/asn1.h
rename to jni/openssl/crypto/asn1/asn1.h
diff --git a/src/main/jni/openssl/crypto/asn1/asn1_err.c b/jni/openssl/crypto/asn1/asn1_err.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/asn1_err.c
rename to jni/openssl/crypto/asn1/asn1_err.c
diff --git a/src/main/jni/openssl/crypto/asn1/asn1_gen.c b/jni/openssl/crypto/asn1/asn1_gen.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/asn1_gen.c
rename to jni/openssl/crypto/asn1/asn1_gen.c
diff --git a/src/main/jni/openssl/crypto/asn1/asn1_lib.c b/jni/openssl/crypto/asn1/asn1_lib.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/asn1_lib.c
rename to jni/openssl/crypto/asn1/asn1_lib.c
diff --git a/src/main/jni/openssl/crypto/asn1/asn1_locl.h b/jni/openssl/crypto/asn1/asn1_locl.h
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/asn1_locl.h
rename to jni/openssl/crypto/asn1/asn1_locl.h
diff --git a/src/main/jni/openssl/crypto/asn1/asn1_mac.h b/jni/openssl/crypto/asn1/asn1_mac.h
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/asn1_mac.h
rename to jni/openssl/crypto/asn1/asn1_mac.h
diff --git a/src/main/jni/openssl/crypto/asn1/asn1_par.c b/jni/openssl/crypto/asn1/asn1_par.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/asn1_par.c
rename to jni/openssl/crypto/asn1/asn1_par.c
diff --git a/src/main/jni/openssl/crypto/asn1/asn1t.h b/jni/openssl/crypto/asn1/asn1t.h
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/asn1t.h
rename to jni/openssl/crypto/asn1/asn1t.h
diff --git a/src/main/jni/openssl/crypto/asn1/asn_mime.c b/jni/openssl/crypto/asn1/asn_mime.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/asn_mime.c
rename to jni/openssl/crypto/asn1/asn_mime.c
diff --git a/src/main/jni/openssl/crypto/asn1/asn_moid.c b/jni/openssl/crypto/asn1/asn_moid.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/asn_moid.c
rename to jni/openssl/crypto/asn1/asn_moid.c
diff --git a/src/main/jni/openssl/crypto/asn1/asn_pack.c b/jni/openssl/crypto/asn1/asn_pack.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/asn_pack.c
rename to jni/openssl/crypto/asn1/asn_pack.c
diff --git a/src/main/jni/openssl/crypto/asn1/bio_asn1.c b/jni/openssl/crypto/asn1/bio_asn1.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/bio_asn1.c
rename to jni/openssl/crypto/asn1/bio_asn1.c
diff --git a/src/main/jni/openssl/crypto/asn1/bio_ndef.c b/jni/openssl/crypto/asn1/bio_ndef.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/bio_ndef.c
rename to jni/openssl/crypto/asn1/bio_ndef.c
diff --git a/src/main/jni/openssl/crypto/asn1/charmap.h b/jni/openssl/crypto/asn1/charmap.h
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/charmap.h
rename to jni/openssl/crypto/asn1/charmap.h
diff --git a/src/main/jni/openssl/crypto/asn1/charmap.pl b/jni/openssl/crypto/asn1/charmap.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/charmap.pl
rename to jni/openssl/crypto/asn1/charmap.pl
diff --git a/src/main/jni/openssl/crypto/asn1/d2i_pr.c b/jni/openssl/crypto/asn1/d2i_pr.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/d2i_pr.c
rename to jni/openssl/crypto/asn1/d2i_pr.c
diff --git a/src/main/jni/openssl/crypto/asn1/d2i_pu.c b/jni/openssl/crypto/asn1/d2i_pu.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/d2i_pu.c
rename to jni/openssl/crypto/asn1/d2i_pu.c
diff --git a/src/main/jni/openssl/crypto/asn1/evp_asn1.c b/jni/openssl/crypto/asn1/evp_asn1.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/evp_asn1.c
rename to jni/openssl/crypto/asn1/evp_asn1.c
diff --git a/src/main/jni/openssl/crypto/asn1/f_enum.c b/jni/openssl/crypto/asn1/f_enum.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/f_enum.c
rename to jni/openssl/crypto/asn1/f_enum.c
diff --git a/src/main/jni/openssl/crypto/asn1/f_int.c b/jni/openssl/crypto/asn1/f_int.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/f_int.c
rename to jni/openssl/crypto/asn1/f_int.c
diff --git a/src/main/jni/openssl/crypto/asn1/f_string.c b/jni/openssl/crypto/asn1/f_string.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/f_string.c
rename to jni/openssl/crypto/asn1/f_string.c
diff --git a/src/main/jni/openssl/crypto/asn1/i2d_pr.c b/jni/openssl/crypto/asn1/i2d_pr.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/i2d_pr.c
rename to jni/openssl/crypto/asn1/i2d_pr.c
diff --git a/src/main/jni/openssl/crypto/asn1/i2d_pu.c b/jni/openssl/crypto/asn1/i2d_pu.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/i2d_pu.c
rename to jni/openssl/crypto/asn1/i2d_pu.c
diff --git a/src/main/jni/openssl/crypto/asn1/n_pkey.c b/jni/openssl/crypto/asn1/n_pkey.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/n_pkey.c
rename to jni/openssl/crypto/asn1/n_pkey.c
diff --git a/src/main/jni/openssl/crypto/asn1/nsseq.c b/jni/openssl/crypto/asn1/nsseq.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/nsseq.c
rename to jni/openssl/crypto/asn1/nsseq.c
diff --git a/src/main/jni/openssl/crypto/asn1/p5_pbe.c b/jni/openssl/crypto/asn1/p5_pbe.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/p5_pbe.c
rename to jni/openssl/crypto/asn1/p5_pbe.c
diff --git a/src/main/jni/openssl/crypto/asn1/p5_pbev2.c b/jni/openssl/crypto/asn1/p5_pbev2.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/p5_pbev2.c
rename to jni/openssl/crypto/asn1/p5_pbev2.c
diff --git a/src/main/jni/openssl/crypto/asn1/p8_pkey.c b/jni/openssl/crypto/asn1/p8_pkey.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/p8_pkey.c
rename to jni/openssl/crypto/asn1/p8_pkey.c
diff --git a/src/main/jni/openssl/crypto/asn1/t_bitst.c b/jni/openssl/crypto/asn1/t_bitst.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/t_bitst.c
rename to jni/openssl/crypto/asn1/t_bitst.c
diff --git a/src/main/jni/openssl/crypto/asn1/t_crl.c b/jni/openssl/crypto/asn1/t_crl.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/t_crl.c
rename to jni/openssl/crypto/asn1/t_crl.c
diff --git a/src/main/jni/openssl/crypto/asn1/t_pkey.c b/jni/openssl/crypto/asn1/t_pkey.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/t_pkey.c
rename to jni/openssl/crypto/asn1/t_pkey.c
diff --git a/src/main/jni/openssl/crypto/asn1/t_req.c b/jni/openssl/crypto/asn1/t_req.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/t_req.c
rename to jni/openssl/crypto/asn1/t_req.c
diff --git a/src/main/jni/openssl/crypto/asn1/t_spki.c b/jni/openssl/crypto/asn1/t_spki.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/t_spki.c
rename to jni/openssl/crypto/asn1/t_spki.c
diff --git a/src/main/jni/openssl/crypto/asn1/t_x509.c b/jni/openssl/crypto/asn1/t_x509.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/t_x509.c
rename to jni/openssl/crypto/asn1/t_x509.c
diff --git a/src/main/jni/openssl/crypto/asn1/t_x509a.c b/jni/openssl/crypto/asn1/t_x509a.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/t_x509a.c
rename to jni/openssl/crypto/asn1/t_x509a.c
diff --git a/src/main/jni/openssl/crypto/asn1/tasn_dec.c b/jni/openssl/crypto/asn1/tasn_dec.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/tasn_dec.c
rename to jni/openssl/crypto/asn1/tasn_dec.c
diff --git a/src/main/jni/openssl/crypto/asn1/tasn_enc.c b/jni/openssl/crypto/asn1/tasn_enc.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/tasn_enc.c
rename to jni/openssl/crypto/asn1/tasn_enc.c
diff --git a/src/main/jni/openssl/crypto/asn1/tasn_fre.c b/jni/openssl/crypto/asn1/tasn_fre.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/tasn_fre.c
rename to jni/openssl/crypto/asn1/tasn_fre.c
diff --git a/src/main/jni/openssl/crypto/asn1/tasn_new.c b/jni/openssl/crypto/asn1/tasn_new.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/tasn_new.c
rename to jni/openssl/crypto/asn1/tasn_new.c
diff --git a/src/main/jni/openssl/crypto/asn1/tasn_prn.c b/jni/openssl/crypto/asn1/tasn_prn.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/tasn_prn.c
rename to jni/openssl/crypto/asn1/tasn_prn.c
diff --git a/src/main/jni/openssl/crypto/asn1/tasn_typ.c b/jni/openssl/crypto/asn1/tasn_typ.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/tasn_typ.c
rename to jni/openssl/crypto/asn1/tasn_typ.c
diff --git a/src/main/jni/openssl/crypto/asn1/tasn_utl.c b/jni/openssl/crypto/asn1/tasn_utl.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/tasn_utl.c
rename to jni/openssl/crypto/asn1/tasn_utl.c
diff --git a/src/main/jni/openssl/crypto/asn1/x_algor.c b/jni/openssl/crypto/asn1/x_algor.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/x_algor.c
rename to jni/openssl/crypto/asn1/x_algor.c
diff --git a/src/main/jni/openssl/crypto/asn1/x_attrib.c b/jni/openssl/crypto/asn1/x_attrib.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/x_attrib.c
rename to jni/openssl/crypto/asn1/x_attrib.c
diff --git a/src/main/jni/openssl/crypto/asn1/x_bignum.c b/jni/openssl/crypto/asn1/x_bignum.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/x_bignum.c
rename to jni/openssl/crypto/asn1/x_bignum.c
diff --git a/src/main/jni/openssl/crypto/asn1/x_crl.c b/jni/openssl/crypto/asn1/x_crl.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/x_crl.c
rename to jni/openssl/crypto/asn1/x_crl.c
diff --git a/src/main/jni/openssl/crypto/asn1/x_exten.c b/jni/openssl/crypto/asn1/x_exten.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/x_exten.c
rename to jni/openssl/crypto/asn1/x_exten.c
diff --git a/src/main/jni/openssl/crypto/asn1/x_info.c b/jni/openssl/crypto/asn1/x_info.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/x_info.c
rename to jni/openssl/crypto/asn1/x_info.c
diff --git a/src/main/jni/openssl/crypto/asn1/x_long.c b/jni/openssl/crypto/asn1/x_long.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/x_long.c
rename to jni/openssl/crypto/asn1/x_long.c
diff --git a/src/main/jni/openssl/crypto/asn1/x_name.c b/jni/openssl/crypto/asn1/x_name.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/x_name.c
rename to jni/openssl/crypto/asn1/x_name.c
diff --git a/src/main/jni/openssl/crypto/asn1/x_nx509.c b/jni/openssl/crypto/asn1/x_nx509.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/x_nx509.c
rename to jni/openssl/crypto/asn1/x_nx509.c
diff --git a/src/main/jni/openssl/crypto/asn1/x_pkey.c b/jni/openssl/crypto/asn1/x_pkey.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/x_pkey.c
rename to jni/openssl/crypto/asn1/x_pkey.c
diff --git a/src/main/jni/openssl/crypto/asn1/x_pubkey.c b/jni/openssl/crypto/asn1/x_pubkey.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/x_pubkey.c
rename to jni/openssl/crypto/asn1/x_pubkey.c
diff --git a/src/main/jni/openssl/crypto/asn1/x_req.c b/jni/openssl/crypto/asn1/x_req.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/x_req.c
rename to jni/openssl/crypto/asn1/x_req.c
diff --git a/src/main/jni/openssl/crypto/asn1/x_sig.c b/jni/openssl/crypto/asn1/x_sig.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/x_sig.c
rename to jni/openssl/crypto/asn1/x_sig.c
diff --git a/src/main/jni/openssl/crypto/asn1/x_spki.c b/jni/openssl/crypto/asn1/x_spki.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/x_spki.c
rename to jni/openssl/crypto/asn1/x_spki.c
diff --git a/src/main/jni/openssl/crypto/asn1/x_val.c b/jni/openssl/crypto/asn1/x_val.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/x_val.c
rename to jni/openssl/crypto/asn1/x_val.c
diff --git a/src/main/jni/openssl/crypto/asn1/x_x509.c b/jni/openssl/crypto/asn1/x_x509.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/x_x509.c
rename to jni/openssl/crypto/asn1/x_x509.c
diff --git a/src/main/jni/openssl/crypto/asn1/x_x509a.c b/jni/openssl/crypto/asn1/x_x509a.c
similarity index 100%
rename from src/main/jni/openssl/crypto/asn1/x_x509a.c
rename to jni/openssl/crypto/asn1/x_x509a.c
diff --git a/src/main/jni/openssl/crypto/bf/COPYRIGHT b/jni/openssl/crypto/bf/COPYRIGHT
similarity index 100%
rename from src/main/jni/openssl/crypto/bf/COPYRIGHT
rename to jni/openssl/crypto/bf/COPYRIGHT
diff --git a/src/main/jni/openssl/crypto/bf/INSTALL b/jni/openssl/crypto/bf/INSTALL
similarity index 100%
rename from src/main/jni/openssl/crypto/bf/INSTALL
rename to jni/openssl/crypto/bf/INSTALL
diff --git a/src/main/jni/openssl/crypto/bf/Makefile b/jni/openssl/crypto/bf/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/bf/Makefile
rename to jni/openssl/crypto/bf/Makefile
diff --git a/src/main/jni/openssl/crypto/bf/README b/jni/openssl/crypto/bf/README
similarity index 100%
rename from src/main/jni/openssl/crypto/bf/README
rename to jni/openssl/crypto/bf/README
diff --git a/src/main/jni/openssl/crypto/bf/VERSION b/jni/openssl/crypto/bf/VERSION
similarity index 100%
rename from src/main/jni/openssl/crypto/bf/VERSION
rename to jni/openssl/crypto/bf/VERSION
diff --git a/src/main/jni/openssl/crypto/bf/asm/bf-586.pl b/jni/openssl/crypto/bf/asm/bf-586.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/bf/asm/bf-586.pl
rename to jni/openssl/crypto/bf/asm/bf-586.pl
diff --git a/src/main/jni/openssl/crypto/bf/asm/bf-686.pl b/jni/openssl/crypto/bf/asm/bf-686.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/bf/asm/bf-686.pl
rename to jni/openssl/crypto/bf/asm/bf-686.pl
diff --git a/src/main/jni/openssl/crypto/bf/asm/readme b/jni/openssl/crypto/bf/asm/readme
similarity index 100%
rename from src/main/jni/openssl/crypto/bf/asm/readme
rename to jni/openssl/crypto/bf/asm/readme
diff --git a/src/main/jni/openssl/crypto/bf/bf_cbc.c b/jni/openssl/crypto/bf/bf_cbc.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bf/bf_cbc.c
rename to jni/openssl/crypto/bf/bf_cbc.c
diff --git a/src/main/jni/openssl/crypto/bf/bf_cfb64.c b/jni/openssl/crypto/bf/bf_cfb64.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bf/bf_cfb64.c
rename to jni/openssl/crypto/bf/bf_cfb64.c
diff --git a/src/main/jni/openssl/crypto/bf/bf_ecb.c b/jni/openssl/crypto/bf/bf_ecb.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bf/bf_ecb.c
rename to jni/openssl/crypto/bf/bf_ecb.c
diff --git a/src/main/jni/openssl/crypto/bf/bf_enc.c b/jni/openssl/crypto/bf/bf_enc.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bf/bf_enc.c
rename to jni/openssl/crypto/bf/bf_enc.c
diff --git a/src/main/jni/openssl/crypto/bf/bf_locl.h b/jni/openssl/crypto/bf/bf_locl.h
similarity index 100%
rename from src/main/jni/openssl/crypto/bf/bf_locl.h
rename to jni/openssl/crypto/bf/bf_locl.h
diff --git a/src/main/jni/openssl/crypto/bf/bf_ofb64.c b/jni/openssl/crypto/bf/bf_ofb64.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bf/bf_ofb64.c
rename to jni/openssl/crypto/bf/bf_ofb64.c
diff --git a/src/main/jni/openssl/crypto/bf/bf_opts.c b/jni/openssl/crypto/bf/bf_opts.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bf/bf_opts.c
rename to jni/openssl/crypto/bf/bf_opts.c
diff --git a/src/main/jni/openssl/crypto/bf/bf_pi.h b/jni/openssl/crypto/bf/bf_pi.h
similarity index 100%
rename from src/main/jni/openssl/crypto/bf/bf_pi.h
rename to jni/openssl/crypto/bf/bf_pi.h
diff --git a/src/main/jni/openssl/crypto/bf/bf_skey.c b/jni/openssl/crypto/bf/bf_skey.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bf/bf_skey.c
rename to jni/openssl/crypto/bf/bf_skey.c
diff --git a/src/main/jni/openssl/crypto/bf/bfs.cpp b/jni/openssl/crypto/bf/bfs.cpp
similarity index 100%
rename from src/main/jni/openssl/crypto/bf/bfs.cpp
rename to jni/openssl/crypto/bf/bfs.cpp
diff --git a/src/main/jni/openssl/crypto/bf/bfspeed.c b/jni/openssl/crypto/bf/bfspeed.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bf/bfspeed.c
rename to jni/openssl/crypto/bf/bfspeed.c
diff --git a/src/main/jni/openssl/crypto/bf/bftest.c b/jni/openssl/crypto/bf/bftest.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bf/bftest.c
rename to jni/openssl/crypto/bf/bftest.c
diff --git a/src/main/jni/openssl/crypto/bf/blowfish.h b/jni/openssl/crypto/bf/blowfish.h
similarity index 100%
rename from src/main/jni/openssl/crypto/bf/blowfish.h
rename to jni/openssl/crypto/bf/blowfish.h
diff --git a/src/main/jni/openssl/crypto/bio/Makefile b/jni/openssl/crypto/bio/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/bio/Makefile
rename to jni/openssl/crypto/bio/Makefile
diff --git a/src/main/jni/openssl/crypto/bio/b_dump.c b/jni/openssl/crypto/bio/b_dump.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bio/b_dump.c
rename to jni/openssl/crypto/bio/b_dump.c
diff --git a/src/main/jni/openssl/crypto/bio/b_print.c b/jni/openssl/crypto/bio/b_print.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bio/b_print.c
rename to jni/openssl/crypto/bio/b_print.c
diff --git a/src/main/jni/openssl/crypto/bio/b_sock.c b/jni/openssl/crypto/bio/b_sock.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bio/b_sock.c
rename to jni/openssl/crypto/bio/b_sock.c
diff --git a/src/main/jni/openssl/crypto/bio/bf_buff.c b/jni/openssl/crypto/bio/bf_buff.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bio/bf_buff.c
rename to jni/openssl/crypto/bio/bf_buff.c
diff --git a/src/main/jni/openssl/crypto/bio/bf_lbuf.c b/jni/openssl/crypto/bio/bf_lbuf.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bio/bf_lbuf.c
rename to jni/openssl/crypto/bio/bf_lbuf.c
diff --git a/src/main/jni/openssl/crypto/bio/bf_nbio.c b/jni/openssl/crypto/bio/bf_nbio.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bio/bf_nbio.c
rename to jni/openssl/crypto/bio/bf_nbio.c
diff --git a/src/main/jni/openssl/crypto/bio/bf_null.c b/jni/openssl/crypto/bio/bf_null.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bio/bf_null.c
rename to jni/openssl/crypto/bio/bf_null.c
diff --git a/src/main/jni/openssl/crypto/bio/bio.h b/jni/openssl/crypto/bio/bio.h
similarity index 100%
rename from src/main/jni/openssl/crypto/bio/bio.h
rename to jni/openssl/crypto/bio/bio.h
diff --git a/src/main/jni/openssl/crypto/bio/bio_cb.c b/jni/openssl/crypto/bio/bio_cb.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bio/bio_cb.c
rename to jni/openssl/crypto/bio/bio_cb.c
diff --git a/src/main/jni/openssl/crypto/bio/bio_err.c b/jni/openssl/crypto/bio/bio_err.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bio/bio_err.c
rename to jni/openssl/crypto/bio/bio_err.c
diff --git a/src/main/jni/openssl/crypto/bio/bio_lcl.h b/jni/openssl/crypto/bio/bio_lcl.h
similarity index 100%
rename from src/main/jni/openssl/crypto/bio/bio_lcl.h
rename to jni/openssl/crypto/bio/bio_lcl.h
diff --git a/src/main/jni/openssl/crypto/bio/bio_lib.c b/jni/openssl/crypto/bio/bio_lib.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bio/bio_lib.c
rename to jni/openssl/crypto/bio/bio_lib.c
diff --git a/src/main/jni/openssl/crypto/bio/bss_acpt.c b/jni/openssl/crypto/bio/bss_acpt.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bio/bss_acpt.c
rename to jni/openssl/crypto/bio/bss_acpt.c
diff --git a/src/main/jni/openssl/crypto/bio/bss_bio.c b/jni/openssl/crypto/bio/bss_bio.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bio/bss_bio.c
rename to jni/openssl/crypto/bio/bss_bio.c
diff --git a/src/main/jni/openssl/crypto/bio/bss_conn.c b/jni/openssl/crypto/bio/bss_conn.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bio/bss_conn.c
rename to jni/openssl/crypto/bio/bss_conn.c
diff --git a/src/main/jni/openssl/crypto/bio/bss_dgram.c b/jni/openssl/crypto/bio/bss_dgram.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bio/bss_dgram.c
rename to jni/openssl/crypto/bio/bss_dgram.c
diff --git a/src/main/jni/openssl/crypto/bio/bss_fd.c b/jni/openssl/crypto/bio/bss_fd.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bio/bss_fd.c
rename to jni/openssl/crypto/bio/bss_fd.c
diff --git a/src/main/jni/openssl/crypto/bio/bss_file.c b/jni/openssl/crypto/bio/bss_file.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bio/bss_file.c
rename to jni/openssl/crypto/bio/bss_file.c
diff --git a/src/main/jni/openssl/crypto/bio/bss_log.c b/jni/openssl/crypto/bio/bss_log.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bio/bss_log.c
rename to jni/openssl/crypto/bio/bss_log.c
diff --git a/src/main/jni/openssl/crypto/bio/bss_mem.c b/jni/openssl/crypto/bio/bss_mem.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bio/bss_mem.c
rename to jni/openssl/crypto/bio/bss_mem.c
diff --git a/src/main/jni/openssl/crypto/bio/bss_null.c b/jni/openssl/crypto/bio/bss_null.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bio/bss_null.c
rename to jni/openssl/crypto/bio/bss_null.c
diff --git a/src/main/jni/openssl/crypto/bio/bss_rtcp.c b/jni/openssl/crypto/bio/bss_rtcp.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bio/bss_rtcp.c
rename to jni/openssl/crypto/bio/bss_rtcp.c
diff --git a/src/main/jni/openssl/crypto/bio/bss_sock.c b/jni/openssl/crypto/bio/bss_sock.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bio/bss_sock.c
rename to jni/openssl/crypto/bio/bss_sock.c
diff --git a/src/main/jni/openssl/crypto/bn/Makefile b/jni/openssl/crypto/bn/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/Makefile
rename to jni/openssl/crypto/bn/Makefile
diff --git a/src/main/jni/openssl/crypto/bn/asm/README b/jni/openssl/crypto/bn/asm/README
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/README
rename to jni/openssl/crypto/bn/asm/README
diff --git a/src/main/jni/openssl/crypto/bn/asm/alpha-mont.pl b/jni/openssl/crypto/bn/asm/alpha-mont.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/alpha-mont.pl
rename to jni/openssl/crypto/bn/asm/alpha-mont.pl
diff --git a/src/main/jni/openssl/crypto/bn/asm/armv4-gf2m.pl b/jni/openssl/crypto/bn/asm/armv4-gf2m.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/armv4-gf2m.pl
rename to jni/openssl/crypto/bn/asm/armv4-gf2m.pl
diff --git a/src/main/jni/openssl/crypto/bn/asm/armv4-mont.S b/jni/openssl/crypto/bn/asm/armv4-mont.S
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/armv4-mont.S
rename to jni/openssl/crypto/bn/asm/armv4-mont.S
diff --git a/src/main/jni/openssl/crypto/bn/asm/armv4-mont.pl b/jni/openssl/crypto/bn/asm/armv4-mont.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/armv4-mont.pl
rename to jni/openssl/crypto/bn/asm/armv4-mont.pl
diff --git a/src/main/jni/openssl/crypto/bn/asm/bn-586.pl b/jni/openssl/crypto/bn/asm/bn-586.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/bn-586.pl
rename to jni/openssl/crypto/bn/asm/bn-586.pl
diff --git a/src/main/jni/openssl/crypto/bn/asm/co-586.pl b/jni/openssl/crypto/bn/asm/co-586.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/co-586.pl
rename to jni/openssl/crypto/bn/asm/co-586.pl
diff --git a/src/main/jni/openssl/crypto/bn/asm/ia64-mont.pl b/jni/openssl/crypto/bn/asm/ia64-mont.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/ia64-mont.pl
rename to jni/openssl/crypto/bn/asm/ia64-mont.pl
diff --git a/src/main/jni/openssl/crypto/bn/asm/ia64.S b/jni/openssl/crypto/bn/asm/ia64.S
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/ia64.S
rename to jni/openssl/crypto/bn/asm/ia64.S
diff --git a/src/main/jni/openssl/crypto/bn/asm/mips-mont.pl b/jni/openssl/crypto/bn/asm/mips-mont.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/mips-mont.pl
rename to jni/openssl/crypto/bn/asm/mips-mont.pl
diff --git a/src/main/jni/openssl/crypto/bn/asm/mips.pl b/jni/openssl/crypto/bn/asm/mips.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/mips.pl
rename to jni/openssl/crypto/bn/asm/mips.pl
diff --git a/src/main/jni/openssl/crypto/bn/asm/mips3-mont.pl b/jni/openssl/crypto/bn/asm/mips3-mont.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/mips3-mont.pl
rename to jni/openssl/crypto/bn/asm/mips3-mont.pl
diff --git a/src/main/jni/openssl/crypto/bn/asm/mips3.s b/jni/openssl/crypto/bn/asm/mips3.s
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/mips3.s
rename to jni/openssl/crypto/bn/asm/mips3.s
diff --git a/src/main/jni/openssl/crypto/bn/asm/modexp512-x86_64.pl b/jni/openssl/crypto/bn/asm/modexp512-x86_64.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/modexp512-x86_64.pl
rename to jni/openssl/crypto/bn/asm/modexp512-x86_64.pl
diff --git a/src/main/jni/openssl/crypto/bn/asm/pa-risc2.s b/jni/openssl/crypto/bn/asm/pa-risc2.s
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/pa-risc2.s
rename to jni/openssl/crypto/bn/asm/pa-risc2.s
diff --git a/src/main/jni/openssl/crypto/bn/asm/pa-risc2W.s b/jni/openssl/crypto/bn/asm/pa-risc2W.s
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/pa-risc2W.s
rename to jni/openssl/crypto/bn/asm/pa-risc2W.s
diff --git a/src/main/jni/openssl/crypto/bn/asm/parisc-mont.pl b/jni/openssl/crypto/bn/asm/parisc-mont.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/parisc-mont.pl
rename to jni/openssl/crypto/bn/asm/parisc-mont.pl
diff --git a/src/main/jni/openssl/crypto/bn/asm/ppc-mont.pl b/jni/openssl/crypto/bn/asm/ppc-mont.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/ppc-mont.pl
rename to jni/openssl/crypto/bn/asm/ppc-mont.pl
diff --git a/src/main/jni/openssl/crypto/bn/asm/ppc.pl b/jni/openssl/crypto/bn/asm/ppc.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/ppc.pl
rename to jni/openssl/crypto/bn/asm/ppc.pl
diff --git a/src/main/jni/openssl/crypto/bn/asm/ppc64-mont.pl b/jni/openssl/crypto/bn/asm/ppc64-mont.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/ppc64-mont.pl
rename to jni/openssl/crypto/bn/asm/ppc64-mont.pl
diff --git a/src/main/jni/openssl/crypto/bn/asm/s390x-gf2m.pl b/jni/openssl/crypto/bn/asm/s390x-gf2m.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/s390x-gf2m.pl
rename to jni/openssl/crypto/bn/asm/s390x-gf2m.pl
diff --git a/src/main/jni/openssl/crypto/bn/asm/s390x-mont.pl b/jni/openssl/crypto/bn/asm/s390x-mont.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/s390x-mont.pl
rename to jni/openssl/crypto/bn/asm/s390x-mont.pl
diff --git a/src/main/jni/openssl/crypto/bn/asm/s390x.S b/jni/openssl/crypto/bn/asm/s390x.S
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/s390x.S
rename to jni/openssl/crypto/bn/asm/s390x.S
diff --git a/src/main/jni/openssl/crypto/bn/asm/sparcv8.S b/jni/openssl/crypto/bn/asm/sparcv8.S
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/sparcv8.S
rename to jni/openssl/crypto/bn/asm/sparcv8.S
diff --git a/src/main/jni/openssl/crypto/bn/asm/sparcv8plus.S b/jni/openssl/crypto/bn/asm/sparcv8plus.S
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/sparcv8plus.S
rename to jni/openssl/crypto/bn/asm/sparcv8plus.S
diff --git a/src/main/jni/openssl/crypto/bn/asm/sparcv9-mont.pl b/jni/openssl/crypto/bn/asm/sparcv9-mont.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/sparcv9-mont.pl
rename to jni/openssl/crypto/bn/asm/sparcv9-mont.pl
diff --git a/src/main/jni/openssl/crypto/bn/asm/sparcv9a-mont.pl b/jni/openssl/crypto/bn/asm/sparcv9a-mont.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/sparcv9a-mont.pl
rename to jni/openssl/crypto/bn/asm/sparcv9a-mont.pl
diff --git a/src/main/jni/openssl/crypto/bn/asm/via-mont.pl b/jni/openssl/crypto/bn/asm/via-mont.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/via-mont.pl
rename to jni/openssl/crypto/bn/asm/via-mont.pl
diff --git a/src/main/jni/openssl/crypto/bn/asm/vms.mar b/jni/openssl/crypto/bn/asm/vms.mar
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/vms.mar
rename to jni/openssl/crypto/bn/asm/vms.mar
diff --git a/src/main/jni/openssl/crypto/bn/asm/x86-gf2m.pl b/jni/openssl/crypto/bn/asm/x86-gf2m.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/x86-gf2m.pl
rename to jni/openssl/crypto/bn/asm/x86-gf2m.pl
diff --git a/src/main/jni/openssl/crypto/bn/asm/x86-mont.pl b/jni/openssl/crypto/bn/asm/x86-mont.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/x86-mont.pl
rename to jni/openssl/crypto/bn/asm/x86-mont.pl
diff --git a/src/main/jni/openssl/crypto/bn/asm/x86.pl b/jni/openssl/crypto/bn/asm/x86.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/x86.pl
rename to jni/openssl/crypto/bn/asm/x86.pl
diff --git a/src/main/jni/openssl/crypto/bn/asm/x86/add.pl b/jni/openssl/crypto/bn/asm/x86/add.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/x86/add.pl
rename to jni/openssl/crypto/bn/asm/x86/add.pl
diff --git a/src/main/jni/openssl/crypto/bn/asm/x86/comba.pl b/jni/openssl/crypto/bn/asm/x86/comba.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/x86/comba.pl
rename to jni/openssl/crypto/bn/asm/x86/comba.pl
diff --git a/src/main/jni/openssl/crypto/bn/asm/x86/div.pl b/jni/openssl/crypto/bn/asm/x86/div.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/x86/div.pl
rename to jni/openssl/crypto/bn/asm/x86/div.pl
diff --git a/src/main/jni/openssl/crypto/bn/asm/x86/f b/jni/openssl/crypto/bn/asm/x86/f
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/x86/f
rename to jni/openssl/crypto/bn/asm/x86/f
diff --git a/src/main/jni/openssl/crypto/bn/asm/x86/mul.pl b/jni/openssl/crypto/bn/asm/x86/mul.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/x86/mul.pl
rename to jni/openssl/crypto/bn/asm/x86/mul.pl
diff --git a/src/main/jni/openssl/crypto/bn/asm/x86/mul_add.pl b/jni/openssl/crypto/bn/asm/x86/mul_add.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/x86/mul_add.pl
rename to jni/openssl/crypto/bn/asm/x86/mul_add.pl
diff --git a/src/main/jni/openssl/crypto/bn/asm/x86/sqr.pl b/jni/openssl/crypto/bn/asm/x86/sqr.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/x86/sqr.pl
rename to jni/openssl/crypto/bn/asm/x86/sqr.pl
diff --git a/src/main/jni/openssl/crypto/bn/asm/x86/sub.pl b/jni/openssl/crypto/bn/asm/x86/sub.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/x86/sub.pl
rename to jni/openssl/crypto/bn/asm/x86/sub.pl
diff --git a/src/main/jni/openssl/crypto/bn/asm/x86_64-gcc.c b/jni/openssl/crypto/bn/asm/x86_64-gcc.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/x86_64-gcc.c
rename to jni/openssl/crypto/bn/asm/x86_64-gcc.c
diff --git a/src/main/jni/openssl/crypto/bn/asm/x86_64-gf2m.pl b/jni/openssl/crypto/bn/asm/x86_64-gf2m.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/x86_64-gf2m.pl
rename to jni/openssl/crypto/bn/asm/x86_64-gf2m.pl
diff --git a/src/main/jni/openssl/crypto/bn/asm/x86_64-mont.pl b/jni/openssl/crypto/bn/asm/x86_64-mont.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/x86_64-mont.pl
rename to jni/openssl/crypto/bn/asm/x86_64-mont.pl
diff --git a/src/main/jni/openssl/crypto/bn/asm/x86_64-mont5.pl b/jni/openssl/crypto/bn/asm/x86_64-mont5.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/asm/x86_64-mont5.pl
rename to jni/openssl/crypto/bn/asm/x86_64-mont5.pl
diff --git a/src/main/jni/openssl/crypto/bn/bn.h b/jni/openssl/crypto/bn/bn.h
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/bn.h
rename to jni/openssl/crypto/bn/bn.h
diff --git a/src/main/jni/openssl/crypto/bn/bn.mul b/jni/openssl/crypto/bn/bn.mul
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/bn.mul
rename to jni/openssl/crypto/bn/bn.mul
diff --git a/src/main/jni/openssl/crypto/bn/bn_add.c b/jni/openssl/crypto/bn/bn_add.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/bn_add.c
rename to jni/openssl/crypto/bn/bn_add.c
diff --git a/src/main/jni/openssl/crypto/bn/bn_asm.c b/jni/openssl/crypto/bn/bn_asm.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/bn_asm.c
rename to jni/openssl/crypto/bn/bn_asm.c
diff --git a/src/main/jni/openssl/crypto/bn/bn_blind.c b/jni/openssl/crypto/bn/bn_blind.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/bn_blind.c
rename to jni/openssl/crypto/bn/bn_blind.c
diff --git a/src/main/jni/openssl/crypto/bn/bn_const.c b/jni/openssl/crypto/bn/bn_const.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/bn_const.c
rename to jni/openssl/crypto/bn/bn_const.c
diff --git a/src/main/jni/openssl/crypto/bn/bn_ctx.c b/jni/openssl/crypto/bn/bn_ctx.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/bn_ctx.c
rename to jni/openssl/crypto/bn/bn_ctx.c
diff --git a/src/main/jni/openssl/crypto/bn/bn_depr.c b/jni/openssl/crypto/bn/bn_depr.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/bn_depr.c
rename to jni/openssl/crypto/bn/bn_depr.c
diff --git a/src/main/jni/openssl/crypto/bn/bn_div.c b/jni/openssl/crypto/bn/bn_div.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/bn_div.c
rename to jni/openssl/crypto/bn/bn_div.c
diff --git a/src/main/jni/openssl/crypto/bn/bn_err.c b/jni/openssl/crypto/bn/bn_err.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/bn_err.c
rename to jni/openssl/crypto/bn/bn_err.c
diff --git a/src/main/jni/openssl/crypto/bn/bn_exp.c b/jni/openssl/crypto/bn/bn_exp.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/bn_exp.c
rename to jni/openssl/crypto/bn/bn_exp.c
diff --git a/src/main/jni/openssl/crypto/bn/bn_exp2.c b/jni/openssl/crypto/bn/bn_exp2.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/bn_exp2.c
rename to jni/openssl/crypto/bn/bn_exp2.c
diff --git a/src/main/jni/openssl/crypto/bn/bn_gcd.c b/jni/openssl/crypto/bn/bn_gcd.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/bn_gcd.c
rename to jni/openssl/crypto/bn/bn_gcd.c
diff --git a/src/main/jni/openssl/crypto/bn/bn_gf2m.c b/jni/openssl/crypto/bn/bn_gf2m.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/bn_gf2m.c
rename to jni/openssl/crypto/bn/bn_gf2m.c
diff --git a/src/main/jni/openssl/crypto/bn/bn_kron.c b/jni/openssl/crypto/bn/bn_kron.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/bn_kron.c
rename to jni/openssl/crypto/bn/bn_kron.c
diff --git a/src/main/jni/openssl/crypto/bn/bn_lcl.h b/jni/openssl/crypto/bn/bn_lcl.h
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/bn_lcl.h
rename to jni/openssl/crypto/bn/bn_lcl.h
diff --git a/src/main/jni/openssl/crypto/bn/bn_lib.c b/jni/openssl/crypto/bn/bn_lib.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/bn_lib.c
rename to jni/openssl/crypto/bn/bn_lib.c
diff --git a/src/main/jni/openssl/crypto/bn/bn_mod.c b/jni/openssl/crypto/bn/bn_mod.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/bn_mod.c
rename to jni/openssl/crypto/bn/bn_mod.c
diff --git a/src/main/jni/openssl/crypto/bn/bn_mont.c b/jni/openssl/crypto/bn/bn_mont.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/bn_mont.c
rename to jni/openssl/crypto/bn/bn_mont.c
diff --git a/src/main/jni/openssl/crypto/bn/bn_mpi.c b/jni/openssl/crypto/bn/bn_mpi.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/bn_mpi.c
rename to jni/openssl/crypto/bn/bn_mpi.c
diff --git a/src/main/jni/openssl/crypto/bn/bn_mul.c b/jni/openssl/crypto/bn/bn_mul.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/bn_mul.c
rename to jni/openssl/crypto/bn/bn_mul.c
diff --git a/src/main/jni/openssl/crypto/bn/bn_nist.c b/jni/openssl/crypto/bn/bn_nist.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/bn_nist.c
rename to jni/openssl/crypto/bn/bn_nist.c
diff --git a/src/main/jni/openssl/crypto/bn/bn_prime.c b/jni/openssl/crypto/bn/bn_prime.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/bn_prime.c
rename to jni/openssl/crypto/bn/bn_prime.c
diff --git a/src/main/jni/openssl/crypto/bn/bn_prime.h b/jni/openssl/crypto/bn/bn_prime.h
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/bn_prime.h
rename to jni/openssl/crypto/bn/bn_prime.h
diff --git a/src/main/jni/openssl/crypto/bn/bn_prime.pl b/jni/openssl/crypto/bn/bn_prime.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/bn_prime.pl
rename to jni/openssl/crypto/bn/bn_prime.pl
diff --git a/src/main/jni/openssl/crypto/bn/bn_print.c b/jni/openssl/crypto/bn/bn_print.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/bn_print.c
rename to jni/openssl/crypto/bn/bn_print.c
diff --git a/src/main/jni/openssl/crypto/bn/bn_rand.c b/jni/openssl/crypto/bn/bn_rand.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/bn_rand.c
rename to jni/openssl/crypto/bn/bn_rand.c
diff --git a/src/main/jni/openssl/crypto/bn/bn_recp.c b/jni/openssl/crypto/bn/bn_recp.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/bn_recp.c
rename to jni/openssl/crypto/bn/bn_recp.c
diff --git a/src/main/jni/openssl/crypto/bn/bn_shift.c b/jni/openssl/crypto/bn/bn_shift.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/bn_shift.c
rename to jni/openssl/crypto/bn/bn_shift.c
diff --git a/src/main/jni/openssl/crypto/bn/bn_sqr.c b/jni/openssl/crypto/bn/bn_sqr.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/bn_sqr.c
rename to jni/openssl/crypto/bn/bn_sqr.c
diff --git a/src/main/jni/openssl/crypto/bn/bn_sqrt.c b/jni/openssl/crypto/bn/bn_sqrt.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/bn_sqrt.c
rename to jni/openssl/crypto/bn/bn_sqrt.c
diff --git a/src/main/jni/openssl/crypto/bn/bn_word.c b/jni/openssl/crypto/bn/bn_word.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/bn_word.c
rename to jni/openssl/crypto/bn/bn_word.c
diff --git a/src/main/jni/openssl/crypto/bn/bn_x931p.c b/jni/openssl/crypto/bn/bn_x931p.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/bn_x931p.c
rename to jni/openssl/crypto/bn/bn_x931p.c
diff --git a/src/main/jni/openssl/crypto/bn/bnspeed.c b/jni/openssl/crypto/bn/bnspeed.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/bnspeed.c
rename to jni/openssl/crypto/bn/bnspeed.c
diff --git a/src/main/jni/openssl/crypto/bn/bntest.c b/jni/openssl/crypto/bn/bntest.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/bntest.c
rename to jni/openssl/crypto/bn/bntest.c
diff --git a/src/main/jni/openssl/crypto/bn/divtest.c b/jni/openssl/crypto/bn/divtest.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/divtest.c
rename to jni/openssl/crypto/bn/divtest.c
diff --git a/src/main/jni/openssl/crypto/bn/exp.c b/jni/openssl/crypto/bn/exp.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/exp.c
rename to jni/openssl/crypto/bn/exp.c
diff --git a/src/main/jni/openssl/crypto/bn/expspeed.c b/jni/openssl/crypto/bn/expspeed.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/expspeed.c
rename to jni/openssl/crypto/bn/expspeed.c
diff --git a/src/main/jni/openssl/crypto/bn/exptest.c b/jni/openssl/crypto/bn/exptest.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/exptest.c
rename to jni/openssl/crypto/bn/exptest.c
diff --git a/src/main/jni/openssl/crypto/bn/todo b/jni/openssl/crypto/bn/todo
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/todo
rename to jni/openssl/crypto/bn/todo
diff --git a/src/main/jni/openssl/crypto/bn/vms-helper.c b/jni/openssl/crypto/bn/vms-helper.c
similarity index 100%
rename from src/main/jni/openssl/crypto/bn/vms-helper.c
rename to jni/openssl/crypto/bn/vms-helper.c
diff --git a/src/main/jni/openssl/crypto/buffer/Makefile b/jni/openssl/crypto/buffer/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/buffer/Makefile
rename to jni/openssl/crypto/buffer/Makefile
diff --git a/src/main/jni/openssl/crypto/buffer/buf_err.c b/jni/openssl/crypto/buffer/buf_err.c
similarity index 100%
rename from src/main/jni/openssl/crypto/buffer/buf_err.c
rename to jni/openssl/crypto/buffer/buf_err.c
diff --git a/src/main/jni/openssl/crypto/buffer/buf_str.c b/jni/openssl/crypto/buffer/buf_str.c
similarity index 100%
rename from src/main/jni/openssl/crypto/buffer/buf_str.c
rename to jni/openssl/crypto/buffer/buf_str.c
diff --git a/src/main/jni/openssl/crypto/buffer/buffer.c b/jni/openssl/crypto/buffer/buffer.c
similarity index 100%
rename from src/main/jni/openssl/crypto/buffer/buffer.c
rename to jni/openssl/crypto/buffer/buffer.c
diff --git a/src/main/jni/openssl/crypto/buffer/buffer.h b/jni/openssl/crypto/buffer/buffer.h
similarity index 100%
rename from src/main/jni/openssl/crypto/buffer/buffer.h
rename to jni/openssl/crypto/buffer/buffer.h
diff --git a/src/main/jni/openssl/crypto/camellia/Makefile b/jni/openssl/crypto/camellia/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/camellia/Makefile
rename to jni/openssl/crypto/camellia/Makefile
diff --git a/src/main/jni/openssl/crypto/camellia/asm/cmll-x86.pl b/jni/openssl/crypto/camellia/asm/cmll-x86.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/camellia/asm/cmll-x86.pl
rename to jni/openssl/crypto/camellia/asm/cmll-x86.pl
diff --git a/src/main/jni/openssl/crypto/camellia/asm/cmll-x86_64.pl b/jni/openssl/crypto/camellia/asm/cmll-x86_64.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/camellia/asm/cmll-x86_64.pl
rename to jni/openssl/crypto/camellia/asm/cmll-x86_64.pl
diff --git a/src/main/jni/openssl/crypto/camellia/camellia.c b/jni/openssl/crypto/camellia/camellia.c
similarity index 100%
rename from src/main/jni/openssl/crypto/camellia/camellia.c
rename to jni/openssl/crypto/camellia/camellia.c
diff --git a/src/main/jni/openssl/crypto/camellia/camellia.h b/jni/openssl/crypto/camellia/camellia.h
similarity index 100%
rename from src/main/jni/openssl/crypto/camellia/camellia.h
rename to jni/openssl/crypto/camellia/camellia.h
diff --git a/src/main/jni/openssl/crypto/camellia/cmll_cbc.c b/jni/openssl/crypto/camellia/cmll_cbc.c
similarity index 100%
rename from src/main/jni/openssl/crypto/camellia/cmll_cbc.c
rename to jni/openssl/crypto/camellia/cmll_cbc.c
diff --git a/src/main/jni/openssl/crypto/camellia/cmll_cfb.c b/jni/openssl/crypto/camellia/cmll_cfb.c
similarity index 100%
rename from src/main/jni/openssl/crypto/camellia/cmll_cfb.c
rename to jni/openssl/crypto/camellia/cmll_cfb.c
diff --git a/src/main/jni/openssl/crypto/camellia/cmll_ctr.c b/jni/openssl/crypto/camellia/cmll_ctr.c
similarity index 100%
rename from src/main/jni/openssl/crypto/camellia/cmll_ctr.c
rename to jni/openssl/crypto/camellia/cmll_ctr.c
diff --git a/src/main/jni/openssl/crypto/camellia/cmll_ecb.c b/jni/openssl/crypto/camellia/cmll_ecb.c
similarity index 100%
rename from src/main/jni/openssl/crypto/camellia/cmll_ecb.c
rename to jni/openssl/crypto/camellia/cmll_ecb.c
diff --git a/src/main/jni/openssl/crypto/camellia/cmll_locl.h b/jni/openssl/crypto/camellia/cmll_locl.h
similarity index 100%
rename from src/main/jni/openssl/crypto/camellia/cmll_locl.h
rename to jni/openssl/crypto/camellia/cmll_locl.h
diff --git a/src/main/jni/openssl/crypto/camellia/cmll_misc.c b/jni/openssl/crypto/camellia/cmll_misc.c
similarity index 100%
rename from src/main/jni/openssl/crypto/camellia/cmll_misc.c
rename to jni/openssl/crypto/camellia/cmll_misc.c
diff --git a/src/main/jni/openssl/crypto/camellia/cmll_ofb.c b/jni/openssl/crypto/camellia/cmll_ofb.c
similarity index 100%
rename from src/main/jni/openssl/crypto/camellia/cmll_ofb.c
rename to jni/openssl/crypto/camellia/cmll_ofb.c
diff --git a/src/main/jni/openssl/crypto/camellia/cmll_utl.c b/jni/openssl/crypto/camellia/cmll_utl.c
similarity index 100%
rename from src/main/jni/openssl/crypto/camellia/cmll_utl.c
rename to jni/openssl/crypto/camellia/cmll_utl.c
diff --git a/src/main/jni/openssl/crypto/cast/Makefile b/jni/openssl/crypto/cast/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/cast/Makefile
rename to jni/openssl/crypto/cast/Makefile
diff --git a/src/main/jni/openssl/crypto/cast/asm/cast-586.pl b/jni/openssl/crypto/cast/asm/cast-586.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/cast/asm/cast-586.pl
rename to jni/openssl/crypto/cast/asm/cast-586.pl
diff --git a/src/main/jni/openssl/crypto/cast/asm/readme b/jni/openssl/crypto/cast/asm/readme
similarity index 100%
rename from src/main/jni/openssl/crypto/cast/asm/readme
rename to jni/openssl/crypto/cast/asm/readme
diff --git a/src/main/jni/openssl/crypto/cast/c_cfb64.c b/jni/openssl/crypto/cast/c_cfb64.c
similarity index 100%
rename from src/main/jni/openssl/crypto/cast/c_cfb64.c
rename to jni/openssl/crypto/cast/c_cfb64.c
diff --git a/src/main/jni/openssl/crypto/cast/c_ecb.c b/jni/openssl/crypto/cast/c_ecb.c
similarity index 100%
rename from src/main/jni/openssl/crypto/cast/c_ecb.c
rename to jni/openssl/crypto/cast/c_ecb.c
diff --git a/src/main/jni/openssl/crypto/cast/c_enc.c b/jni/openssl/crypto/cast/c_enc.c
similarity index 100%
rename from src/main/jni/openssl/crypto/cast/c_enc.c
rename to jni/openssl/crypto/cast/c_enc.c
diff --git a/src/main/jni/openssl/crypto/cast/c_ofb64.c b/jni/openssl/crypto/cast/c_ofb64.c
similarity index 100%
rename from src/main/jni/openssl/crypto/cast/c_ofb64.c
rename to jni/openssl/crypto/cast/c_ofb64.c
diff --git a/src/main/jni/openssl/crypto/cast/c_skey.c b/jni/openssl/crypto/cast/c_skey.c
similarity index 100%
rename from src/main/jni/openssl/crypto/cast/c_skey.c
rename to jni/openssl/crypto/cast/c_skey.c
diff --git a/src/main/jni/openssl/crypto/cast/cast.h b/jni/openssl/crypto/cast/cast.h
similarity index 100%
rename from src/main/jni/openssl/crypto/cast/cast.h
rename to jni/openssl/crypto/cast/cast.h
diff --git a/src/main/jni/openssl/crypto/cast/cast_lcl.h b/jni/openssl/crypto/cast/cast_lcl.h
similarity index 100%
rename from src/main/jni/openssl/crypto/cast/cast_lcl.h
rename to jni/openssl/crypto/cast/cast_lcl.h
diff --git a/src/main/jni/openssl/crypto/cast/cast_s.h b/jni/openssl/crypto/cast/cast_s.h
similarity index 100%
rename from src/main/jni/openssl/crypto/cast/cast_s.h
rename to jni/openssl/crypto/cast/cast_s.h
diff --git a/src/main/jni/openssl/crypto/cast/cast_spd.c b/jni/openssl/crypto/cast/cast_spd.c
similarity index 100%
rename from src/main/jni/openssl/crypto/cast/cast_spd.c
rename to jni/openssl/crypto/cast/cast_spd.c
diff --git a/src/main/jni/openssl/crypto/cast/castopts.c b/jni/openssl/crypto/cast/castopts.c
similarity index 100%
rename from src/main/jni/openssl/crypto/cast/castopts.c
rename to jni/openssl/crypto/cast/castopts.c
diff --git a/src/main/jni/openssl/crypto/cast/casts.cpp b/jni/openssl/crypto/cast/casts.cpp
similarity index 100%
rename from src/main/jni/openssl/crypto/cast/casts.cpp
rename to jni/openssl/crypto/cast/casts.cpp
diff --git a/src/main/jni/openssl/crypto/cast/casttest.c b/jni/openssl/crypto/cast/casttest.c
similarity index 100%
rename from src/main/jni/openssl/crypto/cast/casttest.c
rename to jni/openssl/crypto/cast/casttest.c
diff --git a/src/main/jni/openssl/crypto/cmac/Makefile b/jni/openssl/crypto/cmac/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/cmac/Makefile
rename to jni/openssl/crypto/cmac/Makefile
diff --git a/src/main/jni/openssl/crypto/cmac/cm_ameth.c b/jni/openssl/crypto/cmac/cm_ameth.c
similarity index 100%
rename from src/main/jni/openssl/crypto/cmac/cm_ameth.c
rename to jni/openssl/crypto/cmac/cm_ameth.c
diff --git a/src/main/jni/openssl/crypto/cmac/cm_pmeth.c b/jni/openssl/crypto/cmac/cm_pmeth.c
similarity index 100%
rename from src/main/jni/openssl/crypto/cmac/cm_pmeth.c
rename to jni/openssl/crypto/cmac/cm_pmeth.c
diff --git a/src/main/jni/openssl/crypto/cmac/cmac.c b/jni/openssl/crypto/cmac/cmac.c
similarity index 100%
rename from src/main/jni/openssl/crypto/cmac/cmac.c
rename to jni/openssl/crypto/cmac/cmac.c
diff --git a/src/main/jni/openssl/crypto/cmac/cmac.h b/jni/openssl/crypto/cmac/cmac.h
similarity index 100%
rename from src/main/jni/openssl/crypto/cmac/cmac.h
rename to jni/openssl/crypto/cmac/cmac.h
diff --git a/src/main/jni/openssl/crypto/comp/Makefile b/jni/openssl/crypto/comp/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/comp/Makefile
rename to jni/openssl/crypto/comp/Makefile
diff --git a/src/main/jni/openssl/crypto/comp/c_rle.c b/jni/openssl/crypto/comp/c_rle.c
similarity index 100%
rename from src/main/jni/openssl/crypto/comp/c_rle.c
rename to jni/openssl/crypto/comp/c_rle.c
diff --git a/src/main/jni/openssl/crypto/comp/c_zlib.c b/jni/openssl/crypto/comp/c_zlib.c
similarity index 100%
rename from src/main/jni/openssl/crypto/comp/c_zlib.c
rename to jni/openssl/crypto/comp/c_zlib.c
diff --git a/src/main/jni/openssl/crypto/comp/comp.h b/jni/openssl/crypto/comp/comp.h
similarity index 100%
rename from src/main/jni/openssl/crypto/comp/comp.h
rename to jni/openssl/crypto/comp/comp.h
diff --git a/src/main/jni/openssl/crypto/comp/comp_err.c b/jni/openssl/crypto/comp/comp_err.c
similarity index 100%
rename from src/main/jni/openssl/crypto/comp/comp_err.c
rename to jni/openssl/crypto/comp/comp_err.c
diff --git a/src/main/jni/openssl/crypto/comp/comp_lib.c b/jni/openssl/crypto/comp/comp_lib.c
similarity index 100%
rename from src/main/jni/openssl/crypto/comp/comp_lib.c
rename to jni/openssl/crypto/comp/comp_lib.c
diff --git a/src/main/jni/openssl/crypto/conf/Makefile b/jni/openssl/crypto/conf/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/conf/Makefile
rename to jni/openssl/crypto/conf/Makefile
diff --git a/src/main/jni/openssl/crypto/conf/README b/jni/openssl/crypto/conf/README
similarity index 100%
rename from src/main/jni/openssl/crypto/conf/README
rename to jni/openssl/crypto/conf/README
diff --git a/src/main/jni/openssl/crypto/conf/cnf_save.c b/jni/openssl/crypto/conf/cnf_save.c
similarity index 100%
rename from src/main/jni/openssl/crypto/conf/cnf_save.c
rename to jni/openssl/crypto/conf/cnf_save.c
diff --git a/src/main/jni/openssl/crypto/conf/conf.h b/jni/openssl/crypto/conf/conf.h
similarity index 100%
rename from src/main/jni/openssl/crypto/conf/conf.h
rename to jni/openssl/crypto/conf/conf.h
diff --git a/src/main/jni/openssl/crypto/conf/conf_api.c b/jni/openssl/crypto/conf/conf_api.c
similarity index 100%
rename from src/main/jni/openssl/crypto/conf/conf_api.c
rename to jni/openssl/crypto/conf/conf_api.c
diff --git a/src/main/jni/openssl/crypto/conf/conf_api.h b/jni/openssl/crypto/conf/conf_api.h
similarity index 100%
rename from src/main/jni/openssl/crypto/conf/conf_api.h
rename to jni/openssl/crypto/conf/conf_api.h
diff --git a/src/main/jni/openssl/crypto/conf/conf_def.c b/jni/openssl/crypto/conf/conf_def.c
similarity index 100%
rename from src/main/jni/openssl/crypto/conf/conf_def.c
rename to jni/openssl/crypto/conf/conf_def.c
diff --git a/src/main/jni/openssl/crypto/conf/conf_def.h b/jni/openssl/crypto/conf/conf_def.h
similarity index 100%
rename from src/main/jni/openssl/crypto/conf/conf_def.h
rename to jni/openssl/crypto/conf/conf_def.h
diff --git a/src/main/jni/openssl/crypto/conf/conf_err.c b/jni/openssl/crypto/conf/conf_err.c
similarity index 100%
rename from src/main/jni/openssl/crypto/conf/conf_err.c
rename to jni/openssl/crypto/conf/conf_err.c
diff --git a/src/main/jni/openssl/crypto/conf/conf_lib.c b/jni/openssl/crypto/conf/conf_lib.c
similarity index 100%
rename from src/main/jni/openssl/crypto/conf/conf_lib.c
rename to jni/openssl/crypto/conf/conf_lib.c
diff --git a/src/main/jni/openssl/crypto/conf/conf_mall.c b/jni/openssl/crypto/conf/conf_mall.c
similarity index 100%
rename from src/main/jni/openssl/crypto/conf/conf_mall.c
rename to jni/openssl/crypto/conf/conf_mall.c
diff --git a/src/main/jni/openssl/crypto/conf/conf_mod.c b/jni/openssl/crypto/conf/conf_mod.c
similarity index 100%
rename from src/main/jni/openssl/crypto/conf/conf_mod.c
rename to jni/openssl/crypto/conf/conf_mod.c
diff --git a/src/main/jni/openssl/crypto/conf/conf_sap.c b/jni/openssl/crypto/conf/conf_sap.c
similarity index 100%
rename from src/main/jni/openssl/crypto/conf/conf_sap.c
rename to jni/openssl/crypto/conf/conf_sap.c
diff --git a/src/main/jni/openssl/crypto/conf/keysets.pl b/jni/openssl/crypto/conf/keysets.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/conf/keysets.pl
rename to jni/openssl/crypto/conf/keysets.pl
diff --git a/src/main/jni/openssl/crypto/conf/ssleay.cnf b/jni/openssl/crypto/conf/ssleay.cnf
similarity index 100%
rename from src/main/jni/openssl/crypto/conf/ssleay.cnf
rename to jni/openssl/crypto/conf/ssleay.cnf
diff --git a/src/main/jni/openssl/crypto/conf/test.c b/jni/openssl/crypto/conf/test.c
similarity index 100%
rename from src/main/jni/openssl/crypto/conf/test.c
rename to jni/openssl/crypto/conf/test.c
diff --git a/src/main/jni/openssl/crypto/cpt_err.c b/jni/openssl/crypto/cpt_err.c
similarity index 100%
rename from src/main/jni/openssl/crypto/cpt_err.c
rename to jni/openssl/crypto/cpt_err.c
diff --git a/src/main/jni/openssl/crypto/cryptlib.c b/jni/openssl/crypto/cryptlib.c
similarity index 100%
rename from src/main/jni/openssl/crypto/cryptlib.c
rename to jni/openssl/crypto/cryptlib.c
diff --git a/src/main/jni/openssl/crypto/cryptlib.h b/jni/openssl/crypto/cryptlib.h
similarity index 100%
rename from src/main/jni/openssl/crypto/cryptlib.h
rename to jni/openssl/crypto/cryptlib.h
diff --git a/src/main/jni/openssl/crypto/crypto-lib.com b/jni/openssl/crypto/crypto-lib.com
similarity index 100%
rename from src/main/jni/openssl/crypto/crypto-lib.com
rename to jni/openssl/crypto/crypto-lib.com
diff --git a/src/main/jni/openssl/crypto/crypto.h b/jni/openssl/crypto/crypto.h
similarity index 100%
rename from src/main/jni/openssl/crypto/crypto.h
rename to jni/openssl/crypto/crypto.h
diff --git a/src/main/jni/openssl/crypto/cversion.c b/jni/openssl/crypto/cversion.c
similarity index 100%
rename from src/main/jni/openssl/crypto/cversion.c
rename to jni/openssl/crypto/cversion.c
diff --git a/src/main/jni/openssl/crypto/des/COPYRIGHT b/jni/openssl/crypto/des/COPYRIGHT
similarity index 100%
rename from src/main/jni/openssl/crypto/des/COPYRIGHT
rename to jni/openssl/crypto/des/COPYRIGHT
diff --git a/src/main/jni/openssl/crypto/des/DES.pm b/jni/openssl/crypto/des/DES.pm
similarity index 100%
rename from src/main/jni/openssl/crypto/des/DES.pm
rename to jni/openssl/crypto/des/DES.pm
diff --git a/src/main/jni/openssl/crypto/des/DES.xs b/jni/openssl/crypto/des/DES.xs
similarity index 100%
rename from src/main/jni/openssl/crypto/des/DES.xs
rename to jni/openssl/crypto/des/DES.xs
diff --git a/src/main/jni/openssl/crypto/des/FILES0 b/jni/openssl/crypto/des/FILES0
similarity index 100%
rename from src/main/jni/openssl/crypto/des/FILES0
rename to jni/openssl/crypto/des/FILES0
diff --git a/src/main/jni/openssl/crypto/des/INSTALL b/jni/openssl/crypto/des/INSTALL
similarity index 100%
rename from src/main/jni/openssl/crypto/des/INSTALL
rename to jni/openssl/crypto/des/INSTALL
diff --git a/src/main/jni/openssl/crypto/des/Imakefile b/jni/openssl/crypto/des/Imakefile
similarity index 100%
rename from src/main/jni/openssl/crypto/des/Imakefile
rename to jni/openssl/crypto/des/Imakefile
diff --git a/src/main/jni/openssl/crypto/des/KERBEROS b/jni/openssl/crypto/des/KERBEROS
similarity index 100%
rename from src/main/jni/openssl/crypto/des/KERBEROS
rename to jni/openssl/crypto/des/KERBEROS
diff --git a/src/main/jni/openssl/crypto/des/Makefile b/jni/openssl/crypto/des/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/des/Makefile
rename to jni/openssl/crypto/des/Makefile
diff --git a/src/main/jni/openssl/crypto/des/README b/jni/openssl/crypto/des/README
similarity index 100%
rename from src/main/jni/openssl/crypto/des/README
rename to jni/openssl/crypto/des/README
diff --git a/src/main/jni/openssl/crypto/des/VERSION b/jni/openssl/crypto/des/VERSION
similarity index 100%
rename from src/main/jni/openssl/crypto/des/VERSION
rename to jni/openssl/crypto/des/VERSION
diff --git a/src/main/jni/openssl/crypto/des/asm/crypt586.pl b/jni/openssl/crypto/des/asm/crypt586.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/des/asm/crypt586.pl
rename to jni/openssl/crypto/des/asm/crypt586.pl
diff --git a/src/main/jni/openssl/crypto/des/asm/des-586.pl b/jni/openssl/crypto/des/asm/des-586.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/des/asm/des-586.pl
rename to jni/openssl/crypto/des/asm/des-586.pl
diff --git a/src/main/jni/openssl/crypto/des/asm/des_enc.m4 b/jni/openssl/crypto/des/asm/des_enc.m4
similarity index 100%
rename from src/main/jni/openssl/crypto/des/asm/des_enc.m4
rename to jni/openssl/crypto/des/asm/des_enc.m4
diff --git a/src/main/jni/openssl/crypto/des/asm/desboth.pl b/jni/openssl/crypto/des/asm/desboth.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/des/asm/desboth.pl
rename to jni/openssl/crypto/des/asm/desboth.pl
diff --git a/src/main/jni/openssl/crypto/des/asm/readme b/jni/openssl/crypto/des/asm/readme
similarity index 100%
rename from src/main/jni/openssl/crypto/des/asm/readme
rename to jni/openssl/crypto/des/asm/readme
diff --git a/src/main/jni/openssl/crypto/des/cbc3_enc.c b/jni/openssl/crypto/des/cbc3_enc.c
similarity index 100%
rename from src/main/jni/openssl/crypto/des/cbc3_enc.c
rename to jni/openssl/crypto/des/cbc3_enc.c
diff --git a/src/main/jni/openssl/crypto/des/cbc_cksm.c b/jni/openssl/crypto/des/cbc_cksm.c
similarity index 100%
rename from src/main/jni/openssl/crypto/des/cbc_cksm.c
rename to jni/openssl/crypto/des/cbc_cksm.c
diff --git a/src/main/jni/openssl/crypto/des/cbc_enc.c b/jni/openssl/crypto/des/cbc_enc.c
similarity index 100%
rename from src/main/jni/openssl/crypto/des/cbc_enc.c
rename to jni/openssl/crypto/des/cbc_enc.c
diff --git a/src/main/jni/openssl/crypto/des/cfb64ede.c b/jni/openssl/crypto/des/cfb64ede.c
similarity index 100%
rename from src/main/jni/openssl/crypto/des/cfb64ede.c
rename to jni/openssl/crypto/des/cfb64ede.c
diff --git a/src/main/jni/openssl/crypto/des/cfb64enc.c b/jni/openssl/crypto/des/cfb64enc.c
similarity index 100%
rename from src/main/jni/openssl/crypto/des/cfb64enc.c
rename to jni/openssl/crypto/des/cfb64enc.c
diff --git a/src/main/jni/openssl/crypto/des/cfb_enc.c b/jni/openssl/crypto/des/cfb_enc.c
similarity index 100%
rename from src/main/jni/openssl/crypto/des/cfb_enc.c
rename to jni/openssl/crypto/des/cfb_enc.c
diff --git a/src/main/jni/openssl/crypto/des/des-lib.com b/jni/openssl/crypto/des/des-lib.com
similarity index 100%
rename from src/main/jni/openssl/crypto/des/des-lib.com
rename to jni/openssl/crypto/des/des-lib.com
diff --git a/src/main/jni/openssl/crypto/des/des.c b/jni/openssl/crypto/des/des.c
similarity index 100%
rename from src/main/jni/openssl/crypto/des/des.c
rename to jni/openssl/crypto/des/des.c
diff --git a/src/main/jni/openssl/crypto/des/des.h b/jni/openssl/crypto/des/des.h
similarity index 100%
rename from src/main/jni/openssl/crypto/des/des.h
rename to jni/openssl/crypto/des/des.h
diff --git a/src/main/jni/openssl/crypto/des/des.pod b/jni/openssl/crypto/des/des.pod
similarity index 100%
rename from src/main/jni/openssl/crypto/des/des.pod
rename to jni/openssl/crypto/des/des.pod
diff --git a/src/main/jni/openssl/crypto/des/des3s.cpp b/jni/openssl/crypto/des/des3s.cpp
similarity index 100%
rename from src/main/jni/openssl/crypto/des/des3s.cpp
rename to jni/openssl/crypto/des/des3s.cpp
diff --git a/src/main/jni/openssl/crypto/des/des_enc.c b/jni/openssl/crypto/des/des_enc.c
similarity index 100%
rename from src/main/jni/openssl/crypto/des/des_enc.c
rename to jni/openssl/crypto/des/des_enc.c
diff --git a/src/main/jni/openssl/crypto/des/des_locl.h b/jni/openssl/crypto/des/des_locl.h
similarity index 100%
rename from src/main/jni/openssl/crypto/des/des_locl.h
rename to jni/openssl/crypto/des/des_locl.h
diff --git a/src/main/jni/openssl/crypto/des/des_old.c b/jni/openssl/crypto/des/des_old.c
similarity index 100%
rename from src/main/jni/openssl/crypto/des/des_old.c
rename to jni/openssl/crypto/des/des_old.c
diff --git a/src/main/jni/openssl/crypto/des/des_old.h b/jni/openssl/crypto/des/des_old.h
similarity index 100%
rename from src/main/jni/openssl/crypto/des/des_old.h
rename to jni/openssl/crypto/des/des_old.h
diff --git a/src/main/jni/openssl/crypto/des/des_old2.c b/jni/openssl/crypto/des/des_old2.c
similarity index 100%
rename from src/main/jni/openssl/crypto/des/des_old2.c
rename to jni/openssl/crypto/des/des_old2.c
diff --git a/src/main/jni/openssl/crypto/des/des_opts.c b/jni/openssl/crypto/des/des_opts.c
similarity index 100%
rename from src/main/jni/openssl/crypto/des/des_opts.c
rename to jni/openssl/crypto/des/des_opts.c
diff --git a/src/main/jni/openssl/crypto/des/des_ver.h b/jni/openssl/crypto/des/des_ver.h
similarity index 100%
rename from src/main/jni/openssl/crypto/des/des_ver.h
rename to jni/openssl/crypto/des/des_ver.h
diff --git a/src/main/jni/openssl/crypto/des/dess.cpp b/jni/openssl/crypto/des/dess.cpp
similarity index 100%
rename from src/main/jni/openssl/crypto/des/dess.cpp
rename to jni/openssl/crypto/des/dess.cpp
diff --git a/src/main/jni/openssl/crypto/des/destest.c b/jni/openssl/crypto/des/destest.c
similarity index 100%
rename from src/main/jni/openssl/crypto/des/destest.c
rename to jni/openssl/crypto/des/destest.c
diff --git a/src/main/jni/openssl/crypto/des/ecb3_enc.c b/jni/openssl/crypto/des/ecb3_enc.c
similarity index 100%
rename from src/main/jni/openssl/crypto/des/ecb3_enc.c
rename to jni/openssl/crypto/des/ecb3_enc.c
diff --git a/src/main/jni/openssl/crypto/des/ecb_enc.c b/jni/openssl/crypto/des/ecb_enc.c
similarity index 100%
rename from src/main/jni/openssl/crypto/des/ecb_enc.c
rename to jni/openssl/crypto/des/ecb_enc.c
diff --git a/src/main/jni/openssl/crypto/des/ede_cbcm_enc.c b/jni/openssl/crypto/des/ede_cbcm_enc.c
similarity index 100%
rename from src/main/jni/openssl/crypto/des/ede_cbcm_enc.c
rename to jni/openssl/crypto/des/ede_cbcm_enc.c
diff --git a/src/main/jni/openssl/crypto/des/enc_read.c b/jni/openssl/crypto/des/enc_read.c
similarity index 100%
rename from src/main/jni/openssl/crypto/des/enc_read.c
rename to jni/openssl/crypto/des/enc_read.c
diff --git a/src/main/jni/openssl/crypto/des/enc_writ.c b/jni/openssl/crypto/des/enc_writ.c
similarity index 100%
rename from src/main/jni/openssl/crypto/des/enc_writ.c
rename to jni/openssl/crypto/des/enc_writ.c
diff --git a/src/main/jni/openssl/crypto/des/fcrypt.c b/jni/openssl/crypto/des/fcrypt.c
similarity index 100%
rename from src/main/jni/openssl/crypto/des/fcrypt.c
rename to jni/openssl/crypto/des/fcrypt.c
diff --git a/src/main/jni/openssl/crypto/des/fcrypt_b.c b/jni/openssl/crypto/des/fcrypt_b.c
similarity index 100%
rename from src/main/jni/openssl/crypto/des/fcrypt_b.c
rename to jni/openssl/crypto/des/fcrypt_b.c
diff --git a/src/main/jni/openssl/crypto/des/makefile.bc b/jni/openssl/crypto/des/makefile.bc
similarity index 100%
rename from src/main/jni/openssl/crypto/des/makefile.bc
rename to jni/openssl/crypto/des/makefile.bc
diff --git a/src/main/jni/openssl/crypto/des/ncbc_enc.c b/jni/openssl/crypto/des/ncbc_enc.c
similarity index 100%
rename from src/main/jni/openssl/crypto/des/ncbc_enc.c
rename to jni/openssl/crypto/des/ncbc_enc.c
diff --git a/src/main/jni/openssl/crypto/des/ofb64ede.c b/jni/openssl/crypto/des/ofb64ede.c
similarity index 100%
rename from src/main/jni/openssl/crypto/des/ofb64ede.c
rename to jni/openssl/crypto/des/ofb64ede.c
diff --git a/src/main/jni/openssl/crypto/des/ofb64enc.c b/jni/openssl/crypto/des/ofb64enc.c
similarity index 100%
rename from src/main/jni/openssl/crypto/des/ofb64enc.c
rename to jni/openssl/crypto/des/ofb64enc.c
diff --git a/src/main/jni/openssl/crypto/des/ofb_enc.c b/jni/openssl/crypto/des/ofb_enc.c
similarity index 100%
rename from src/main/jni/openssl/crypto/des/ofb_enc.c
rename to jni/openssl/crypto/des/ofb_enc.c
diff --git a/src/main/jni/openssl/crypto/des/options.txt b/jni/openssl/crypto/des/options.txt
similarity index 100%
rename from src/main/jni/openssl/crypto/des/options.txt
rename to jni/openssl/crypto/des/options.txt
diff --git a/src/main/jni/openssl/crypto/des/pcbc_enc.c b/jni/openssl/crypto/des/pcbc_enc.c
similarity index 100%
rename from src/main/jni/openssl/crypto/des/pcbc_enc.c
rename to jni/openssl/crypto/des/pcbc_enc.c
diff --git a/src/main/jni/openssl/crypto/des/qud_cksm.c b/jni/openssl/crypto/des/qud_cksm.c
similarity index 100%
rename from src/main/jni/openssl/crypto/des/qud_cksm.c
rename to jni/openssl/crypto/des/qud_cksm.c
diff --git a/src/main/jni/openssl/crypto/des/rand_key.c b/jni/openssl/crypto/des/rand_key.c
similarity index 100%
rename from src/main/jni/openssl/crypto/des/rand_key.c
rename to jni/openssl/crypto/des/rand_key.c
diff --git a/src/main/jni/openssl/crypto/des/read2pwd.c b/jni/openssl/crypto/des/read2pwd.c
similarity index 100%
rename from src/main/jni/openssl/crypto/des/read2pwd.c
rename to jni/openssl/crypto/des/read2pwd.c
diff --git a/src/main/jni/openssl/crypto/des/read_pwd.c b/jni/openssl/crypto/des/read_pwd.c
similarity index 100%
rename from src/main/jni/openssl/crypto/des/read_pwd.c
rename to jni/openssl/crypto/des/read_pwd.c
diff --git a/src/main/jni/openssl/crypto/des/rpc_des.h b/jni/openssl/crypto/des/rpc_des.h
similarity index 100%
rename from src/main/jni/openssl/crypto/des/rpc_des.h
rename to jni/openssl/crypto/des/rpc_des.h
diff --git a/src/main/jni/openssl/crypto/des/rpc_enc.c b/jni/openssl/crypto/des/rpc_enc.c
similarity index 100%
rename from src/main/jni/openssl/crypto/des/rpc_enc.c
rename to jni/openssl/crypto/des/rpc_enc.c
diff --git a/src/main/jni/openssl/crypto/des/rpw.c b/jni/openssl/crypto/des/rpw.c
similarity index 100%
rename from src/main/jni/openssl/crypto/des/rpw.c
rename to jni/openssl/crypto/des/rpw.c
diff --git a/src/main/jni/openssl/crypto/des/set_key.c b/jni/openssl/crypto/des/set_key.c
similarity index 100%
rename from src/main/jni/openssl/crypto/des/set_key.c
rename to jni/openssl/crypto/des/set_key.c
diff --git a/src/main/jni/openssl/crypto/des/speed.c b/jni/openssl/crypto/des/speed.c
similarity index 100%
rename from src/main/jni/openssl/crypto/des/speed.c
rename to jni/openssl/crypto/des/speed.c
diff --git a/src/main/jni/openssl/crypto/des/spr.h b/jni/openssl/crypto/des/spr.h
similarity index 100%
rename from src/main/jni/openssl/crypto/des/spr.h
rename to jni/openssl/crypto/des/spr.h
diff --git a/src/main/jni/openssl/crypto/des/str2key.c b/jni/openssl/crypto/des/str2key.c
similarity index 100%
rename from src/main/jni/openssl/crypto/des/str2key.c
rename to jni/openssl/crypto/des/str2key.c
diff --git a/src/main/jni/openssl/crypto/des/t/test b/jni/openssl/crypto/des/t/test
similarity index 100%
rename from src/main/jni/openssl/crypto/des/t/test
rename to jni/openssl/crypto/des/t/test
diff --git a/src/main/jni/openssl/crypto/des/times/486-50.sol b/jni/openssl/crypto/des/times/486-50.sol
similarity index 100%
rename from src/main/jni/openssl/crypto/des/times/486-50.sol
rename to jni/openssl/crypto/des/times/486-50.sol
diff --git a/src/main/jni/openssl/crypto/des/times/586-100.lnx b/jni/openssl/crypto/des/times/586-100.lnx
similarity index 100%
rename from src/main/jni/openssl/crypto/des/times/586-100.lnx
rename to jni/openssl/crypto/des/times/586-100.lnx
diff --git a/src/main/jni/openssl/crypto/des/times/686-200.fre b/jni/openssl/crypto/des/times/686-200.fre
similarity index 100%
rename from src/main/jni/openssl/crypto/des/times/686-200.fre
rename to jni/openssl/crypto/des/times/686-200.fre
diff --git a/src/main/jni/openssl/crypto/des/times/aix.cc b/jni/openssl/crypto/des/times/aix.cc
similarity index 100%
rename from src/main/jni/openssl/crypto/des/times/aix.cc
rename to jni/openssl/crypto/des/times/aix.cc
diff --git a/src/main/jni/openssl/crypto/des/times/alpha.cc b/jni/openssl/crypto/des/times/alpha.cc
similarity index 100%
rename from src/main/jni/openssl/crypto/des/times/alpha.cc
rename to jni/openssl/crypto/des/times/alpha.cc
diff --git a/src/main/jni/openssl/crypto/des/times/hpux.cc b/jni/openssl/crypto/des/times/hpux.cc
similarity index 100%
rename from src/main/jni/openssl/crypto/des/times/hpux.cc
rename to jni/openssl/crypto/des/times/hpux.cc
diff --git a/src/main/jni/openssl/crypto/des/times/sparc.gcc b/jni/openssl/crypto/des/times/sparc.gcc
similarity index 100%
rename from src/main/jni/openssl/crypto/des/times/sparc.gcc
rename to jni/openssl/crypto/des/times/sparc.gcc
diff --git a/src/main/jni/openssl/crypto/des/times/usparc.cc b/jni/openssl/crypto/des/times/usparc.cc
similarity index 100%
rename from src/main/jni/openssl/crypto/des/times/usparc.cc
rename to jni/openssl/crypto/des/times/usparc.cc
diff --git a/src/main/jni/openssl/crypto/des/typemap b/jni/openssl/crypto/des/typemap
similarity index 100%
rename from src/main/jni/openssl/crypto/des/typemap
rename to jni/openssl/crypto/des/typemap
diff --git a/src/main/jni/openssl/crypto/des/xcbc_enc.c b/jni/openssl/crypto/des/xcbc_enc.c
similarity index 100%
rename from src/main/jni/openssl/crypto/des/xcbc_enc.c
rename to jni/openssl/crypto/des/xcbc_enc.c
diff --git a/src/main/jni/openssl/crypto/dh/Makefile b/jni/openssl/crypto/dh/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/dh/Makefile
rename to jni/openssl/crypto/dh/Makefile
diff --git a/src/main/jni/openssl/crypto/dh/dh.h b/jni/openssl/crypto/dh/dh.h
similarity index 100%
rename from src/main/jni/openssl/crypto/dh/dh.h
rename to jni/openssl/crypto/dh/dh.h
diff --git a/src/main/jni/openssl/crypto/dh/dh1024.pem b/jni/openssl/crypto/dh/dh1024.pem
similarity index 100%
rename from src/main/jni/openssl/crypto/dh/dh1024.pem
rename to jni/openssl/crypto/dh/dh1024.pem
diff --git a/src/main/jni/openssl/crypto/dh/dh192.pem b/jni/openssl/crypto/dh/dh192.pem
similarity index 100%
rename from src/main/jni/openssl/crypto/dh/dh192.pem
rename to jni/openssl/crypto/dh/dh192.pem
diff --git a/src/main/jni/openssl/crypto/dh/dh2048.pem b/jni/openssl/crypto/dh/dh2048.pem
similarity index 100%
rename from src/main/jni/openssl/crypto/dh/dh2048.pem
rename to jni/openssl/crypto/dh/dh2048.pem
diff --git a/src/main/jni/openssl/crypto/dh/dh4096.pem b/jni/openssl/crypto/dh/dh4096.pem
similarity index 100%
rename from src/main/jni/openssl/crypto/dh/dh4096.pem
rename to jni/openssl/crypto/dh/dh4096.pem
diff --git a/src/main/jni/openssl/crypto/dh/dh512.pem b/jni/openssl/crypto/dh/dh512.pem
similarity index 100%
rename from src/main/jni/openssl/crypto/dh/dh512.pem
rename to jni/openssl/crypto/dh/dh512.pem
diff --git a/src/main/jni/openssl/crypto/dh/dh_ameth.c b/jni/openssl/crypto/dh/dh_ameth.c
similarity index 100%
rename from src/main/jni/openssl/crypto/dh/dh_ameth.c
rename to jni/openssl/crypto/dh/dh_ameth.c
diff --git a/src/main/jni/openssl/crypto/dh/dh_asn1.c b/jni/openssl/crypto/dh/dh_asn1.c
similarity index 100%
rename from src/main/jni/openssl/crypto/dh/dh_asn1.c
rename to jni/openssl/crypto/dh/dh_asn1.c
diff --git a/src/main/jni/openssl/crypto/dh/dh_check.c b/jni/openssl/crypto/dh/dh_check.c
similarity index 100%
rename from src/main/jni/openssl/crypto/dh/dh_check.c
rename to jni/openssl/crypto/dh/dh_check.c
diff --git a/src/main/jni/openssl/crypto/dh/dh_depr.c b/jni/openssl/crypto/dh/dh_depr.c
similarity index 100%
rename from src/main/jni/openssl/crypto/dh/dh_depr.c
rename to jni/openssl/crypto/dh/dh_depr.c
diff --git a/src/main/jni/openssl/crypto/dh/dh_err.c b/jni/openssl/crypto/dh/dh_err.c
similarity index 100%
rename from src/main/jni/openssl/crypto/dh/dh_err.c
rename to jni/openssl/crypto/dh/dh_err.c
diff --git a/src/main/jni/openssl/crypto/dh/dh_gen.c b/jni/openssl/crypto/dh/dh_gen.c
similarity index 100%
rename from src/main/jni/openssl/crypto/dh/dh_gen.c
rename to jni/openssl/crypto/dh/dh_gen.c
diff --git a/src/main/jni/openssl/crypto/dh/dh_key.c b/jni/openssl/crypto/dh/dh_key.c
similarity index 100%
rename from src/main/jni/openssl/crypto/dh/dh_key.c
rename to jni/openssl/crypto/dh/dh_key.c
diff --git a/src/main/jni/openssl/crypto/dh/dh_lib.c b/jni/openssl/crypto/dh/dh_lib.c
similarity index 100%
rename from src/main/jni/openssl/crypto/dh/dh_lib.c
rename to jni/openssl/crypto/dh/dh_lib.c
diff --git a/src/main/jni/openssl/crypto/dh/dh_pmeth.c b/jni/openssl/crypto/dh/dh_pmeth.c
similarity index 100%
rename from src/main/jni/openssl/crypto/dh/dh_pmeth.c
rename to jni/openssl/crypto/dh/dh_pmeth.c
diff --git a/src/main/jni/openssl/crypto/dh/dh_prn.c b/jni/openssl/crypto/dh/dh_prn.c
similarity index 100%
rename from src/main/jni/openssl/crypto/dh/dh_prn.c
rename to jni/openssl/crypto/dh/dh_prn.c
diff --git a/src/main/jni/openssl/crypto/dh/dhtest.c b/jni/openssl/crypto/dh/dhtest.c
similarity index 100%
rename from src/main/jni/openssl/crypto/dh/dhtest.c
rename to jni/openssl/crypto/dh/dhtest.c
diff --git a/src/main/jni/openssl/crypto/dh/example b/jni/openssl/crypto/dh/example
similarity index 100%
rename from src/main/jni/openssl/crypto/dh/example
rename to jni/openssl/crypto/dh/example
diff --git a/src/main/jni/openssl/crypto/dh/generate b/jni/openssl/crypto/dh/generate
similarity index 100%
rename from src/main/jni/openssl/crypto/dh/generate
rename to jni/openssl/crypto/dh/generate
diff --git a/src/main/jni/openssl/crypto/dh/p1024.c b/jni/openssl/crypto/dh/p1024.c
similarity index 100%
rename from src/main/jni/openssl/crypto/dh/p1024.c
rename to jni/openssl/crypto/dh/p1024.c
diff --git a/src/main/jni/openssl/crypto/dh/p192.c b/jni/openssl/crypto/dh/p192.c
similarity index 100%
rename from src/main/jni/openssl/crypto/dh/p192.c
rename to jni/openssl/crypto/dh/p192.c
diff --git a/src/main/jni/openssl/crypto/dh/p512.c b/jni/openssl/crypto/dh/p512.c
similarity index 100%
rename from src/main/jni/openssl/crypto/dh/p512.c
rename to jni/openssl/crypto/dh/p512.c
diff --git a/src/main/jni/openssl/crypto/dsa/Makefile b/jni/openssl/crypto/dsa/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/dsa/Makefile
rename to jni/openssl/crypto/dsa/Makefile
diff --git a/src/main/jni/openssl/crypto/dsa/README b/jni/openssl/crypto/dsa/README
similarity index 100%
rename from src/main/jni/openssl/crypto/dsa/README
rename to jni/openssl/crypto/dsa/README
diff --git a/src/main/jni/openssl/crypto/dsa/dsa.h b/jni/openssl/crypto/dsa/dsa.h
similarity index 100%
rename from src/main/jni/openssl/crypto/dsa/dsa.h
rename to jni/openssl/crypto/dsa/dsa.h
diff --git a/src/main/jni/openssl/crypto/dsa/dsa_ameth.c b/jni/openssl/crypto/dsa/dsa_ameth.c
similarity index 100%
rename from src/main/jni/openssl/crypto/dsa/dsa_ameth.c
rename to jni/openssl/crypto/dsa/dsa_ameth.c
diff --git a/src/main/jni/openssl/crypto/dsa/dsa_asn1.c b/jni/openssl/crypto/dsa/dsa_asn1.c
similarity index 100%
rename from src/main/jni/openssl/crypto/dsa/dsa_asn1.c
rename to jni/openssl/crypto/dsa/dsa_asn1.c
diff --git a/src/main/jni/openssl/crypto/dsa/dsa_depr.c b/jni/openssl/crypto/dsa/dsa_depr.c
similarity index 100%
rename from src/main/jni/openssl/crypto/dsa/dsa_depr.c
rename to jni/openssl/crypto/dsa/dsa_depr.c
diff --git a/src/main/jni/openssl/crypto/dsa/dsa_err.c b/jni/openssl/crypto/dsa/dsa_err.c
similarity index 100%
rename from src/main/jni/openssl/crypto/dsa/dsa_err.c
rename to jni/openssl/crypto/dsa/dsa_err.c
diff --git a/src/main/jni/openssl/crypto/dsa/dsa_gen.c b/jni/openssl/crypto/dsa/dsa_gen.c
similarity index 100%
rename from src/main/jni/openssl/crypto/dsa/dsa_gen.c
rename to jni/openssl/crypto/dsa/dsa_gen.c
diff --git a/src/main/jni/openssl/crypto/dsa/dsa_key.c b/jni/openssl/crypto/dsa/dsa_key.c
similarity index 100%
rename from src/main/jni/openssl/crypto/dsa/dsa_key.c
rename to jni/openssl/crypto/dsa/dsa_key.c
diff --git a/src/main/jni/openssl/crypto/dsa/dsa_lib.c b/jni/openssl/crypto/dsa/dsa_lib.c
similarity index 100%
rename from src/main/jni/openssl/crypto/dsa/dsa_lib.c
rename to jni/openssl/crypto/dsa/dsa_lib.c
diff --git a/src/main/jni/openssl/crypto/dsa/dsa_locl.h b/jni/openssl/crypto/dsa/dsa_locl.h
similarity index 100%
rename from src/main/jni/openssl/crypto/dsa/dsa_locl.h
rename to jni/openssl/crypto/dsa/dsa_locl.h
diff --git a/src/main/jni/openssl/crypto/dsa/dsa_ossl.c b/jni/openssl/crypto/dsa/dsa_ossl.c
similarity index 100%
rename from src/main/jni/openssl/crypto/dsa/dsa_ossl.c
rename to jni/openssl/crypto/dsa/dsa_ossl.c
diff --git a/src/main/jni/openssl/crypto/dsa/dsa_pmeth.c b/jni/openssl/crypto/dsa/dsa_pmeth.c
similarity index 100%
rename from src/main/jni/openssl/crypto/dsa/dsa_pmeth.c
rename to jni/openssl/crypto/dsa/dsa_pmeth.c
diff --git a/src/main/jni/openssl/crypto/dsa/dsa_prn.c b/jni/openssl/crypto/dsa/dsa_prn.c
similarity index 100%
rename from src/main/jni/openssl/crypto/dsa/dsa_prn.c
rename to jni/openssl/crypto/dsa/dsa_prn.c
diff --git a/src/main/jni/openssl/crypto/dsa/dsa_sign.c b/jni/openssl/crypto/dsa/dsa_sign.c
similarity index 100%
rename from src/main/jni/openssl/crypto/dsa/dsa_sign.c
rename to jni/openssl/crypto/dsa/dsa_sign.c
diff --git a/src/main/jni/openssl/crypto/dsa/dsa_vrf.c b/jni/openssl/crypto/dsa/dsa_vrf.c
similarity index 100%
rename from src/main/jni/openssl/crypto/dsa/dsa_vrf.c
rename to jni/openssl/crypto/dsa/dsa_vrf.c
diff --git a/src/main/jni/openssl/crypto/dsa/dsagen.c b/jni/openssl/crypto/dsa/dsagen.c
similarity index 100%
rename from src/main/jni/openssl/crypto/dsa/dsagen.c
rename to jni/openssl/crypto/dsa/dsagen.c
diff --git a/src/main/jni/openssl/crypto/dsa/dsatest.c b/jni/openssl/crypto/dsa/dsatest.c
similarity index 100%
rename from src/main/jni/openssl/crypto/dsa/dsatest.c
rename to jni/openssl/crypto/dsa/dsatest.c
diff --git a/src/main/jni/openssl/crypto/dsa/fips186a.txt b/jni/openssl/crypto/dsa/fips186a.txt
similarity index 100%
rename from src/main/jni/openssl/crypto/dsa/fips186a.txt
rename to jni/openssl/crypto/dsa/fips186a.txt
diff --git a/src/main/jni/openssl/crypto/dso/Makefile b/jni/openssl/crypto/dso/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/dso/Makefile
rename to jni/openssl/crypto/dso/Makefile
diff --git a/src/main/jni/openssl/crypto/dso/README b/jni/openssl/crypto/dso/README
similarity index 100%
rename from src/main/jni/openssl/crypto/dso/README
rename to jni/openssl/crypto/dso/README
diff --git a/src/main/jni/openssl/crypto/dso/dso.h b/jni/openssl/crypto/dso/dso.h
similarity index 100%
rename from src/main/jni/openssl/crypto/dso/dso.h
rename to jni/openssl/crypto/dso/dso.h
diff --git a/src/main/jni/openssl/crypto/dso/dso_beos.c b/jni/openssl/crypto/dso/dso_beos.c
similarity index 100%
rename from src/main/jni/openssl/crypto/dso/dso_beos.c
rename to jni/openssl/crypto/dso/dso_beos.c
diff --git a/src/main/jni/openssl/crypto/dso/dso_dl.c b/jni/openssl/crypto/dso/dso_dl.c
similarity index 100%
rename from src/main/jni/openssl/crypto/dso/dso_dl.c
rename to jni/openssl/crypto/dso/dso_dl.c
diff --git a/src/main/jni/openssl/crypto/dso/dso_dlfcn.c b/jni/openssl/crypto/dso/dso_dlfcn.c
similarity index 100%
rename from src/main/jni/openssl/crypto/dso/dso_dlfcn.c
rename to jni/openssl/crypto/dso/dso_dlfcn.c
diff --git a/src/main/jni/openssl/crypto/dso/dso_err.c b/jni/openssl/crypto/dso/dso_err.c
similarity index 100%
rename from src/main/jni/openssl/crypto/dso/dso_err.c
rename to jni/openssl/crypto/dso/dso_err.c
diff --git a/src/main/jni/openssl/crypto/dso/dso_lib.c b/jni/openssl/crypto/dso/dso_lib.c
similarity index 100%
rename from src/main/jni/openssl/crypto/dso/dso_lib.c
rename to jni/openssl/crypto/dso/dso_lib.c
diff --git a/src/main/jni/openssl/crypto/dso/dso_null.c b/jni/openssl/crypto/dso/dso_null.c
similarity index 100%
rename from src/main/jni/openssl/crypto/dso/dso_null.c
rename to jni/openssl/crypto/dso/dso_null.c
diff --git a/src/main/jni/openssl/crypto/dso/dso_openssl.c b/jni/openssl/crypto/dso/dso_openssl.c
similarity index 100%
rename from src/main/jni/openssl/crypto/dso/dso_openssl.c
rename to jni/openssl/crypto/dso/dso_openssl.c
diff --git a/src/main/jni/openssl/crypto/dso/dso_vms.c b/jni/openssl/crypto/dso/dso_vms.c
similarity index 100%
rename from src/main/jni/openssl/crypto/dso/dso_vms.c
rename to jni/openssl/crypto/dso/dso_vms.c
diff --git a/src/main/jni/openssl/crypto/dso/dso_win32.c b/jni/openssl/crypto/dso/dso_win32.c
similarity index 100%
rename from src/main/jni/openssl/crypto/dso/dso_win32.c
rename to jni/openssl/crypto/dso/dso_win32.c
diff --git a/src/main/jni/openssl/crypto/ebcdic.c b/jni/openssl/crypto/ebcdic.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ebcdic.c
rename to jni/openssl/crypto/ebcdic.c
diff --git a/src/main/jni/openssl/crypto/ebcdic.h b/jni/openssl/crypto/ebcdic.h
similarity index 100%
rename from src/main/jni/openssl/crypto/ebcdic.h
rename to jni/openssl/crypto/ebcdic.h
diff --git a/src/main/jni/openssl/crypto/ec/Makefile b/jni/openssl/crypto/ec/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/ec/Makefile
rename to jni/openssl/crypto/ec/Makefile
diff --git a/src/main/jni/openssl/crypto/ec/ec.h b/jni/openssl/crypto/ec/ec.h
similarity index 100%
rename from src/main/jni/openssl/crypto/ec/ec.h
rename to jni/openssl/crypto/ec/ec.h
diff --git a/src/main/jni/openssl/crypto/ec/ec2_mult.c b/jni/openssl/crypto/ec/ec2_mult.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ec/ec2_mult.c
rename to jni/openssl/crypto/ec/ec2_mult.c
diff --git a/src/main/jni/openssl/crypto/ec/ec2_oct.c b/jni/openssl/crypto/ec/ec2_oct.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ec/ec2_oct.c
rename to jni/openssl/crypto/ec/ec2_oct.c
diff --git a/src/main/jni/openssl/crypto/ec/ec2_smpl.c b/jni/openssl/crypto/ec/ec2_smpl.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ec/ec2_smpl.c
rename to jni/openssl/crypto/ec/ec2_smpl.c
diff --git a/src/main/jni/openssl/crypto/ec/ec_ameth.c b/jni/openssl/crypto/ec/ec_ameth.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ec/ec_ameth.c
rename to jni/openssl/crypto/ec/ec_ameth.c
diff --git a/src/main/jni/openssl/crypto/ec/ec_asn1.c b/jni/openssl/crypto/ec/ec_asn1.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ec/ec_asn1.c
rename to jni/openssl/crypto/ec/ec_asn1.c
diff --git a/src/main/jni/openssl/crypto/ec/ec_check.c b/jni/openssl/crypto/ec/ec_check.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ec/ec_check.c
rename to jni/openssl/crypto/ec/ec_check.c
diff --git a/src/main/jni/openssl/crypto/ec/ec_curve.c b/jni/openssl/crypto/ec/ec_curve.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ec/ec_curve.c
rename to jni/openssl/crypto/ec/ec_curve.c
diff --git a/src/main/jni/openssl/crypto/ec/ec_cvt.c b/jni/openssl/crypto/ec/ec_cvt.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ec/ec_cvt.c
rename to jni/openssl/crypto/ec/ec_cvt.c
diff --git a/src/main/jni/openssl/crypto/ec/ec_err.c b/jni/openssl/crypto/ec/ec_err.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ec/ec_err.c
rename to jni/openssl/crypto/ec/ec_err.c
diff --git a/src/main/jni/openssl/crypto/ec/ec_key.c b/jni/openssl/crypto/ec/ec_key.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ec/ec_key.c
rename to jni/openssl/crypto/ec/ec_key.c
diff --git a/src/main/jni/openssl/crypto/ec/ec_lcl.h b/jni/openssl/crypto/ec/ec_lcl.h
similarity index 100%
rename from src/main/jni/openssl/crypto/ec/ec_lcl.h
rename to jni/openssl/crypto/ec/ec_lcl.h
diff --git a/src/main/jni/openssl/crypto/ec/ec_lib.c b/jni/openssl/crypto/ec/ec_lib.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ec/ec_lib.c
rename to jni/openssl/crypto/ec/ec_lib.c
diff --git a/src/main/jni/openssl/crypto/ec/ec_mult.c b/jni/openssl/crypto/ec/ec_mult.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ec/ec_mult.c
rename to jni/openssl/crypto/ec/ec_mult.c
diff --git a/src/main/jni/openssl/crypto/ec/ec_oct.c b/jni/openssl/crypto/ec/ec_oct.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ec/ec_oct.c
rename to jni/openssl/crypto/ec/ec_oct.c
diff --git a/src/main/jni/openssl/crypto/ec/ec_pmeth.c b/jni/openssl/crypto/ec/ec_pmeth.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ec/ec_pmeth.c
rename to jni/openssl/crypto/ec/ec_pmeth.c
diff --git a/src/main/jni/openssl/crypto/ec/ec_print.c b/jni/openssl/crypto/ec/ec_print.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ec/ec_print.c
rename to jni/openssl/crypto/ec/ec_print.c
diff --git a/src/main/jni/openssl/crypto/ec/eck_prn.c b/jni/openssl/crypto/ec/eck_prn.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ec/eck_prn.c
rename to jni/openssl/crypto/ec/eck_prn.c
diff --git a/src/main/jni/openssl/crypto/ec/ecp_mont.c b/jni/openssl/crypto/ec/ecp_mont.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ec/ecp_mont.c
rename to jni/openssl/crypto/ec/ecp_mont.c
diff --git a/src/main/jni/openssl/crypto/ec/ecp_nist.c b/jni/openssl/crypto/ec/ecp_nist.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ec/ecp_nist.c
rename to jni/openssl/crypto/ec/ecp_nist.c
diff --git a/src/main/jni/openssl/crypto/ec/ecp_nistp224.c b/jni/openssl/crypto/ec/ecp_nistp224.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ec/ecp_nistp224.c
rename to jni/openssl/crypto/ec/ecp_nistp224.c
diff --git a/src/main/jni/openssl/crypto/ec/ecp_nistp256.c b/jni/openssl/crypto/ec/ecp_nistp256.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ec/ecp_nistp256.c
rename to jni/openssl/crypto/ec/ecp_nistp256.c
diff --git a/src/main/jni/openssl/crypto/ec/ecp_nistp521.c b/jni/openssl/crypto/ec/ecp_nistp521.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ec/ecp_nistp521.c
rename to jni/openssl/crypto/ec/ecp_nistp521.c
diff --git a/src/main/jni/openssl/crypto/ec/ecp_nistputil.c b/jni/openssl/crypto/ec/ecp_nistputil.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ec/ecp_nistputil.c
rename to jni/openssl/crypto/ec/ecp_nistputil.c
diff --git a/src/main/jni/openssl/crypto/ec/ecp_oct.c b/jni/openssl/crypto/ec/ecp_oct.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ec/ecp_oct.c
rename to jni/openssl/crypto/ec/ecp_oct.c
diff --git a/src/main/jni/openssl/crypto/ec/ecp_smpl.c b/jni/openssl/crypto/ec/ecp_smpl.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ec/ecp_smpl.c
rename to jni/openssl/crypto/ec/ecp_smpl.c
diff --git a/src/main/jni/openssl/crypto/ec/ectest.c b/jni/openssl/crypto/ec/ectest.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ec/ectest.c
rename to jni/openssl/crypto/ec/ectest.c
diff --git a/src/main/jni/openssl/crypto/ecdh/Makefile b/jni/openssl/crypto/ecdh/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/ecdh/Makefile
rename to jni/openssl/crypto/ecdh/Makefile
diff --git a/src/main/jni/openssl/crypto/ecdh/ecdh.h b/jni/openssl/crypto/ecdh/ecdh.h
similarity index 100%
rename from src/main/jni/openssl/crypto/ecdh/ecdh.h
rename to jni/openssl/crypto/ecdh/ecdh.h
diff --git a/src/main/jni/openssl/crypto/ecdh/ecdhtest.c b/jni/openssl/crypto/ecdh/ecdhtest.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ecdh/ecdhtest.c
rename to jni/openssl/crypto/ecdh/ecdhtest.c
diff --git a/src/main/jni/openssl/crypto/ecdh/ech_err.c b/jni/openssl/crypto/ecdh/ech_err.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ecdh/ech_err.c
rename to jni/openssl/crypto/ecdh/ech_err.c
diff --git a/src/main/jni/openssl/crypto/ecdh/ech_key.c b/jni/openssl/crypto/ecdh/ech_key.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ecdh/ech_key.c
rename to jni/openssl/crypto/ecdh/ech_key.c
diff --git a/src/main/jni/openssl/crypto/ecdh/ech_lib.c b/jni/openssl/crypto/ecdh/ech_lib.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ecdh/ech_lib.c
rename to jni/openssl/crypto/ecdh/ech_lib.c
diff --git a/src/main/jni/openssl/crypto/ecdh/ech_locl.h b/jni/openssl/crypto/ecdh/ech_locl.h
similarity index 100%
rename from src/main/jni/openssl/crypto/ecdh/ech_locl.h
rename to jni/openssl/crypto/ecdh/ech_locl.h
diff --git a/src/main/jni/openssl/crypto/ecdh/ech_ossl.c b/jni/openssl/crypto/ecdh/ech_ossl.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ecdh/ech_ossl.c
rename to jni/openssl/crypto/ecdh/ech_ossl.c
diff --git a/src/main/jni/openssl/crypto/ecdsa/Makefile b/jni/openssl/crypto/ecdsa/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/ecdsa/Makefile
rename to jni/openssl/crypto/ecdsa/Makefile
diff --git a/src/main/jni/openssl/crypto/ecdsa/ecdsa.h b/jni/openssl/crypto/ecdsa/ecdsa.h
similarity index 100%
rename from src/main/jni/openssl/crypto/ecdsa/ecdsa.h
rename to jni/openssl/crypto/ecdsa/ecdsa.h
diff --git a/src/main/jni/openssl/crypto/ecdsa/ecdsatest.c b/jni/openssl/crypto/ecdsa/ecdsatest.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ecdsa/ecdsatest.c
rename to jni/openssl/crypto/ecdsa/ecdsatest.c
diff --git a/src/main/jni/openssl/crypto/ecdsa/ecs_asn1.c b/jni/openssl/crypto/ecdsa/ecs_asn1.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ecdsa/ecs_asn1.c
rename to jni/openssl/crypto/ecdsa/ecs_asn1.c
diff --git a/src/main/jni/openssl/crypto/ecdsa/ecs_err.c b/jni/openssl/crypto/ecdsa/ecs_err.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ecdsa/ecs_err.c
rename to jni/openssl/crypto/ecdsa/ecs_err.c
diff --git a/src/main/jni/openssl/crypto/ecdsa/ecs_lib.c b/jni/openssl/crypto/ecdsa/ecs_lib.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ecdsa/ecs_lib.c
rename to jni/openssl/crypto/ecdsa/ecs_lib.c
diff --git a/src/main/jni/openssl/crypto/ecdsa/ecs_locl.h b/jni/openssl/crypto/ecdsa/ecs_locl.h
similarity index 100%
rename from src/main/jni/openssl/crypto/ecdsa/ecs_locl.h
rename to jni/openssl/crypto/ecdsa/ecs_locl.h
diff --git a/src/main/jni/openssl/crypto/ecdsa/ecs_ossl.c b/jni/openssl/crypto/ecdsa/ecs_ossl.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ecdsa/ecs_ossl.c
rename to jni/openssl/crypto/ecdsa/ecs_ossl.c
diff --git a/src/main/jni/openssl/crypto/ecdsa/ecs_sign.c b/jni/openssl/crypto/ecdsa/ecs_sign.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ecdsa/ecs_sign.c
rename to jni/openssl/crypto/ecdsa/ecs_sign.c
diff --git a/src/main/jni/openssl/crypto/ecdsa/ecs_vrf.c b/jni/openssl/crypto/ecdsa/ecs_vrf.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ecdsa/ecs_vrf.c
rename to jni/openssl/crypto/ecdsa/ecs_vrf.c
diff --git a/src/main/jni/openssl/crypto/engine/Makefile b/jni/openssl/crypto/engine/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/engine/Makefile
rename to jni/openssl/crypto/engine/Makefile
diff --git a/src/main/jni/openssl/crypto/engine/README b/jni/openssl/crypto/engine/README
similarity index 100%
rename from src/main/jni/openssl/crypto/engine/README
rename to jni/openssl/crypto/engine/README
diff --git a/src/main/jni/openssl/crypto/engine/eng_all.c b/jni/openssl/crypto/engine/eng_all.c
similarity index 100%
rename from src/main/jni/openssl/crypto/engine/eng_all.c
rename to jni/openssl/crypto/engine/eng_all.c
diff --git a/src/main/jni/openssl/crypto/engine/eng_cnf.c b/jni/openssl/crypto/engine/eng_cnf.c
similarity index 100%
rename from src/main/jni/openssl/crypto/engine/eng_cnf.c
rename to jni/openssl/crypto/engine/eng_cnf.c
diff --git a/src/main/jni/openssl/crypto/engine/eng_cryptodev.c b/jni/openssl/crypto/engine/eng_cryptodev.c
similarity index 100%
rename from src/main/jni/openssl/crypto/engine/eng_cryptodev.c
rename to jni/openssl/crypto/engine/eng_cryptodev.c
diff --git a/src/main/jni/openssl/crypto/engine/eng_ctrl.c b/jni/openssl/crypto/engine/eng_ctrl.c
similarity index 100%
rename from src/main/jni/openssl/crypto/engine/eng_ctrl.c
rename to jni/openssl/crypto/engine/eng_ctrl.c
diff --git a/src/main/jni/openssl/crypto/engine/eng_dyn.c b/jni/openssl/crypto/engine/eng_dyn.c
similarity index 100%
rename from src/main/jni/openssl/crypto/engine/eng_dyn.c
rename to jni/openssl/crypto/engine/eng_dyn.c
diff --git a/src/main/jni/openssl/crypto/engine/eng_err.c b/jni/openssl/crypto/engine/eng_err.c
similarity index 100%
rename from src/main/jni/openssl/crypto/engine/eng_err.c
rename to jni/openssl/crypto/engine/eng_err.c
diff --git a/src/main/jni/openssl/crypto/engine/eng_fat.c b/jni/openssl/crypto/engine/eng_fat.c
similarity index 100%
rename from src/main/jni/openssl/crypto/engine/eng_fat.c
rename to jni/openssl/crypto/engine/eng_fat.c
diff --git a/src/main/jni/openssl/crypto/engine/eng_init.c b/jni/openssl/crypto/engine/eng_init.c
similarity index 100%
rename from src/main/jni/openssl/crypto/engine/eng_init.c
rename to jni/openssl/crypto/engine/eng_init.c
diff --git a/src/main/jni/openssl/crypto/engine/eng_int.h b/jni/openssl/crypto/engine/eng_int.h
similarity index 100%
rename from src/main/jni/openssl/crypto/engine/eng_int.h
rename to jni/openssl/crypto/engine/eng_int.h
diff --git a/src/main/jni/openssl/crypto/engine/eng_lib.c b/jni/openssl/crypto/engine/eng_lib.c
similarity index 100%
rename from src/main/jni/openssl/crypto/engine/eng_lib.c
rename to jni/openssl/crypto/engine/eng_lib.c
diff --git a/src/main/jni/openssl/crypto/engine/eng_list.c b/jni/openssl/crypto/engine/eng_list.c
similarity index 100%
rename from src/main/jni/openssl/crypto/engine/eng_list.c
rename to jni/openssl/crypto/engine/eng_list.c
diff --git a/src/main/jni/openssl/crypto/engine/eng_openssl.c b/jni/openssl/crypto/engine/eng_openssl.c
similarity index 100%
rename from src/main/jni/openssl/crypto/engine/eng_openssl.c
rename to jni/openssl/crypto/engine/eng_openssl.c
diff --git a/src/main/jni/openssl/crypto/engine/eng_pkey.c b/jni/openssl/crypto/engine/eng_pkey.c
similarity index 100%
rename from src/main/jni/openssl/crypto/engine/eng_pkey.c
rename to jni/openssl/crypto/engine/eng_pkey.c
diff --git a/src/main/jni/openssl/crypto/engine/eng_rdrand.c b/jni/openssl/crypto/engine/eng_rdrand.c
similarity index 100%
rename from src/main/jni/openssl/crypto/engine/eng_rdrand.c
rename to jni/openssl/crypto/engine/eng_rdrand.c
diff --git a/src/main/jni/openssl/crypto/engine/eng_rsax.c b/jni/openssl/crypto/engine/eng_rsax.c
similarity index 100%
rename from src/main/jni/openssl/crypto/engine/eng_rsax.c
rename to jni/openssl/crypto/engine/eng_rsax.c
diff --git a/src/main/jni/openssl/crypto/engine/eng_table.c b/jni/openssl/crypto/engine/eng_table.c
similarity index 100%
rename from src/main/jni/openssl/crypto/engine/eng_table.c
rename to jni/openssl/crypto/engine/eng_table.c
diff --git a/src/main/jni/openssl/crypto/engine/engine.h b/jni/openssl/crypto/engine/engine.h
similarity index 100%
rename from src/main/jni/openssl/crypto/engine/engine.h
rename to jni/openssl/crypto/engine/engine.h
diff --git a/src/main/jni/openssl/crypto/engine/enginetest.c b/jni/openssl/crypto/engine/enginetest.c
similarity index 100%
rename from src/main/jni/openssl/crypto/engine/enginetest.c
rename to jni/openssl/crypto/engine/enginetest.c
diff --git a/src/main/jni/openssl/crypto/engine/tb_asnmth.c b/jni/openssl/crypto/engine/tb_asnmth.c
similarity index 100%
rename from src/main/jni/openssl/crypto/engine/tb_asnmth.c
rename to jni/openssl/crypto/engine/tb_asnmth.c
diff --git a/src/main/jni/openssl/crypto/engine/tb_cipher.c b/jni/openssl/crypto/engine/tb_cipher.c
similarity index 100%
rename from src/main/jni/openssl/crypto/engine/tb_cipher.c
rename to jni/openssl/crypto/engine/tb_cipher.c
diff --git a/src/main/jni/openssl/crypto/engine/tb_dh.c b/jni/openssl/crypto/engine/tb_dh.c
similarity index 100%
rename from src/main/jni/openssl/crypto/engine/tb_dh.c
rename to jni/openssl/crypto/engine/tb_dh.c
diff --git a/src/main/jni/openssl/crypto/engine/tb_digest.c b/jni/openssl/crypto/engine/tb_digest.c
similarity index 100%
rename from src/main/jni/openssl/crypto/engine/tb_digest.c
rename to jni/openssl/crypto/engine/tb_digest.c
diff --git a/src/main/jni/openssl/crypto/engine/tb_dsa.c b/jni/openssl/crypto/engine/tb_dsa.c
similarity index 100%
rename from src/main/jni/openssl/crypto/engine/tb_dsa.c
rename to jni/openssl/crypto/engine/tb_dsa.c
diff --git a/src/main/jni/openssl/crypto/engine/tb_ecdh.c b/jni/openssl/crypto/engine/tb_ecdh.c
similarity index 100%
rename from src/main/jni/openssl/crypto/engine/tb_ecdh.c
rename to jni/openssl/crypto/engine/tb_ecdh.c
diff --git a/src/main/jni/openssl/crypto/engine/tb_ecdsa.c b/jni/openssl/crypto/engine/tb_ecdsa.c
similarity index 100%
rename from src/main/jni/openssl/crypto/engine/tb_ecdsa.c
rename to jni/openssl/crypto/engine/tb_ecdsa.c
diff --git a/src/main/jni/openssl/crypto/engine/tb_pkmeth.c b/jni/openssl/crypto/engine/tb_pkmeth.c
similarity index 100%
rename from src/main/jni/openssl/crypto/engine/tb_pkmeth.c
rename to jni/openssl/crypto/engine/tb_pkmeth.c
diff --git a/src/main/jni/openssl/crypto/engine/tb_rand.c b/jni/openssl/crypto/engine/tb_rand.c
similarity index 100%
rename from src/main/jni/openssl/crypto/engine/tb_rand.c
rename to jni/openssl/crypto/engine/tb_rand.c
diff --git a/src/main/jni/openssl/crypto/engine/tb_rsa.c b/jni/openssl/crypto/engine/tb_rsa.c
similarity index 100%
rename from src/main/jni/openssl/crypto/engine/tb_rsa.c
rename to jni/openssl/crypto/engine/tb_rsa.c
diff --git a/src/main/jni/openssl/crypto/engine/tb_store.c b/jni/openssl/crypto/engine/tb_store.c
similarity index 100%
rename from src/main/jni/openssl/crypto/engine/tb_store.c
rename to jni/openssl/crypto/engine/tb_store.c
diff --git a/src/main/jni/openssl/crypto/err/Makefile b/jni/openssl/crypto/err/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/err/Makefile
rename to jni/openssl/crypto/err/Makefile
diff --git a/src/main/jni/openssl/crypto/err/err.c b/jni/openssl/crypto/err/err.c
similarity index 100%
rename from src/main/jni/openssl/crypto/err/err.c
rename to jni/openssl/crypto/err/err.c
diff --git a/src/main/jni/openssl/crypto/err/err.h b/jni/openssl/crypto/err/err.h
similarity index 100%
rename from src/main/jni/openssl/crypto/err/err.h
rename to jni/openssl/crypto/err/err.h
diff --git a/src/main/jni/openssl/crypto/err/err_all.c b/jni/openssl/crypto/err/err_all.c
similarity index 100%
rename from src/main/jni/openssl/crypto/err/err_all.c
rename to jni/openssl/crypto/err/err_all.c
diff --git a/src/main/jni/openssl/crypto/err/err_prn.c b/jni/openssl/crypto/err/err_prn.c
similarity index 100%
rename from src/main/jni/openssl/crypto/err/err_prn.c
rename to jni/openssl/crypto/err/err_prn.c
diff --git a/src/main/jni/openssl/crypto/err/openssl.ec b/jni/openssl/crypto/err/openssl.ec
similarity index 100%
rename from src/main/jni/openssl/crypto/err/openssl.ec
rename to jni/openssl/crypto/err/openssl.ec
diff --git a/src/main/jni/openssl/crypto/evp/Makefile b/jni/openssl/crypto/evp/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/Makefile
rename to jni/openssl/crypto/evp/Makefile
diff --git a/src/main/jni/openssl/crypto/evp/bio_b64.c b/jni/openssl/crypto/evp/bio_b64.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/bio_b64.c
rename to jni/openssl/crypto/evp/bio_b64.c
diff --git a/src/main/jni/openssl/crypto/evp/bio_enc.c b/jni/openssl/crypto/evp/bio_enc.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/bio_enc.c
rename to jni/openssl/crypto/evp/bio_enc.c
diff --git a/src/main/jni/openssl/crypto/evp/bio_md.c b/jni/openssl/crypto/evp/bio_md.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/bio_md.c
rename to jni/openssl/crypto/evp/bio_md.c
diff --git a/src/main/jni/openssl/crypto/evp/bio_ok.c b/jni/openssl/crypto/evp/bio_ok.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/bio_ok.c
rename to jni/openssl/crypto/evp/bio_ok.c
diff --git a/src/main/jni/openssl/crypto/evp/c_all.c b/jni/openssl/crypto/evp/c_all.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/c_all.c
rename to jni/openssl/crypto/evp/c_all.c
diff --git a/src/main/jni/openssl/crypto/evp/c_allc.c b/jni/openssl/crypto/evp/c_allc.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/c_allc.c
rename to jni/openssl/crypto/evp/c_allc.c
diff --git a/src/main/jni/openssl/crypto/evp/c_alld.c b/jni/openssl/crypto/evp/c_alld.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/c_alld.c
rename to jni/openssl/crypto/evp/c_alld.c
diff --git a/src/main/jni/openssl/crypto/evp/digest.c b/jni/openssl/crypto/evp/digest.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/digest.c
rename to jni/openssl/crypto/evp/digest.c
diff --git a/src/main/jni/openssl/crypto/evp/e_aes.c b/jni/openssl/crypto/evp/e_aes.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/e_aes.c
rename to jni/openssl/crypto/evp/e_aes.c
diff --git a/src/main/jni/openssl/crypto/evp/e_aes_cbc_hmac_sha1.c b/jni/openssl/crypto/evp/e_aes_cbc_hmac_sha1.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/e_aes_cbc_hmac_sha1.c
rename to jni/openssl/crypto/evp/e_aes_cbc_hmac_sha1.c
diff --git a/src/main/jni/openssl/crypto/evp/e_bf.c b/jni/openssl/crypto/evp/e_bf.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/e_bf.c
rename to jni/openssl/crypto/evp/e_bf.c
diff --git a/src/main/jni/openssl/crypto/evp/e_camellia.c b/jni/openssl/crypto/evp/e_camellia.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/e_camellia.c
rename to jni/openssl/crypto/evp/e_camellia.c
diff --git a/src/main/jni/openssl/crypto/evp/e_cast.c b/jni/openssl/crypto/evp/e_cast.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/e_cast.c
rename to jni/openssl/crypto/evp/e_cast.c
diff --git a/src/main/jni/openssl/crypto/evp/e_des.c b/jni/openssl/crypto/evp/e_des.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/e_des.c
rename to jni/openssl/crypto/evp/e_des.c
diff --git a/src/main/jni/openssl/crypto/evp/e_des3.c b/jni/openssl/crypto/evp/e_des3.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/e_des3.c
rename to jni/openssl/crypto/evp/e_des3.c
diff --git a/src/main/jni/openssl/crypto/evp/e_dsa.c b/jni/openssl/crypto/evp/e_dsa.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/e_dsa.c
rename to jni/openssl/crypto/evp/e_dsa.c
diff --git a/src/main/jni/openssl/crypto/evp/e_idea.c b/jni/openssl/crypto/evp/e_idea.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/e_idea.c
rename to jni/openssl/crypto/evp/e_idea.c
diff --git a/src/main/jni/openssl/crypto/evp/e_null.c b/jni/openssl/crypto/evp/e_null.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/e_null.c
rename to jni/openssl/crypto/evp/e_null.c
diff --git a/src/main/jni/openssl/crypto/evp/e_old.c b/jni/openssl/crypto/evp/e_old.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/e_old.c
rename to jni/openssl/crypto/evp/e_old.c
diff --git a/src/main/jni/openssl/crypto/evp/e_rc2.c b/jni/openssl/crypto/evp/e_rc2.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/e_rc2.c
rename to jni/openssl/crypto/evp/e_rc2.c
diff --git a/src/main/jni/openssl/crypto/evp/e_rc4.c b/jni/openssl/crypto/evp/e_rc4.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/e_rc4.c
rename to jni/openssl/crypto/evp/e_rc4.c
diff --git a/src/main/jni/openssl/crypto/evp/e_rc4_hmac_md5.c b/jni/openssl/crypto/evp/e_rc4_hmac_md5.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/e_rc4_hmac_md5.c
rename to jni/openssl/crypto/evp/e_rc4_hmac_md5.c
diff --git a/src/main/jni/openssl/crypto/evp/e_rc5.c b/jni/openssl/crypto/evp/e_rc5.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/e_rc5.c
rename to jni/openssl/crypto/evp/e_rc5.c
diff --git a/src/main/jni/openssl/crypto/evp/e_seed.c b/jni/openssl/crypto/evp/e_seed.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/e_seed.c
rename to jni/openssl/crypto/evp/e_seed.c
diff --git a/src/main/jni/openssl/crypto/evp/e_xcbc_d.c b/jni/openssl/crypto/evp/e_xcbc_d.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/e_xcbc_d.c
rename to jni/openssl/crypto/evp/e_xcbc_d.c
diff --git a/src/main/jni/openssl/crypto/evp/encode.c b/jni/openssl/crypto/evp/encode.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/encode.c
rename to jni/openssl/crypto/evp/encode.c
diff --git a/src/main/jni/openssl/crypto/evp/evp.h b/jni/openssl/crypto/evp/evp.h
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/evp.h
rename to jni/openssl/crypto/evp/evp.h
diff --git a/src/main/jni/openssl/crypto/evp/evp_acnf.c b/jni/openssl/crypto/evp/evp_acnf.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/evp_acnf.c
rename to jni/openssl/crypto/evp/evp_acnf.c
diff --git a/src/main/jni/openssl/crypto/evp/evp_enc.c b/jni/openssl/crypto/evp/evp_enc.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/evp_enc.c
rename to jni/openssl/crypto/evp/evp_enc.c
diff --git a/src/main/jni/openssl/crypto/evp/evp_err.c b/jni/openssl/crypto/evp/evp_err.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/evp_err.c
rename to jni/openssl/crypto/evp/evp_err.c
diff --git a/src/main/jni/openssl/crypto/evp/evp_fips.c b/jni/openssl/crypto/evp/evp_fips.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/evp_fips.c
rename to jni/openssl/crypto/evp/evp_fips.c
diff --git a/src/main/jni/openssl/crypto/evp/evp_key.c b/jni/openssl/crypto/evp/evp_key.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/evp_key.c
rename to jni/openssl/crypto/evp/evp_key.c
diff --git a/src/main/jni/openssl/crypto/evp/evp_lib.c b/jni/openssl/crypto/evp/evp_lib.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/evp_lib.c
rename to jni/openssl/crypto/evp/evp_lib.c
diff --git a/src/main/jni/openssl/crypto/evp/evp_locl.h b/jni/openssl/crypto/evp/evp_locl.h
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/evp_locl.h
rename to jni/openssl/crypto/evp/evp_locl.h
diff --git a/src/main/jni/openssl/crypto/evp/evp_pbe.c b/jni/openssl/crypto/evp/evp_pbe.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/evp_pbe.c
rename to jni/openssl/crypto/evp/evp_pbe.c
diff --git a/src/main/jni/openssl/crypto/evp/evp_pkey.c b/jni/openssl/crypto/evp/evp_pkey.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/evp_pkey.c
rename to jni/openssl/crypto/evp/evp_pkey.c
diff --git a/src/main/jni/openssl/crypto/evp/evp_test.c b/jni/openssl/crypto/evp/evp_test.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/evp_test.c
rename to jni/openssl/crypto/evp/evp_test.c
diff --git a/src/main/jni/openssl/crypto/evp/evptests.txt b/jni/openssl/crypto/evp/evptests.txt
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/evptests.txt
rename to jni/openssl/crypto/evp/evptests.txt
diff --git a/src/main/jni/openssl/crypto/evp/m_dss.c b/jni/openssl/crypto/evp/m_dss.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/m_dss.c
rename to jni/openssl/crypto/evp/m_dss.c
diff --git a/src/main/jni/openssl/crypto/evp/m_dss1.c b/jni/openssl/crypto/evp/m_dss1.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/m_dss1.c
rename to jni/openssl/crypto/evp/m_dss1.c
diff --git a/src/main/jni/openssl/crypto/evp/m_ecdsa.c b/jni/openssl/crypto/evp/m_ecdsa.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/m_ecdsa.c
rename to jni/openssl/crypto/evp/m_ecdsa.c
diff --git a/src/main/jni/openssl/crypto/evp/m_md2.c b/jni/openssl/crypto/evp/m_md2.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/m_md2.c
rename to jni/openssl/crypto/evp/m_md2.c
diff --git a/src/main/jni/openssl/crypto/evp/m_md4.c b/jni/openssl/crypto/evp/m_md4.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/m_md4.c
rename to jni/openssl/crypto/evp/m_md4.c
diff --git a/src/main/jni/openssl/crypto/evp/m_md5.c b/jni/openssl/crypto/evp/m_md5.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/m_md5.c
rename to jni/openssl/crypto/evp/m_md5.c
diff --git a/src/main/jni/openssl/crypto/evp/m_mdc2.c b/jni/openssl/crypto/evp/m_mdc2.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/m_mdc2.c
rename to jni/openssl/crypto/evp/m_mdc2.c
diff --git a/src/main/jni/openssl/crypto/evp/m_null.c b/jni/openssl/crypto/evp/m_null.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/m_null.c
rename to jni/openssl/crypto/evp/m_null.c
diff --git a/src/main/jni/openssl/crypto/evp/m_ripemd.c b/jni/openssl/crypto/evp/m_ripemd.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/m_ripemd.c
rename to jni/openssl/crypto/evp/m_ripemd.c
diff --git a/src/main/jni/openssl/crypto/evp/m_sha.c b/jni/openssl/crypto/evp/m_sha.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/m_sha.c
rename to jni/openssl/crypto/evp/m_sha.c
diff --git a/src/main/jni/openssl/crypto/evp/m_sha1.c b/jni/openssl/crypto/evp/m_sha1.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/m_sha1.c
rename to jni/openssl/crypto/evp/m_sha1.c
diff --git a/src/main/jni/openssl/crypto/evp/m_sigver.c b/jni/openssl/crypto/evp/m_sigver.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/m_sigver.c
rename to jni/openssl/crypto/evp/m_sigver.c
diff --git a/src/main/jni/openssl/crypto/evp/m_wp.c b/jni/openssl/crypto/evp/m_wp.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/m_wp.c
rename to jni/openssl/crypto/evp/m_wp.c
diff --git a/src/main/jni/openssl/crypto/evp/names.c b/jni/openssl/crypto/evp/names.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/names.c
rename to jni/openssl/crypto/evp/names.c
diff --git a/src/main/jni/openssl/crypto/evp/openbsd_hw.c b/jni/openssl/crypto/evp/openbsd_hw.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/openbsd_hw.c
rename to jni/openssl/crypto/evp/openbsd_hw.c
diff --git a/src/main/jni/openssl/crypto/evp/p5_crpt.c b/jni/openssl/crypto/evp/p5_crpt.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/p5_crpt.c
rename to jni/openssl/crypto/evp/p5_crpt.c
diff --git a/src/main/jni/openssl/crypto/evp/p5_crpt2.c b/jni/openssl/crypto/evp/p5_crpt2.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/p5_crpt2.c
rename to jni/openssl/crypto/evp/p5_crpt2.c
diff --git a/src/main/jni/openssl/crypto/evp/p_dec.c b/jni/openssl/crypto/evp/p_dec.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/p_dec.c
rename to jni/openssl/crypto/evp/p_dec.c
diff --git a/src/main/jni/openssl/crypto/evp/p_enc.c b/jni/openssl/crypto/evp/p_enc.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/p_enc.c
rename to jni/openssl/crypto/evp/p_enc.c
diff --git a/src/main/jni/openssl/crypto/evp/p_lib.c b/jni/openssl/crypto/evp/p_lib.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/p_lib.c
rename to jni/openssl/crypto/evp/p_lib.c
diff --git a/src/main/jni/openssl/crypto/evp/p_open.c b/jni/openssl/crypto/evp/p_open.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/p_open.c
rename to jni/openssl/crypto/evp/p_open.c
diff --git a/src/main/jni/openssl/crypto/evp/p_seal.c b/jni/openssl/crypto/evp/p_seal.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/p_seal.c
rename to jni/openssl/crypto/evp/p_seal.c
diff --git a/src/main/jni/openssl/crypto/evp/p_sign.c b/jni/openssl/crypto/evp/p_sign.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/p_sign.c
rename to jni/openssl/crypto/evp/p_sign.c
diff --git a/src/main/jni/openssl/crypto/evp/p_verify.c b/jni/openssl/crypto/evp/p_verify.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/p_verify.c
rename to jni/openssl/crypto/evp/p_verify.c
diff --git a/src/main/jni/openssl/crypto/evp/pmeth_fn.c b/jni/openssl/crypto/evp/pmeth_fn.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/pmeth_fn.c
rename to jni/openssl/crypto/evp/pmeth_fn.c
diff --git a/src/main/jni/openssl/crypto/evp/pmeth_gn.c b/jni/openssl/crypto/evp/pmeth_gn.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/pmeth_gn.c
rename to jni/openssl/crypto/evp/pmeth_gn.c
diff --git a/src/main/jni/openssl/crypto/evp/pmeth_lib.c b/jni/openssl/crypto/evp/pmeth_lib.c
similarity index 100%
rename from src/main/jni/openssl/crypto/evp/pmeth_lib.c
rename to jni/openssl/crypto/evp/pmeth_lib.c
diff --git a/src/main/jni/openssl/crypto/ex_data.c b/jni/openssl/crypto/ex_data.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ex_data.c
rename to jni/openssl/crypto/ex_data.c
diff --git a/src/main/jni/openssl/crypto/fips_err.h b/jni/openssl/crypto/fips_err.h
similarity index 100%
rename from src/main/jni/openssl/crypto/fips_err.h
rename to jni/openssl/crypto/fips_err.h
diff --git a/src/main/jni/openssl/crypto/fips_ers.c b/jni/openssl/crypto/fips_ers.c
similarity index 100%
rename from src/main/jni/openssl/crypto/fips_ers.c
rename to jni/openssl/crypto/fips_ers.c
diff --git a/src/main/jni/openssl/crypto/hmac/Makefile b/jni/openssl/crypto/hmac/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/hmac/Makefile
rename to jni/openssl/crypto/hmac/Makefile
diff --git a/src/main/jni/openssl/crypto/hmac/hm_ameth.c b/jni/openssl/crypto/hmac/hm_ameth.c
similarity index 100%
rename from src/main/jni/openssl/crypto/hmac/hm_ameth.c
rename to jni/openssl/crypto/hmac/hm_ameth.c
diff --git a/src/main/jni/openssl/crypto/hmac/hm_pmeth.c b/jni/openssl/crypto/hmac/hm_pmeth.c
similarity index 100%
rename from src/main/jni/openssl/crypto/hmac/hm_pmeth.c
rename to jni/openssl/crypto/hmac/hm_pmeth.c
diff --git a/src/main/jni/openssl/crypto/hmac/hmac.c b/jni/openssl/crypto/hmac/hmac.c
similarity index 100%
rename from src/main/jni/openssl/crypto/hmac/hmac.c
rename to jni/openssl/crypto/hmac/hmac.c
diff --git a/src/main/jni/openssl/crypto/hmac/hmac.h b/jni/openssl/crypto/hmac/hmac.h
similarity index 100%
rename from src/main/jni/openssl/crypto/hmac/hmac.h
rename to jni/openssl/crypto/hmac/hmac.h
diff --git a/src/main/jni/openssl/crypto/hmac/hmactest.c b/jni/openssl/crypto/hmac/hmactest.c
similarity index 100%
rename from src/main/jni/openssl/crypto/hmac/hmactest.c
rename to jni/openssl/crypto/hmac/hmactest.c
diff --git a/src/main/jni/openssl/crypto/ia64cpuid.S b/jni/openssl/crypto/ia64cpuid.S
similarity index 100%
rename from src/main/jni/openssl/crypto/ia64cpuid.S
rename to jni/openssl/crypto/ia64cpuid.S
diff --git a/src/main/jni/openssl/crypto/idea/Makefile b/jni/openssl/crypto/idea/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/idea/Makefile
rename to jni/openssl/crypto/idea/Makefile
diff --git a/src/main/jni/openssl/crypto/idea/i_cbc.c b/jni/openssl/crypto/idea/i_cbc.c
similarity index 100%
rename from src/main/jni/openssl/crypto/idea/i_cbc.c
rename to jni/openssl/crypto/idea/i_cbc.c
diff --git a/src/main/jni/openssl/crypto/idea/i_cfb64.c b/jni/openssl/crypto/idea/i_cfb64.c
similarity index 100%
rename from src/main/jni/openssl/crypto/idea/i_cfb64.c
rename to jni/openssl/crypto/idea/i_cfb64.c
diff --git a/src/main/jni/openssl/crypto/idea/i_ecb.c b/jni/openssl/crypto/idea/i_ecb.c
similarity index 100%
rename from src/main/jni/openssl/crypto/idea/i_ecb.c
rename to jni/openssl/crypto/idea/i_ecb.c
diff --git a/src/main/jni/openssl/crypto/idea/i_ofb64.c b/jni/openssl/crypto/idea/i_ofb64.c
similarity index 100%
rename from src/main/jni/openssl/crypto/idea/i_ofb64.c
rename to jni/openssl/crypto/idea/i_ofb64.c
diff --git a/src/main/jni/openssl/crypto/idea/i_skey.c b/jni/openssl/crypto/idea/i_skey.c
similarity index 100%
rename from src/main/jni/openssl/crypto/idea/i_skey.c
rename to jni/openssl/crypto/idea/i_skey.c
diff --git a/src/main/jni/openssl/crypto/idea/idea.h b/jni/openssl/crypto/idea/idea.h
similarity index 100%
rename from src/main/jni/openssl/crypto/idea/idea.h
rename to jni/openssl/crypto/idea/idea.h
diff --git a/src/main/jni/openssl/crypto/idea/idea_lcl.h b/jni/openssl/crypto/idea/idea_lcl.h
similarity index 100%
rename from src/main/jni/openssl/crypto/idea/idea_lcl.h
rename to jni/openssl/crypto/idea/idea_lcl.h
diff --git a/src/main/jni/openssl/crypto/idea/idea_spd.c b/jni/openssl/crypto/idea/idea_spd.c
similarity index 100%
rename from src/main/jni/openssl/crypto/idea/idea_spd.c
rename to jni/openssl/crypto/idea/idea_spd.c
diff --git a/src/main/jni/openssl/crypto/idea/ideatest.c b/jni/openssl/crypto/idea/ideatest.c
similarity index 100%
rename from src/main/jni/openssl/crypto/idea/ideatest.c
rename to jni/openssl/crypto/idea/ideatest.c
diff --git a/src/main/jni/openssl/crypto/idea/version b/jni/openssl/crypto/idea/version
similarity index 100%
rename from src/main/jni/openssl/crypto/idea/version
rename to jni/openssl/crypto/idea/version
diff --git a/src/main/jni/openssl/crypto/install-crypto.com b/jni/openssl/crypto/install-crypto.com
similarity index 100%
rename from src/main/jni/openssl/crypto/install-crypto.com
rename to jni/openssl/crypto/install-crypto.com
diff --git a/src/main/jni/openssl/crypto/jpake/Makefile b/jni/openssl/crypto/jpake/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/jpake/Makefile
rename to jni/openssl/crypto/jpake/Makefile
diff --git a/src/main/jni/openssl/crypto/jpake/jpake.c b/jni/openssl/crypto/jpake/jpake.c
similarity index 100%
rename from src/main/jni/openssl/crypto/jpake/jpake.c
rename to jni/openssl/crypto/jpake/jpake.c
diff --git a/src/main/jni/openssl/crypto/jpake/jpake.h b/jni/openssl/crypto/jpake/jpake.h
similarity index 100%
rename from src/main/jni/openssl/crypto/jpake/jpake.h
rename to jni/openssl/crypto/jpake/jpake.h
diff --git a/src/main/jni/openssl/crypto/jpake/jpake_err.c b/jni/openssl/crypto/jpake/jpake_err.c
similarity index 100%
rename from src/main/jni/openssl/crypto/jpake/jpake_err.c
rename to jni/openssl/crypto/jpake/jpake_err.c
diff --git a/src/main/jni/openssl/crypto/jpake/jpaketest.c b/jni/openssl/crypto/jpake/jpaketest.c
similarity index 100%
rename from src/main/jni/openssl/crypto/jpake/jpaketest.c
rename to jni/openssl/crypto/jpake/jpaketest.c
diff --git a/src/main/jni/openssl/crypto/krb5/Makefile b/jni/openssl/crypto/krb5/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/krb5/Makefile
rename to jni/openssl/crypto/krb5/Makefile
diff --git a/src/main/jni/openssl/crypto/krb5/krb5_asn.c b/jni/openssl/crypto/krb5/krb5_asn.c
similarity index 100%
rename from src/main/jni/openssl/crypto/krb5/krb5_asn.c
rename to jni/openssl/crypto/krb5/krb5_asn.c
diff --git a/src/main/jni/openssl/crypto/krb5/krb5_asn.h b/jni/openssl/crypto/krb5/krb5_asn.h
similarity index 100%
rename from src/main/jni/openssl/crypto/krb5/krb5_asn.h
rename to jni/openssl/crypto/krb5/krb5_asn.h
diff --git a/src/main/jni/openssl/crypto/lhash/Makefile b/jni/openssl/crypto/lhash/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/lhash/Makefile
rename to jni/openssl/crypto/lhash/Makefile
diff --git a/src/main/jni/openssl/crypto/lhash/lh_stats.c b/jni/openssl/crypto/lhash/lh_stats.c
similarity index 100%
rename from src/main/jni/openssl/crypto/lhash/lh_stats.c
rename to jni/openssl/crypto/lhash/lh_stats.c
diff --git a/src/main/jni/openssl/crypto/lhash/lh_test.c b/jni/openssl/crypto/lhash/lh_test.c
similarity index 100%
rename from src/main/jni/openssl/crypto/lhash/lh_test.c
rename to jni/openssl/crypto/lhash/lh_test.c
diff --git a/src/main/jni/openssl/crypto/lhash/lhash.c b/jni/openssl/crypto/lhash/lhash.c
similarity index 100%
rename from src/main/jni/openssl/crypto/lhash/lhash.c
rename to jni/openssl/crypto/lhash/lhash.c
diff --git a/src/main/jni/openssl/crypto/lhash/lhash.h b/jni/openssl/crypto/lhash/lhash.h
similarity index 100%
rename from src/main/jni/openssl/crypto/lhash/lhash.h
rename to jni/openssl/crypto/lhash/lhash.h
diff --git a/src/main/jni/openssl/crypto/lhash/num.pl b/jni/openssl/crypto/lhash/num.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/lhash/num.pl
rename to jni/openssl/crypto/lhash/num.pl
diff --git a/src/main/jni/openssl/crypto/md2/Makefile b/jni/openssl/crypto/md2/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/md2/Makefile
rename to jni/openssl/crypto/md2/Makefile
diff --git a/src/main/jni/openssl/crypto/md2/md2.c b/jni/openssl/crypto/md2/md2.c
similarity index 100%
rename from src/main/jni/openssl/crypto/md2/md2.c
rename to jni/openssl/crypto/md2/md2.c
diff --git a/src/main/jni/openssl/crypto/md2/md2.h b/jni/openssl/crypto/md2/md2.h
similarity index 100%
rename from src/main/jni/openssl/crypto/md2/md2.h
rename to jni/openssl/crypto/md2/md2.h
diff --git a/src/main/jni/openssl/crypto/md2/md2_dgst.c b/jni/openssl/crypto/md2/md2_dgst.c
similarity index 100%
rename from src/main/jni/openssl/crypto/md2/md2_dgst.c
rename to jni/openssl/crypto/md2/md2_dgst.c
diff --git a/src/main/jni/openssl/crypto/md2/md2_one.c b/jni/openssl/crypto/md2/md2_one.c
similarity index 100%
rename from src/main/jni/openssl/crypto/md2/md2_one.c
rename to jni/openssl/crypto/md2/md2_one.c
diff --git a/src/main/jni/openssl/crypto/md2/md2test.c b/jni/openssl/crypto/md2/md2test.c
similarity index 100%
rename from src/main/jni/openssl/crypto/md2/md2test.c
rename to jni/openssl/crypto/md2/md2test.c
diff --git a/src/main/jni/openssl/crypto/md32_common.h b/jni/openssl/crypto/md32_common.h
similarity index 100%
rename from src/main/jni/openssl/crypto/md32_common.h
rename to jni/openssl/crypto/md32_common.h
diff --git a/src/main/jni/openssl/crypto/md4/Makefile b/jni/openssl/crypto/md4/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/md4/Makefile
rename to jni/openssl/crypto/md4/Makefile
diff --git a/src/main/jni/openssl/crypto/md4/md4.c b/jni/openssl/crypto/md4/md4.c
similarity index 100%
rename from src/main/jni/openssl/crypto/md4/md4.c
rename to jni/openssl/crypto/md4/md4.c
diff --git a/src/main/jni/openssl/crypto/md4/md4.h b/jni/openssl/crypto/md4/md4.h
similarity index 100%
rename from src/main/jni/openssl/crypto/md4/md4.h
rename to jni/openssl/crypto/md4/md4.h
diff --git a/src/main/jni/openssl/crypto/md4/md4_dgst.c b/jni/openssl/crypto/md4/md4_dgst.c
similarity index 100%
rename from src/main/jni/openssl/crypto/md4/md4_dgst.c
rename to jni/openssl/crypto/md4/md4_dgst.c
diff --git a/src/main/jni/openssl/crypto/md4/md4_locl.h b/jni/openssl/crypto/md4/md4_locl.h
similarity index 100%
rename from src/main/jni/openssl/crypto/md4/md4_locl.h
rename to jni/openssl/crypto/md4/md4_locl.h
diff --git a/src/main/jni/openssl/crypto/md4/md4_one.c b/jni/openssl/crypto/md4/md4_one.c
similarity index 100%
rename from src/main/jni/openssl/crypto/md4/md4_one.c
rename to jni/openssl/crypto/md4/md4_one.c
diff --git a/src/main/jni/openssl/crypto/md4/md4s.cpp b/jni/openssl/crypto/md4/md4s.cpp
similarity index 100%
rename from src/main/jni/openssl/crypto/md4/md4s.cpp
rename to jni/openssl/crypto/md4/md4s.cpp
diff --git a/src/main/jni/openssl/crypto/md4/md4test.c b/jni/openssl/crypto/md4/md4test.c
similarity index 100%
rename from src/main/jni/openssl/crypto/md4/md4test.c
rename to jni/openssl/crypto/md4/md4test.c
diff --git a/src/main/jni/openssl/crypto/md5/Makefile b/jni/openssl/crypto/md5/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/md5/Makefile
rename to jni/openssl/crypto/md5/Makefile
diff --git a/src/main/jni/openssl/crypto/md5/asm/md5-586.pl b/jni/openssl/crypto/md5/asm/md5-586.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/md5/asm/md5-586.pl
rename to jni/openssl/crypto/md5/asm/md5-586.pl
diff --git a/src/main/jni/openssl/crypto/md5/asm/md5-ia64.S b/jni/openssl/crypto/md5/asm/md5-ia64.S
similarity index 100%
rename from src/main/jni/openssl/crypto/md5/asm/md5-ia64.S
rename to jni/openssl/crypto/md5/asm/md5-ia64.S
diff --git a/src/main/jni/openssl/crypto/md5/asm/md5-x86_64.pl b/jni/openssl/crypto/md5/asm/md5-x86_64.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/md5/asm/md5-x86_64.pl
rename to jni/openssl/crypto/md5/asm/md5-x86_64.pl
diff --git a/src/main/jni/openssl/crypto/md5/md5.c b/jni/openssl/crypto/md5/md5.c
similarity index 100%
rename from src/main/jni/openssl/crypto/md5/md5.c
rename to jni/openssl/crypto/md5/md5.c
diff --git a/src/main/jni/openssl/crypto/md5/md5.h b/jni/openssl/crypto/md5/md5.h
similarity index 100%
rename from src/main/jni/openssl/crypto/md5/md5.h
rename to jni/openssl/crypto/md5/md5.h
diff --git a/src/main/jni/openssl/crypto/md5/md5_dgst.c b/jni/openssl/crypto/md5/md5_dgst.c
similarity index 100%
rename from src/main/jni/openssl/crypto/md5/md5_dgst.c
rename to jni/openssl/crypto/md5/md5_dgst.c
diff --git a/src/main/jni/openssl/crypto/md5/md5_locl.h b/jni/openssl/crypto/md5/md5_locl.h
similarity index 100%
rename from src/main/jni/openssl/crypto/md5/md5_locl.h
rename to jni/openssl/crypto/md5/md5_locl.h
diff --git a/src/main/jni/openssl/crypto/md5/md5_one.c b/jni/openssl/crypto/md5/md5_one.c
similarity index 100%
rename from src/main/jni/openssl/crypto/md5/md5_one.c
rename to jni/openssl/crypto/md5/md5_one.c
diff --git a/src/main/jni/openssl/crypto/md5/md5s.cpp b/jni/openssl/crypto/md5/md5s.cpp
similarity index 100%
rename from src/main/jni/openssl/crypto/md5/md5s.cpp
rename to jni/openssl/crypto/md5/md5s.cpp
diff --git a/src/main/jni/openssl/crypto/md5/md5test.c b/jni/openssl/crypto/md5/md5test.c
similarity index 100%
rename from src/main/jni/openssl/crypto/md5/md5test.c
rename to jni/openssl/crypto/md5/md5test.c
diff --git a/src/main/jni/openssl/crypto/mdc2/Makefile b/jni/openssl/crypto/mdc2/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/mdc2/Makefile
rename to jni/openssl/crypto/mdc2/Makefile
diff --git a/src/main/jni/openssl/crypto/mdc2/mdc2.h b/jni/openssl/crypto/mdc2/mdc2.h
similarity index 100%
rename from src/main/jni/openssl/crypto/mdc2/mdc2.h
rename to jni/openssl/crypto/mdc2/mdc2.h
diff --git a/src/main/jni/openssl/crypto/mdc2/mdc2_one.c b/jni/openssl/crypto/mdc2/mdc2_one.c
similarity index 100%
rename from src/main/jni/openssl/crypto/mdc2/mdc2_one.c
rename to jni/openssl/crypto/mdc2/mdc2_one.c
diff --git a/src/main/jni/openssl/crypto/mdc2/mdc2dgst.c b/jni/openssl/crypto/mdc2/mdc2dgst.c
similarity index 100%
rename from src/main/jni/openssl/crypto/mdc2/mdc2dgst.c
rename to jni/openssl/crypto/mdc2/mdc2dgst.c
diff --git a/src/main/jni/openssl/crypto/mdc2/mdc2test.c b/jni/openssl/crypto/mdc2/mdc2test.c
similarity index 100%
rename from src/main/jni/openssl/crypto/mdc2/mdc2test.c
rename to jni/openssl/crypto/mdc2/mdc2test.c
diff --git a/src/main/jni/openssl/crypto/mem.c b/jni/openssl/crypto/mem.c
similarity index 100%
rename from src/main/jni/openssl/crypto/mem.c
rename to jni/openssl/crypto/mem.c
diff --git a/src/main/jni/openssl/crypto/mem_clr.c b/jni/openssl/crypto/mem_clr.c
similarity index 100%
rename from src/main/jni/openssl/crypto/mem_clr.c
rename to jni/openssl/crypto/mem_clr.c
diff --git a/src/main/jni/openssl/crypto/mem_dbg.c b/jni/openssl/crypto/mem_dbg.c
similarity index 100%
rename from src/main/jni/openssl/crypto/mem_dbg.c
rename to jni/openssl/crypto/mem_dbg.c
diff --git a/src/main/jni/openssl/crypto/modes/Makefile b/jni/openssl/crypto/modes/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/modes/Makefile
rename to jni/openssl/crypto/modes/Makefile
diff --git a/src/main/jni/openssl/crypto/modes/asm/ghash-alpha.pl b/jni/openssl/crypto/modes/asm/ghash-alpha.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/modes/asm/ghash-alpha.pl
rename to jni/openssl/crypto/modes/asm/ghash-alpha.pl
diff --git a/src/main/jni/openssl/crypto/modes/asm/ghash-armv4.pl b/jni/openssl/crypto/modes/asm/ghash-armv4.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/modes/asm/ghash-armv4.pl
rename to jni/openssl/crypto/modes/asm/ghash-armv4.pl
diff --git a/src/main/jni/openssl/crypto/modes/asm/ghash-ia64.pl b/jni/openssl/crypto/modes/asm/ghash-ia64.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/modes/asm/ghash-ia64.pl
rename to jni/openssl/crypto/modes/asm/ghash-ia64.pl
diff --git a/src/main/jni/openssl/crypto/modes/asm/ghash-parisc.pl b/jni/openssl/crypto/modes/asm/ghash-parisc.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/modes/asm/ghash-parisc.pl
rename to jni/openssl/crypto/modes/asm/ghash-parisc.pl
diff --git a/src/main/jni/openssl/crypto/modes/asm/ghash-s390x.pl b/jni/openssl/crypto/modes/asm/ghash-s390x.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/modes/asm/ghash-s390x.pl
rename to jni/openssl/crypto/modes/asm/ghash-s390x.pl
diff --git a/src/main/jni/openssl/crypto/modes/asm/ghash-sparcv9.pl b/jni/openssl/crypto/modes/asm/ghash-sparcv9.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/modes/asm/ghash-sparcv9.pl
rename to jni/openssl/crypto/modes/asm/ghash-sparcv9.pl
diff --git a/src/main/jni/openssl/crypto/modes/asm/ghash-x86.pl b/jni/openssl/crypto/modes/asm/ghash-x86.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/modes/asm/ghash-x86.pl
rename to jni/openssl/crypto/modes/asm/ghash-x86.pl
diff --git a/src/main/jni/openssl/crypto/modes/asm/ghash-x86_64.pl b/jni/openssl/crypto/modes/asm/ghash-x86_64.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/modes/asm/ghash-x86_64.pl
rename to jni/openssl/crypto/modes/asm/ghash-x86_64.pl
diff --git a/src/main/jni/openssl/crypto/modes/cbc128.c b/jni/openssl/crypto/modes/cbc128.c
similarity index 100%
rename from src/main/jni/openssl/crypto/modes/cbc128.c
rename to jni/openssl/crypto/modes/cbc128.c
diff --git a/src/main/jni/openssl/crypto/modes/ccm128.c b/jni/openssl/crypto/modes/ccm128.c
similarity index 100%
rename from src/main/jni/openssl/crypto/modes/ccm128.c
rename to jni/openssl/crypto/modes/ccm128.c
diff --git a/src/main/jni/openssl/crypto/modes/cfb128.c b/jni/openssl/crypto/modes/cfb128.c
similarity index 100%
rename from src/main/jni/openssl/crypto/modes/cfb128.c
rename to jni/openssl/crypto/modes/cfb128.c
diff --git a/src/main/jni/openssl/crypto/modes/ctr128.c b/jni/openssl/crypto/modes/ctr128.c
similarity index 100%
rename from src/main/jni/openssl/crypto/modes/ctr128.c
rename to jni/openssl/crypto/modes/ctr128.c
diff --git a/src/main/jni/openssl/crypto/modes/cts128.c b/jni/openssl/crypto/modes/cts128.c
similarity index 100%
rename from src/main/jni/openssl/crypto/modes/cts128.c
rename to jni/openssl/crypto/modes/cts128.c
diff --git a/src/main/jni/openssl/crypto/modes/gcm128.c b/jni/openssl/crypto/modes/gcm128.c
similarity index 100%
rename from src/main/jni/openssl/crypto/modes/gcm128.c
rename to jni/openssl/crypto/modes/gcm128.c
diff --git a/src/main/jni/openssl/crypto/modes/modes.h b/jni/openssl/crypto/modes/modes.h
similarity index 100%
rename from src/main/jni/openssl/crypto/modes/modes.h
rename to jni/openssl/crypto/modes/modes.h
diff --git a/src/main/jni/openssl/crypto/modes/modes_lcl.h b/jni/openssl/crypto/modes/modes_lcl.h
similarity index 100%
rename from src/main/jni/openssl/crypto/modes/modes_lcl.h
rename to jni/openssl/crypto/modes/modes_lcl.h
diff --git a/src/main/jni/openssl/crypto/modes/ofb128.c b/jni/openssl/crypto/modes/ofb128.c
similarity index 100%
rename from src/main/jni/openssl/crypto/modes/ofb128.c
rename to jni/openssl/crypto/modes/ofb128.c
diff --git a/src/main/jni/openssl/crypto/modes/xts128.c b/jni/openssl/crypto/modes/xts128.c
similarity index 100%
rename from src/main/jni/openssl/crypto/modes/xts128.c
rename to jni/openssl/crypto/modes/xts128.c
diff --git a/src/main/jni/openssl/crypto/o_dir.c b/jni/openssl/crypto/o_dir.c
similarity index 100%
rename from src/main/jni/openssl/crypto/o_dir.c
rename to jni/openssl/crypto/o_dir.c
diff --git a/src/main/jni/openssl/crypto/o_dir.h b/jni/openssl/crypto/o_dir.h
similarity index 100%
rename from src/main/jni/openssl/crypto/o_dir.h
rename to jni/openssl/crypto/o_dir.h
diff --git a/src/main/jni/openssl/crypto/o_dir_test.c b/jni/openssl/crypto/o_dir_test.c
similarity index 100%
rename from src/main/jni/openssl/crypto/o_dir_test.c
rename to jni/openssl/crypto/o_dir_test.c
diff --git a/src/main/jni/openssl/crypto/o_fips.c b/jni/openssl/crypto/o_fips.c
similarity index 100%
rename from src/main/jni/openssl/crypto/o_fips.c
rename to jni/openssl/crypto/o_fips.c
diff --git a/src/main/jni/openssl/crypto/o_init.c b/jni/openssl/crypto/o_init.c
similarity index 100%
rename from src/main/jni/openssl/crypto/o_init.c
rename to jni/openssl/crypto/o_init.c
diff --git a/src/main/jni/openssl/crypto/o_str.c b/jni/openssl/crypto/o_str.c
similarity index 100%
rename from src/main/jni/openssl/crypto/o_str.c
rename to jni/openssl/crypto/o_str.c
diff --git a/src/main/jni/openssl/crypto/o_str.h b/jni/openssl/crypto/o_str.h
similarity index 100%
rename from src/main/jni/openssl/crypto/o_str.h
rename to jni/openssl/crypto/o_str.h
diff --git a/src/main/jni/openssl/crypto/o_time.c b/jni/openssl/crypto/o_time.c
similarity index 100%
rename from src/main/jni/openssl/crypto/o_time.c
rename to jni/openssl/crypto/o_time.c
diff --git a/src/main/jni/openssl/crypto/o_time.h b/jni/openssl/crypto/o_time.h
similarity index 100%
rename from src/main/jni/openssl/crypto/o_time.h
rename to jni/openssl/crypto/o_time.h
diff --git a/src/main/jni/openssl/crypto/objects/Makefile b/jni/openssl/crypto/objects/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/objects/Makefile
rename to jni/openssl/crypto/objects/Makefile
diff --git a/src/main/jni/openssl/crypto/objects/o_names.c b/jni/openssl/crypto/objects/o_names.c
similarity index 100%
rename from src/main/jni/openssl/crypto/objects/o_names.c
rename to jni/openssl/crypto/objects/o_names.c
diff --git a/src/main/jni/openssl/crypto/objects/obj_dat.c b/jni/openssl/crypto/objects/obj_dat.c
similarity index 100%
rename from src/main/jni/openssl/crypto/objects/obj_dat.c
rename to jni/openssl/crypto/objects/obj_dat.c
diff --git a/src/main/jni/openssl/crypto/objects/obj_dat.h b/jni/openssl/crypto/objects/obj_dat.h
similarity index 100%
rename from src/main/jni/openssl/crypto/objects/obj_dat.h
rename to jni/openssl/crypto/objects/obj_dat.h
diff --git a/src/main/jni/openssl/crypto/objects/obj_dat.pl b/jni/openssl/crypto/objects/obj_dat.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/objects/obj_dat.pl
rename to jni/openssl/crypto/objects/obj_dat.pl
diff --git a/src/main/jni/openssl/crypto/objects/obj_err.c b/jni/openssl/crypto/objects/obj_err.c
similarity index 100%
rename from src/main/jni/openssl/crypto/objects/obj_err.c
rename to jni/openssl/crypto/objects/obj_err.c
diff --git a/src/main/jni/openssl/crypto/objects/obj_lib.c b/jni/openssl/crypto/objects/obj_lib.c
similarity index 100%
rename from src/main/jni/openssl/crypto/objects/obj_lib.c
rename to jni/openssl/crypto/objects/obj_lib.c
diff --git a/src/main/jni/openssl/crypto/objects/obj_mac.h b/jni/openssl/crypto/objects/obj_mac.h
similarity index 100%
rename from src/main/jni/openssl/crypto/objects/obj_mac.h
rename to jni/openssl/crypto/objects/obj_mac.h
diff --git a/src/main/jni/openssl/crypto/objects/obj_mac.num b/jni/openssl/crypto/objects/obj_mac.num
similarity index 100%
rename from src/main/jni/openssl/crypto/objects/obj_mac.num
rename to jni/openssl/crypto/objects/obj_mac.num
diff --git a/src/main/jni/openssl/crypto/objects/obj_xref.c b/jni/openssl/crypto/objects/obj_xref.c
similarity index 100%
rename from src/main/jni/openssl/crypto/objects/obj_xref.c
rename to jni/openssl/crypto/objects/obj_xref.c
diff --git a/src/main/jni/openssl/crypto/objects/obj_xref.h b/jni/openssl/crypto/objects/obj_xref.h
similarity index 100%
rename from src/main/jni/openssl/crypto/objects/obj_xref.h
rename to jni/openssl/crypto/objects/obj_xref.h
diff --git a/src/main/jni/openssl/crypto/objects/obj_xref.txt b/jni/openssl/crypto/objects/obj_xref.txt
similarity index 100%
rename from src/main/jni/openssl/crypto/objects/obj_xref.txt
rename to jni/openssl/crypto/objects/obj_xref.txt
diff --git a/src/main/jni/openssl/crypto/objects/objects.README b/jni/openssl/crypto/objects/objects.README
similarity index 100%
rename from src/main/jni/openssl/crypto/objects/objects.README
rename to jni/openssl/crypto/objects/objects.README
diff --git a/src/main/jni/openssl/crypto/objects/objects.h b/jni/openssl/crypto/objects/objects.h
similarity index 100%
rename from src/main/jni/openssl/crypto/objects/objects.h
rename to jni/openssl/crypto/objects/objects.h
diff --git a/src/main/jni/openssl/crypto/objects/objects.pl b/jni/openssl/crypto/objects/objects.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/objects/objects.pl
rename to jni/openssl/crypto/objects/objects.pl
diff --git a/src/main/jni/openssl/crypto/objects/objects.txt b/jni/openssl/crypto/objects/objects.txt
similarity index 100%
rename from src/main/jni/openssl/crypto/objects/objects.txt
rename to jni/openssl/crypto/objects/objects.txt
diff --git a/src/main/jni/openssl/crypto/objects/objxref.pl b/jni/openssl/crypto/objects/objxref.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/objects/objxref.pl
rename to jni/openssl/crypto/objects/objxref.pl
diff --git a/src/main/jni/openssl/crypto/ocsp/Makefile b/jni/openssl/crypto/ocsp/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/ocsp/Makefile
rename to jni/openssl/crypto/ocsp/Makefile
diff --git a/src/main/jni/openssl/crypto/ocsp/ocsp.h b/jni/openssl/crypto/ocsp/ocsp.h
similarity index 100%
rename from src/main/jni/openssl/crypto/ocsp/ocsp.h
rename to jni/openssl/crypto/ocsp/ocsp.h
diff --git a/src/main/jni/openssl/crypto/ocsp/ocsp_asn.c b/jni/openssl/crypto/ocsp/ocsp_asn.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ocsp/ocsp_asn.c
rename to jni/openssl/crypto/ocsp/ocsp_asn.c
diff --git a/src/main/jni/openssl/crypto/ocsp/ocsp_cl.c b/jni/openssl/crypto/ocsp/ocsp_cl.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ocsp/ocsp_cl.c
rename to jni/openssl/crypto/ocsp/ocsp_cl.c
diff --git a/src/main/jni/openssl/crypto/ocsp/ocsp_err.c b/jni/openssl/crypto/ocsp/ocsp_err.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ocsp/ocsp_err.c
rename to jni/openssl/crypto/ocsp/ocsp_err.c
diff --git a/src/main/jni/openssl/crypto/ocsp/ocsp_ext.c b/jni/openssl/crypto/ocsp/ocsp_ext.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ocsp/ocsp_ext.c
rename to jni/openssl/crypto/ocsp/ocsp_ext.c
diff --git a/src/main/jni/openssl/crypto/ocsp/ocsp_ht.c b/jni/openssl/crypto/ocsp/ocsp_ht.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ocsp/ocsp_ht.c
rename to jni/openssl/crypto/ocsp/ocsp_ht.c
diff --git a/src/main/jni/openssl/crypto/ocsp/ocsp_lib.c b/jni/openssl/crypto/ocsp/ocsp_lib.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ocsp/ocsp_lib.c
rename to jni/openssl/crypto/ocsp/ocsp_lib.c
diff --git a/src/main/jni/openssl/crypto/ocsp/ocsp_prn.c b/jni/openssl/crypto/ocsp/ocsp_prn.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ocsp/ocsp_prn.c
rename to jni/openssl/crypto/ocsp/ocsp_prn.c
diff --git a/src/main/jni/openssl/crypto/ocsp/ocsp_srv.c b/jni/openssl/crypto/ocsp/ocsp_srv.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ocsp/ocsp_srv.c
rename to jni/openssl/crypto/ocsp/ocsp_srv.c
diff --git a/src/main/jni/openssl/crypto/ocsp/ocsp_vfy.c b/jni/openssl/crypto/ocsp/ocsp_vfy.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ocsp/ocsp_vfy.c
rename to jni/openssl/crypto/ocsp/ocsp_vfy.c
diff --git a/src/main/jni/openssl/crypto/opensslconf.h b/jni/openssl/crypto/opensslconf.h
similarity index 100%
rename from src/main/jni/openssl/crypto/opensslconf.h
rename to jni/openssl/crypto/opensslconf.h
diff --git a/src/main/jni/openssl/crypto/opensslconf.h.in b/jni/openssl/crypto/opensslconf.h.in
similarity index 100%
rename from src/main/jni/openssl/crypto/opensslconf.h.in
rename to jni/openssl/crypto/opensslconf.h.in
diff --git a/src/main/jni/openssl/crypto/opensslv.h b/jni/openssl/crypto/opensslv.h
similarity index 100%
rename from src/main/jni/openssl/crypto/opensslv.h
rename to jni/openssl/crypto/opensslv.h
diff --git a/src/main/jni/openssl/crypto/ossl_typ.h b/jni/openssl/crypto/ossl_typ.h
similarity index 100%
rename from src/main/jni/openssl/crypto/ossl_typ.h
rename to jni/openssl/crypto/ossl_typ.h
diff --git a/src/main/jni/openssl/crypto/pariscid.pl b/jni/openssl/crypto/pariscid.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/pariscid.pl
rename to jni/openssl/crypto/pariscid.pl
diff --git a/src/main/jni/openssl/crypto/pem/Makefile b/jni/openssl/crypto/pem/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/pem/Makefile
rename to jni/openssl/crypto/pem/Makefile
diff --git a/src/main/jni/openssl/crypto/pem/message b/jni/openssl/crypto/pem/message
similarity index 100%
rename from src/main/jni/openssl/crypto/pem/message
rename to jni/openssl/crypto/pem/message
diff --git a/src/main/jni/openssl/crypto/pem/pem.h b/jni/openssl/crypto/pem/pem.h
similarity index 100%
rename from src/main/jni/openssl/crypto/pem/pem.h
rename to jni/openssl/crypto/pem/pem.h
diff --git a/src/main/jni/openssl/crypto/pem/pem2.h b/jni/openssl/crypto/pem/pem2.h
similarity index 100%
rename from src/main/jni/openssl/crypto/pem/pem2.h
rename to jni/openssl/crypto/pem/pem2.h
diff --git a/src/main/jni/openssl/crypto/pem/pem_all.c b/jni/openssl/crypto/pem/pem_all.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pem/pem_all.c
rename to jni/openssl/crypto/pem/pem_all.c
diff --git a/src/main/jni/openssl/crypto/pem/pem_err.c b/jni/openssl/crypto/pem/pem_err.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pem/pem_err.c
rename to jni/openssl/crypto/pem/pem_err.c
diff --git a/src/main/jni/openssl/crypto/pem/pem_info.c b/jni/openssl/crypto/pem/pem_info.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pem/pem_info.c
rename to jni/openssl/crypto/pem/pem_info.c
diff --git a/src/main/jni/openssl/crypto/pem/pem_lib.c b/jni/openssl/crypto/pem/pem_lib.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pem/pem_lib.c
rename to jni/openssl/crypto/pem/pem_lib.c
diff --git a/src/main/jni/openssl/crypto/pem/pem_oth.c b/jni/openssl/crypto/pem/pem_oth.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pem/pem_oth.c
rename to jni/openssl/crypto/pem/pem_oth.c
diff --git a/src/main/jni/openssl/crypto/pem/pem_pk8.c b/jni/openssl/crypto/pem/pem_pk8.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pem/pem_pk8.c
rename to jni/openssl/crypto/pem/pem_pk8.c
diff --git a/src/main/jni/openssl/crypto/pem/pem_pkey.c b/jni/openssl/crypto/pem/pem_pkey.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pem/pem_pkey.c
rename to jni/openssl/crypto/pem/pem_pkey.c
diff --git a/src/main/jni/openssl/crypto/pem/pem_seal.c b/jni/openssl/crypto/pem/pem_seal.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pem/pem_seal.c
rename to jni/openssl/crypto/pem/pem_seal.c
diff --git a/src/main/jni/openssl/crypto/pem/pem_sign.c b/jni/openssl/crypto/pem/pem_sign.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pem/pem_sign.c
rename to jni/openssl/crypto/pem/pem_sign.c
diff --git a/src/main/jni/openssl/crypto/pem/pem_x509.c b/jni/openssl/crypto/pem/pem_x509.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pem/pem_x509.c
rename to jni/openssl/crypto/pem/pem_x509.c
diff --git a/src/main/jni/openssl/crypto/pem/pem_xaux.c b/jni/openssl/crypto/pem/pem_xaux.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pem/pem_xaux.c
rename to jni/openssl/crypto/pem/pem_xaux.c
diff --git a/src/main/jni/openssl/crypto/pem/pkcs7.lis b/jni/openssl/crypto/pem/pkcs7.lis
similarity index 100%
rename from src/main/jni/openssl/crypto/pem/pkcs7.lis
rename to jni/openssl/crypto/pem/pkcs7.lis
diff --git a/src/main/jni/openssl/crypto/pem/pvkfmt.c b/jni/openssl/crypto/pem/pvkfmt.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pem/pvkfmt.c
rename to jni/openssl/crypto/pem/pvkfmt.c
diff --git a/src/main/jni/openssl/crypto/perlasm/cbc.pl b/jni/openssl/crypto/perlasm/cbc.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/perlasm/cbc.pl
rename to jni/openssl/crypto/perlasm/cbc.pl
diff --git a/src/main/jni/openssl/crypto/perlasm/ppc-xlate.pl b/jni/openssl/crypto/perlasm/ppc-xlate.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/perlasm/ppc-xlate.pl
rename to jni/openssl/crypto/perlasm/ppc-xlate.pl
diff --git a/src/main/jni/openssl/crypto/perlasm/readme b/jni/openssl/crypto/perlasm/readme
similarity index 100%
rename from src/main/jni/openssl/crypto/perlasm/readme
rename to jni/openssl/crypto/perlasm/readme
diff --git a/src/main/jni/openssl/crypto/perlasm/x86_64-xlate.pl b/jni/openssl/crypto/perlasm/x86_64-xlate.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/perlasm/x86_64-xlate.pl
rename to jni/openssl/crypto/perlasm/x86_64-xlate.pl
diff --git a/src/main/jni/openssl/crypto/perlasm/x86asm.pl b/jni/openssl/crypto/perlasm/x86asm.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/perlasm/x86asm.pl
rename to jni/openssl/crypto/perlasm/x86asm.pl
diff --git a/src/main/jni/openssl/crypto/perlasm/x86gas.pl b/jni/openssl/crypto/perlasm/x86gas.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/perlasm/x86gas.pl
rename to jni/openssl/crypto/perlasm/x86gas.pl
diff --git a/src/main/jni/openssl/crypto/perlasm/x86masm.pl b/jni/openssl/crypto/perlasm/x86masm.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/perlasm/x86masm.pl
rename to jni/openssl/crypto/perlasm/x86masm.pl
diff --git a/src/main/jni/openssl/crypto/perlasm/x86nasm.pl b/jni/openssl/crypto/perlasm/x86nasm.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/perlasm/x86nasm.pl
rename to jni/openssl/crypto/perlasm/x86nasm.pl
diff --git a/src/main/jni/openssl/crypto/pkcs12/Makefile b/jni/openssl/crypto/pkcs12/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs12/Makefile
rename to jni/openssl/crypto/pkcs12/Makefile
diff --git a/src/main/jni/openssl/crypto/pkcs12/p12_add.c b/jni/openssl/crypto/pkcs12/p12_add.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs12/p12_add.c
rename to jni/openssl/crypto/pkcs12/p12_add.c
diff --git a/src/main/jni/openssl/crypto/pkcs12/p12_asn.c b/jni/openssl/crypto/pkcs12/p12_asn.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs12/p12_asn.c
rename to jni/openssl/crypto/pkcs12/p12_asn.c
diff --git a/src/main/jni/openssl/crypto/pkcs12/p12_attr.c b/jni/openssl/crypto/pkcs12/p12_attr.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs12/p12_attr.c
rename to jni/openssl/crypto/pkcs12/p12_attr.c
diff --git a/src/main/jni/openssl/crypto/pkcs12/p12_crpt.c b/jni/openssl/crypto/pkcs12/p12_crpt.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs12/p12_crpt.c
rename to jni/openssl/crypto/pkcs12/p12_crpt.c
diff --git a/src/main/jni/openssl/crypto/pkcs12/p12_crt.c b/jni/openssl/crypto/pkcs12/p12_crt.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs12/p12_crt.c
rename to jni/openssl/crypto/pkcs12/p12_crt.c
diff --git a/src/main/jni/openssl/crypto/pkcs12/p12_decr.c b/jni/openssl/crypto/pkcs12/p12_decr.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs12/p12_decr.c
rename to jni/openssl/crypto/pkcs12/p12_decr.c
diff --git a/src/main/jni/openssl/crypto/pkcs12/p12_init.c b/jni/openssl/crypto/pkcs12/p12_init.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs12/p12_init.c
rename to jni/openssl/crypto/pkcs12/p12_init.c
diff --git a/src/main/jni/openssl/crypto/pkcs12/p12_key.c b/jni/openssl/crypto/pkcs12/p12_key.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs12/p12_key.c
rename to jni/openssl/crypto/pkcs12/p12_key.c
diff --git a/src/main/jni/openssl/crypto/pkcs12/p12_kiss.c b/jni/openssl/crypto/pkcs12/p12_kiss.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs12/p12_kiss.c
rename to jni/openssl/crypto/pkcs12/p12_kiss.c
diff --git a/src/main/jni/openssl/crypto/pkcs12/p12_mutl.c b/jni/openssl/crypto/pkcs12/p12_mutl.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs12/p12_mutl.c
rename to jni/openssl/crypto/pkcs12/p12_mutl.c
diff --git a/src/main/jni/openssl/crypto/pkcs12/p12_npas.c b/jni/openssl/crypto/pkcs12/p12_npas.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs12/p12_npas.c
rename to jni/openssl/crypto/pkcs12/p12_npas.c
diff --git a/src/main/jni/openssl/crypto/pkcs12/p12_p8d.c b/jni/openssl/crypto/pkcs12/p12_p8d.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs12/p12_p8d.c
rename to jni/openssl/crypto/pkcs12/p12_p8d.c
diff --git a/src/main/jni/openssl/crypto/pkcs12/p12_p8e.c b/jni/openssl/crypto/pkcs12/p12_p8e.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs12/p12_p8e.c
rename to jni/openssl/crypto/pkcs12/p12_p8e.c
diff --git a/src/main/jni/openssl/crypto/pkcs12/p12_utl.c b/jni/openssl/crypto/pkcs12/p12_utl.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs12/p12_utl.c
rename to jni/openssl/crypto/pkcs12/p12_utl.c
diff --git a/src/main/jni/openssl/crypto/pkcs12/pk12err.c b/jni/openssl/crypto/pkcs12/pk12err.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs12/pk12err.c
rename to jni/openssl/crypto/pkcs12/pk12err.c
diff --git a/src/main/jni/openssl/crypto/pkcs12/pkcs12.h b/jni/openssl/crypto/pkcs12/pkcs12.h
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs12/pkcs12.h
rename to jni/openssl/crypto/pkcs12/pkcs12.h
diff --git a/src/main/jni/openssl/crypto/pkcs7/Makefile b/jni/openssl/crypto/pkcs7/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/Makefile
rename to jni/openssl/crypto/pkcs7/Makefile
diff --git a/src/main/jni/openssl/crypto/pkcs7/bio_ber.c b/jni/openssl/crypto/pkcs7/bio_ber.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/bio_ber.c
rename to jni/openssl/crypto/pkcs7/bio_ber.c
diff --git a/src/main/jni/openssl/crypto/pkcs7/bio_pk7.c b/jni/openssl/crypto/pkcs7/bio_pk7.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/bio_pk7.c
rename to jni/openssl/crypto/pkcs7/bio_pk7.c
diff --git a/src/main/jni/openssl/crypto/pkcs7/dec.c b/jni/openssl/crypto/pkcs7/dec.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/dec.c
rename to jni/openssl/crypto/pkcs7/dec.c
diff --git a/src/main/jni/openssl/crypto/pkcs7/des.pem b/jni/openssl/crypto/pkcs7/des.pem
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/des.pem
rename to jni/openssl/crypto/pkcs7/des.pem
diff --git a/src/main/jni/openssl/crypto/pkcs7/doc b/jni/openssl/crypto/pkcs7/doc
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/doc
rename to jni/openssl/crypto/pkcs7/doc
diff --git a/src/main/jni/openssl/crypto/pkcs7/enc.c b/jni/openssl/crypto/pkcs7/enc.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/enc.c
rename to jni/openssl/crypto/pkcs7/enc.c
diff --git a/src/main/jni/openssl/crypto/pkcs7/es1.pem b/jni/openssl/crypto/pkcs7/es1.pem
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/es1.pem
rename to jni/openssl/crypto/pkcs7/es1.pem
diff --git a/src/main/jni/openssl/crypto/pkcs7/example.c b/jni/openssl/crypto/pkcs7/example.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/example.c
rename to jni/openssl/crypto/pkcs7/example.c
diff --git a/src/main/jni/openssl/crypto/pkcs7/example.h b/jni/openssl/crypto/pkcs7/example.h
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/example.h
rename to jni/openssl/crypto/pkcs7/example.h
diff --git a/src/main/jni/openssl/crypto/pkcs7/info.pem b/jni/openssl/crypto/pkcs7/info.pem
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/info.pem
rename to jni/openssl/crypto/pkcs7/info.pem
diff --git a/src/main/jni/openssl/crypto/pkcs7/infokey.pem b/jni/openssl/crypto/pkcs7/infokey.pem
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/infokey.pem
rename to jni/openssl/crypto/pkcs7/infokey.pem
diff --git a/src/main/jni/openssl/crypto/pkcs7/p7/a1 b/jni/openssl/crypto/pkcs7/p7/a1
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/p7/a1
rename to jni/openssl/crypto/pkcs7/p7/a1
diff --git a/src/main/jni/openssl/crypto/pkcs7/p7/a2 b/jni/openssl/crypto/pkcs7/p7/a2
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/p7/a2
rename to jni/openssl/crypto/pkcs7/p7/a2
diff --git a/src/main/jni/openssl/crypto/pkcs7/p7/cert.p7c b/jni/openssl/crypto/pkcs7/p7/cert.p7c
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/p7/cert.p7c
rename to jni/openssl/crypto/pkcs7/p7/cert.p7c
diff --git a/src/main/jni/openssl/crypto/pkcs7/p7/smime.p7m b/jni/openssl/crypto/pkcs7/p7/smime.p7m
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/p7/smime.p7m
rename to jni/openssl/crypto/pkcs7/p7/smime.p7m
diff --git a/src/main/jni/openssl/crypto/pkcs7/p7/smime.p7s b/jni/openssl/crypto/pkcs7/p7/smime.p7s
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/p7/smime.p7s
rename to jni/openssl/crypto/pkcs7/p7/smime.p7s
diff --git a/src/main/jni/openssl/crypto/pkcs7/pk7_asn1.c b/jni/openssl/crypto/pkcs7/pk7_asn1.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/pk7_asn1.c
rename to jni/openssl/crypto/pkcs7/pk7_asn1.c
diff --git a/src/main/jni/openssl/crypto/pkcs7/pk7_attr.c b/jni/openssl/crypto/pkcs7/pk7_attr.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/pk7_attr.c
rename to jni/openssl/crypto/pkcs7/pk7_attr.c
diff --git a/src/main/jni/openssl/crypto/pkcs7/pk7_dgst.c b/jni/openssl/crypto/pkcs7/pk7_dgst.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/pk7_dgst.c
rename to jni/openssl/crypto/pkcs7/pk7_dgst.c
diff --git a/src/main/jni/openssl/crypto/pkcs7/pk7_doit.c b/jni/openssl/crypto/pkcs7/pk7_doit.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/pk7_doit.c
rename to jni/openssl/crypto/pkcs7/pk7_doit.c
diff --git a/src/main/jni/openssl/crypto/pkcs7/pk7_enc.c b/jni/openssl/crypto/pkcs7/pk7_enc.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/pk7_enc.c
rename to jni/openssl/crypto/pkcs7/pk7_enc.c
diff --git a/src/main/jni/openssl/crypto/pkcs7/pk7_lib.c b/jni/openssl/crypto/pkcs7/pk7_lib.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/pk7_lib.c
rename to jni/openssl/crypto/pkcs7/pk7_lib.c
diff --git a/src/main/jni/openssl/crypto/pkcs7/pk7_mime.c b/jni/openssl/crypto/pkcs7/pk7_mime.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/pk7_mime.c
rename to jni/openssl/crypto/pkcs7/pk7_mime.c
diff --git a/src/main/jni/openssl/crypto/pkcs7/pk7_smime.c b/jni/openssl/crypto/pkcs7/pk7_smime.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/pk7_smime.c
rename to jni/openssl/crypto/pkcs7/pk7_smime.c
diff --git a/src/main/jni/openssl/crypto/pkcs7/pkcs7.h b/jni/openssl/crypto/pkcs7/pkcs7.h
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/pkcs7.h
rename to jni/openssl/crypto/pkcs7/pkcs7.h
diff --git a/src/main/jni/openssl/crypto/pkcs7/pkcs7err.c b/jni/openssl/crypto/pkcs7/pkcs7err.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/pkcs7err.c
rename to jni/openssl/crypto/pkcs7/pkcs7err.c
diff --git a/src/main/jni/openssl/crypto/pkcs7/server.pem b/jni/openssl/crypto/pkcs7/server.pem
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/server.pem
rename to jni/openssl/crypto/pkcs7/server.pem
diff --git a/src/main/jni/openssl/crypto/pkcs7/sign.c b/jni/openssl/crypto/pkcs7/sign.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/sign.c
rename to jni/openssl/crypto/pkcs7/sign.c
diff --git a/src/main/jni/openssl/crypto/pkcs7/t/3des.pem b/jni/openssl/crypto/pkcs7/t/3des.pem
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/t/3des.pem
rename to jni/openssl/crypto/pkcs7/t/3des.pem
diff --git a/src/main/jni/openssl/crypto/pkcs7/t/3dess.pem b/jni/openssl/crypto/pkcs7/t/3dess.pem
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/t/3dess.pem
rename to jni/openssl/crypto/pkcs7/t/3dess.pem
diff --git a/src/main/jni/openssl/crypto/pkcs7/t/c.pem b/jni/openssl/crypto/pkcs7/t/c.pem
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/t/c.pem
rename to jni/openssl/crypto/pkcs7/t/c.pem
diff --git a/src/main/jni/openssl/crypto/pkcs7/t/ff b/jni/openssl/crypto/pkcs7/t/ff
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/t/ff
rename to jni/openssl/crypto/pkcs7/t/ff
diff --git a/src/main/jni/openssl/crypto/pkcs7/t/msie-e b/jni/openssl/crypto/pkcs7/t/msie-e
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/t/msie-e
rename to jni/openssl/crypto/pkcs7/t/msie-e
diff --git a/src/main/jni/openssl/crypto/pkcs7/t/msie-e.pem b/jni/openssl/crypto/pkcs7/t/msie-e.pem
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/t/msie-e.pem
rename to jni/openssl/crypto/pkcs7/t/msie-e.pem
diff --git a/src/main/jni/openssl/crypto/pkcs7/t/msie-enc-01 b/jni/openssl/crypto/pkcs7/t/msie-enc-01
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/t/msie-enc-01
rename to jni/openssl/crypto/pkcs7/t/msie-enc-01
diff --git a/src/main/jni/openssl/crypto/pkcs7/t/msie-enc-01.pem b/jni/openssl/crypto/pkcs7/t/msie-enc-01.pem
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/t/msie-enc-01.pem
rename to jni/openssl/crypto/pkcs7/t/msie-enc-01.pem
diff --git a/src/main/jni/openssl/crypto/pkcs7/t/msie-enc-02 b/jni/openssl/crypto/pkcs7/t/msie-enc-02
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/t/msie-enc-02
rename to jni/openssl/crypto/pkcs7/t/msie-enc-02
diff --git a/src/main/jni/openssl/crypto/pkcs7/t/msie-enc-02.pem b/jni/openssl/crypto/pkcs7/t/msie-enc-02.pem
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/t/msie-enc-02.pem
rename to jni/openssl/crypto/pkcs7/t/msie-enc-02.pem
diff --git a/src/main/jni/openssl/crypto/pkcs7/t/msie-s-a-e b/jni/openssl/crypto/pkcs7/t/msie-s-a-e
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/t/msie-s-a-e
rename to jni/openssl/crypto/pkcs7/t/msie-s-a-e
diff --git a/src/main/jni/openssl/crypto/pkcs7/t/msie-s-a-e.pem b/jni/openssl/crypto/pkcs7/t/msie-s-a-e.pem
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/t/msie-s-a-e.pem
rename to jni/openssl/crypto/pkcs7/t/msie-s-a-e.pem
diff --git a/src/main/jni/openssl/crypto/pkcs7/t/nav-smime b/jni/openssl/crypto/pkcs7/t/nav-smime
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/t/nav-smime
rename to jni/openssl/crypto/pkcs7/t/nav-smime
diff --git a/src/main/jni/openssl/crypto/pkcs7/t/s.pem b/jni/openssl/crypto/pkcs7/t/s.pem
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/t/s.pem
rename to jni/openssl/crypto/pkcs7/t/s.pem
diff --git a/src/main/jni/openssl/crypto/pkcs7/t/server.pem b/jni/openssl/crypto/pkcs7/t/server.pem
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/t/server.pem
rename to jni/openssl/crypto/pkcs7/t/server.pem
diff --git a/src/main/jni/openssl/crypto/pkcs7/verify.c b/jni/openssl/crypto/pkcs7/verify.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pkcs7/verify.c
rename to jni/openssl/crypto/pkcs7/verify.c
diff --git a/src/main/jni/openssl/crypto/ppccap.c b/jni/openssl/crypto/ppccap.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ppccap.c
rename to jni/openssl/crypto/ppccap.c
diff --git a/src/main/jni/openssl/crypto/ppccpuid.pl b/jni/openssl/crypto/ppccpuid.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/ppccpuid.pl
rename to jni/openssl/crypto/ppccpuid.pl
diff --git a/src/main/jni/openssl/crypto/pqueue/Makefile b/jni/openssl/crypto/pqueue/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/pqueue/Makefile
rename to jni/openssl/crypto/pqueue/Makefile
diff --git a/src/main/jni/openssl/crypto/pqueue/pq_test.c b/jni/openssl/crypto/pqueue/pq_test.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pqueue/pq_test.c
rename to jni/openssl/crypto/pqueue/pq_test.c
diff --git a/src/main/jni/openssl/crypto/pqueue/pqueue.c b/jni/openssl/crypto/pqueue/pqueue.c
similarity index 100%
rename from src/main/jni/openssl/crypto/pqueue/pqueue.c
rename to jni/openssl/crypto/pqueue/pqueue.c
diff --git a/src/main/jni/openssl/crypto/pqueue/pqueue.h b/jni/openssl/crypto/pqueue/pqueue.h
similarity index 100%
rename from src/main/jni/openssl/crypto/pqueue/pqueue.h
rename to jni/openssl/crypto/pqueue/pqueue.h
diff --git a/src/main/jni/openssl/crypto/rand/Makefile b/jni/openssl/crypto/rand/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/rand/Makefile
rename to jni/openssl/crypto/rand/Makefile
diff --git a/src/main/jni/openssl/crypto/rand/md_rand.c b/jni/openssl/crypto/rand/md_rand.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rand/md_rand.c
rename to jni/openssl/crypto/rand/md_rand.c
diff --git a/src/main/jni/openssl/crypto/rand/rand.h b/jni/openssl/crypto/rand/rand.h
similarity index 100%
rename from src/main/jni/openssl/crypto/rand/rand.h
rename to jni/openssl/crypto/rand/rand.h
diff --git a/src/main/jni/openssl/crypto/rand/rand_egd.c b/jni/openssl/crypto/rand/rand_egd.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rand/rand_egd.c
rename to jni/openssl/crypto/rand/rand_egd.c
diff --git a/src/main/jni/openssl/crypto/rand/rand_err.c b/jni/openssl/crypto/rand/rand_err.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rand/rand_err.c
rename to jni/openssl/crypto/rand/rand_err.c
diff --git a/src/main/jni/openssl/crypto/rand/rand_lcl.h b/jni/openssl/crypto/rand/rand_lcl.h
similarity index 100%
rename from src/main/jni/openssl/crypto/rand/rand_lcl.h
rename to jni/openssl/crypto/rand/rand_lcl.h
diff --git a/src/main/jni/openssl/crypto/rand/rand_lib.c b/jni/openssl/crypto/rand/rand_lib.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rand/rand_lib.c
rename to jni/openssl/crypto/rand/rand_lib.c
diff --git a/src/main/jni/openssl/crypto/rand/rand_nw.c b/jni/openssl/crypto/rand/rand_nw.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rand/rand_nw.c
rename to jni/openssl/crypto/rand/rand_nw.c
diff --git a/src/main/jni/openssl/crypto/rand/rand_os2.c b/jni/openssl/crypto/rand/rand_os2.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rand/rand_os2.c
rename to jni/openssl/crypto/rand/rand_os2.c
diff --git a/src/main/jni/openssl/crypto/rand/rand_unix.c b/jni/openssl/crypto/rand/rand_unix.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rand/rand_unix.c
rename to jni/openssl/crypto/rand/rand_unix.c
diff --git a/src/main/jni/openssl/crypto/rand/rand_vms.c b/jni/openssl/crypto/rand/rand_vms.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rand/rand_vms.c
rename to jni/openssl/crypto/rand/rand_vms.c
diff --git a/src/main/jni/openssl/crypto/rand/rand_win.c b/jni/openssl/crypto/rand/rand_win.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rand/rand_win.c
rename to jni/openssl/crypto/rand/rand_win.c
diff --git a/src/main/jni/openssl/crypto/rand/randfile.c b/jni/openssl/crypto/rand/randfile.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rand/randfile.c
rename to jni/openssl/crypto/rand/randfile.c
diff --git a/src/main/jni/openssl/crypto/rand/randtest.c b/jni/openssl/crypto/rand/randtest.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rand/randtest.c
rename to jni/openssl/crypto/rand/randtest.c
diff --git a/src/main/jni/openssl/crypto/rc2/Makefile b/jni/openssl/crypto/rc2/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/rc2/Makefile
rename to jni/openssl/crypto/rc2/Makefile
diff --git a/src/main/jni/openssl/crypto/rc2/rc2.h b/jni/openssl/crypto/rc2/rc2.h
similarity index 100%
rename from src/main/jni/openssl/crypto/rc2/rc2.h
rename to jni/openssl/crypto/rc2/rc2.h
diff --git a/src/main/jni/openssl/crypto/rc2/rc2_cbc.c b/jni/openssl/crypto/rc2/rc2_cbc.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rc2/rc2_cbc.c
rename to jni/openssl/crypto/rc2/rc2_cbc.c
diff --git a/src/main/jni/openssl/crypto/rc2/rc2_ecb.c b/jni/openssl/crypto/rc2/rc2_ecb.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rc2/rc2_ecb.c
rename to jni/openssl/crypto/rc2/rc2_ecb.c
diff --git a/src/main/jni/openssl/crypto/rc2/rc2_locl.h b/jni/openssl/crypto/rc2/rc2_locl.h
similarity index 100%
rename from src/main/jni/openssl/crypto/rc2/rc2_locl.h
rename to jni/openssl/crypto/rc2/rc2_locl.h
diff --git a/src/main/jni/openssl/crypto/rc2/rc2_skey.c b/jni/openssl/crypto/rc2/rc2_skey.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rc2/rc2_skey.c
rename to jni/openssl/crypto/rc2/rc2_skey.c
diff --git a/src/main/jni/openssl/crypto/rc2/rc2cfb64.c b/jni/openssl/crypto/rc2/rc2cfb64.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rc2/rc2cfb64.c
rename to jni/openssl/crypto/rc2/rc2cfb64.c
diff --git a/src/main/jni/openssl/crypto/rc2/rc2ofb64.c b/jni/openssl/crypto/rc2/rc2ofb64.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rc2/rc2ofb64.c
rename to jni/openssl/crypto/rc2/rc2ofb64.c
diff --git a/src/main/jni/openssl/crypto/rc2/rc2speed.c b/jni/openssl/crypto/rc2/rc2speed.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rc2/rc2speed.c
rename to jni/openssl/crypto/rc2/rc2speed.c
diff --git a/src/main/jni/openssl/crypto/rc2/rc2test.c b/jni/openssl/crypto/rc2/rc2test.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rc2/rc2test.c
rename to jni/openssl/crypto/rc2/rc2test.c
diff --git a/src/main/jni/openssl/crypto/rc2/rrc2.doc b/jni/openssl/crypto/rc2/rrc2.doc
similarity index 100%
rename from src/main/jni/openssl/crypto/rc2/rrc2.doc
rename to jni/openssl/crypto/rc2/rrc2.doc
diff --git a/src/main/jni/openssl/crypto/rc2/tab.c b/jni/openssl/crypto/rc2/tab.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rc2/tab.c
rename to jni/openssl/crypto/rc2/tab.c
diff --git a/src/main/jni/openssl/crypto/rc2/version b/jni/openssl/crypto/rc2/version
similarity index 100%
rename from src/main/jni/openssl/crypto/rc2/version
rename to jni/openssl/crypto/rc2/version
diff --git a/src/main/jni/openssl/crypto/rc4/Makefile b/jni/openssl/crypto/rc4/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/rc4/Makefile
rename to jni/openssl/crypto/rc4/Makefile
diff --git a/src/main/jni/openssl/crypto/rc4/asm/rc4-586.pl b/jni/openssl/crypto/rc4/asm/rc4-586.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/rc4/asm/rc4-586.pl
rename to jni/openssl/crypto/rc4/asm/rc4-586.pl
diff --git a/src/main/jni/openssl/crypto/rc4/asm/rc4-ia64.pl b/jni/openssl/crypto/rc4/asm/rc4-ia64.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/rc4/asm/rc4-ia64.pl
rename to jni/openssl/crypto/rc4/asm/rc4-ia64.pl
diff --git a/src/main/jni/openssl/crypto/rc4/asm/rc4-md5-x86_64.pl b/jni/openssl/crypto/rc4/asm/rc4-md5-x86_64.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/rc4/asm/rc4-md5-x86_64.pl
rename to jni/openssl/crypto/rc4/asm/rc4-md5-x86_64.pl
diff --git a/src/main/jni/openssl/crypto/rc4/asm/rc4-parisc.pl b/jni/openssl/crypto/rc4/asm/rc4-parisc.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/rc4/asm/rc4-parisc.pl
rename to jni/openssl/crypto/rc4/asm/rc4-parisc.pl
diff --git a/src/main/jni/openssl/crypto/rc4/asm/rc4-s390x.pl b/jni/openssl/crypto/rc4/asm/rc4-s390x.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/rc4/asm/rc4-s390x.pl
rename to jni/openssl/crypto/rc4/asm/rc4-s390x.pl
diff --git a/src/main/jni/openssl/crypto/rc4/asm/rc4-x86_64.pl b/jni/openssl/crypto/rc4/asm/rc4-x86_64.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/rc4/asm/rc4-x86_64.pl
rename to jni/openssl/crypto/rc4/asm/rc4-x86_64.pl
diff --git a/src/main/jni/openssl/crypto/rc4/rc4.c b/jni/openssl/crypto/rc4/rc4.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rc4/rc4.c
rename to jni/openssl/crypto/rc4/rc4.c
diff --git a/src/main/jni/openssl/crypto/rc4/rc4.h b/jni/openssl/crypto/rc4/rc4.h
similarity index 100%
rename from src/main/jni/openssl/crypto/rc4/rc4.h
rename to jni/openssl/crypto/rc4/rc4.h
diff --git a/src/main/jni/openssl/crypto/rc4/rc4_enc.c b/jni/openssl/crypto/rc4/rc4_enc.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rc4/rc4_enc.c
rename to jni/openssl/crypto/rc4/rc4_enc.c
diff --git a/src/main/jni/openssl/crypto/rc4/rc4_locl.h b/jni/openssl/crypto/rc4/rc4_locl.h
similarity index 100%
rename from src/main/jni/openssl/crypto/rc4/rc4_locl.h
rename to jni/openssl/crypto/rc4/rc4_locl.h
diff --git a/src/main/jni/openssl/crypto/rc4/rc4_skey.c b/jni/openssl/crypto/rc4/rc4_skey.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rc4/rc4_skey.c
rename to jni/openssl/crypto/rc4/rc4_skey.c
diff --git a/src/main/jni/openssl/crypto/rc4/rc4_utl.c b/jni/openssl/crypto/rc4/rc4_utl.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rc4/rc4_utl.c
rename to jni/openssl/crypto/rc4/rc4_utl.c
diff --git a/src/main/jni/openssl/crypto/rc4/rc4s.cpp b/jni/openssl/crypto/rc4/rc4s.cpp
similarity index 100%
rename from src/main/jni/openssl/crypto/rc4/rc4s.cpp
rename to jni/openssl/crypto/rc4/rc4s.cpp
diff --git a/src/main/jni/openssl/crypto/rc4/rc4speed.c b/jni/openssl/crypto/rc4/rc4speed.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rc4/rc4speed.c
rename to jni/openssl/crypto/rc4/rc4speed.c
diff --git a/src/main/jni/openssl/crypto/rc4/rc4test.c b/jni/openssl/crypto/rc4/rc4test.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rc4/rc4test.c
rename to jni/openssl/crypto/rc4/rc4test.c
diff --git a/src/main/jni/openssl/crypto/rc4/rrc4.doc b/jni/openssl/crypto/rc4/rrc4.doc
similarity index 100%
rename from src/main/jni/openssl/crypto/rc4/rrc4.doc
rename to jni/openssl/crypto/rc4/rrc4.doc
diff --git a/src/main/jni/openssl/crypto/rc5/Makefile b/jni/openssl/crypto/rc5/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/rc5/Makefile
rename to jni/openssl/crypto/rc5/Makefile
diff --git a/src/main/jni/openssl/crypto/rc5/asm/rc5-586.pl b/jni/openssl/crypto/rc5/asm/rc5-586.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/rc5/asm/rc5-586.pl
rename to jni/openssl/crypto/rc5/asm/rc5-586.pl
diff --git a/src/main/jni/openssl/crypto/rc5/rc5.h b/jni/openssl/crypto/rc5/rc5.h
similarity index 100%
rename from src/main/jni/openssl/crypto/rc5/rc5.h
rename to jni/openssl/crypto/rc5/rc5.h
diff --git a/src/main/jni/openssl/crypto/rc5/rc5_ecb.c b/jni/openssl/crypto/rc5/rc5_ecb.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rc5/rc5_ecb.c
rename to jni/openssl/crypto/rc5/rc5_ecb.c
diff --git a/src/main/jni/openssl/crypto/rc5/rc5_enc.c b/jni/openssl/crypto/rc5/rc5_enc.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rc5/rc5_enc.c
rename to jni/openssl/crypto/rc5/rc5_enc.c
diff --git a/src/main/jni/openssl/crypto/rc5/rc5_locl.h b/jni/openssl/crypto/rc5/rc5_locl.h
similarity index 100%
rename from src/main/jni/openssl/crypto/rc5/rc5_locl.h
rename to jni/openssl/crypto/rc5/rc5_locl.h
diff --git a/src/main/jni/openssl/crypto/rc5/rc5_skey.c b/jni/openssl/crypto/rc5/rc5_skey.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rc5/rc5_skey.c
rename to jni/openssl/crypto/rc5/rc5_skey.c
diff --git a/src/main/jni/openssl/crypto/rc5/rc5cfb64.c b/jni/openssl/crypto/rc5/rc5cfb64.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rc5/rc5cfb64.c
rename to jni/openssl/crypto/rc5/rc5cfb64.c
diff --git a/src/main/jni/openssl/crypto/rc5/rc5ofb64.c b/jni/openssl/crypto/rc5/rc5ofb64.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rc5/rc5ofb64.c
rename to jni/openssl/crypto/rc5/rc5ofb64.c
diff --git a/src/main/jni/openssl/crypto/rc5/rc5s.cpp b/jni/openssl/crypto/rc5/rc5s.cpp
similarity index 100%
rename from src/main/jni/openssl/crypto/rc5/rc5s.cpp
rename to jni/openssl/crypto/rc5/rc5s.cpp
diff --git a/src/main/jni/openssl/crypto/rc5/rc5speed.c b/jni/openssl/crypto/rc5/rc5speed.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rc5/rc5speed.c
rename to jni/openssl/crypto/rc5/rc5speed.c
diff --git a/src/main/jni/openssl/crypto/rc5/rc5test.c b/jni/openssl/crypto/rc5/rc5test.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rc5/rc5test.c
rename to jni/openssl/crypto/rc5/rc5test.c
diff --git a/src/main/jni/openssl/crypto/ripemd/Makefile b/jni/openssl/crypto/ripemd/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/ripemd/Makefile
rename to jni/openssl/crypto/ripemd/Makefile
diff --git a/src/main/jni/openssl/crypto/ripemd/README b/jni/openssl/crypto/ripemd/README
similarity index 100%
rename from src/main/jni/openssl/crypto/ripemd/README
rename to jni/openssl/crypto/ripemd/README
diff --git a/src/main/jni/openssl/crypto/ripemd/asm/rips.cpp b/jni/openssl/crypto/ripemd/asm/rips.cpp
similarity index 100%
rename from src/main/jni/openssl/crypto/ripemd/asm/rips.cpp
rename to jni/openssl/crypto/ripemd/asm/rips.cpp
diff --git a/src/main/jni/openssl/crypto/ripemd/asm/rmd-586.pl b/jni/openssl/crypto/ripemd/asm/rmd-586.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/ripemd/asm/rmd-586.pl
rename to jni/openssl/crypto/ripemd/asm/rmd-586.pl
diff --git a/src/main/jni/openssl/crypto/ripemd/ripemd.h b/jni/openssl/crypto/ripemd/ripemd.h
similarity index 100%
rename from src/main/jni/openssl/crypto/ripemd/ripemd.h
rename to jni/openssl/crypto/ripemd/ripemd.h
diff --git a/src/main/jni/openssl/crypto/ripemd/rmd160.c b/jni/openssl/crypto/ripemd/rmd160.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ripemd/rmd160.c
rename to jni/openssl/crypto/ripemd/rmd160.c
diff --git a/src/main/jni/openssl/crypto/ripemd/rmd_dgst.c b/jni/openssl/crypto/ripemd/rmd_dgst.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ripemd/rmd_dgst.c
rename to jni/openssl/crypto/ripemd/rmd_dgst.c
diff --git a/src/main/jni/openssl/crypto/ripemd/rmd_locl.h b/jni/openssl/crypto/ripemd/rmd_locl.h
similarity index 100%
rename from src/main/jni/openssl/crypto/ripemd/rmd_locl.h
rename to jni/openssl/crypto/ripemd/rmd_locl.h
diff --git a/src/main/jni/openssl/crypto/ripemd/rmd_one.c b/jni/openssl/crypto/ripemd/rmd_one.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ripemd/rmd_one.c
rename to jni/openssl/crypto/ripemd/rmd_one.c
diff --git a/src/main/jni/openssl/crypto/ripemd/rmdconst.h b/jni/openssl/crypto/ripemd/rmdconst.h
similarity index 100%
rename from src/main/jni/openssl/crypto/ripemd/rmdconst.h
rename to jni/openssl/crypto/ripemd/rmdconst.h
diff --git a/src/main/jni/openssl/crypto/ripemd/rmdtest.c b/jni/openssl/crypto/ripemd/rmdtest.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ripemd/rmdtest.c
rename to jni/openssl/crypto/ripemd/rmdtest.c
diff --git a/src/main/jni/openssl/crypto/rsa/Makefile b/jni/openssl/crypto/rsa/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/rsa/Makefile
rename to jni/openssl/crypto/rsa/Makefile
diff --git a/src/main/jni/openssl/crypto/rsa/rsa.h b/jni/openssl/crypto/rsa/rsa.h
similarity index 100%
rename from src/main/jni/openssl/crypto/rsa/rsa.h
rename to jni/openssl/crypto/rsa/rsa.h
diff --git a/src/main/jni/openssl/crypto/rsa/rsa_ameth.c b/jni/openssl/crypto/rsa/rsa_ameth.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rsa/rsa_ameth.c
rename to jni/openssl/crypto/rsa/rsa_ameth.c
diff --git a/src/main/jni/openssl/crypto/rsa/rsa_asn1.c b/jni/openssl/crypto/rsa/rsa_asn1.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rsa/rsa_asn1.c
rename to jni/openssl/crypto/rsa/rsa_asn1.c
diff --git a/src/main/jni/openssl/crypto/rsa/rsa_chk.c b/jni/openssl/crypto/rsa/rsa_chk.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rsa/rsa_chk.c
rename to jni/openssl/crypto/rsa/rsa_chk.c
diff --git a/src/main/jni/openssl/crypto/rsa/rsa_crpt.c b/jni/openssl/crypto/rsa/rsa_crpt.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rsa/rsa_crpt.c
rename to jni/openssl/crypto/rsa/rsa_crpt.c
diff --git a/src/main/jni/openssl/crypto/rsa/rsa_depr.c b/jni/openssl/crypto/rsa/rsa_depr.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rsa/rsa_depr.c
rename to jni/openssl/crypto/rsa/rsa_depr.c
diff --git a/src/main/jni/openssl/crypto/rsa/rsa_eay.c b/jni/openssl/crypto/rsa/rsa_eay.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rsa/rsa_eay.c
rename to jni/openssl/crypto/rsa/rsa_eay.c
diff --git a/src/main/jni/openssl/crypto/rsa/rsa_err.c b/jni/openssl/crypto/rsa/rsa_err.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rsa/rsa_err.c
rename to jni/openssl/crypto/rsa/rsa_err.c
diff --git a/src/main/jni/openssl/crypto/rsa/rsa_gen.c b/jni/openssl/crypto/rsa/rsa_gen.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rsa/rsa_gen.c
rename to jni/openssl/crypto/rsa/rsa_gen.c
diff --git a/src/main/jni/openssl/crypto/rsa/rsa_lib.c b/jni/openssl/crypto/rsa/rsa_lib.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rsa/rsa_lib.c
rename to jni/openssl/crypto/rsa/rsa_lib.c
diff --git a/src/main/jni/openssl/crypto/rsa/rsa_locl.h b/jni/openssl/crypto/rsa/rsa_locl.h
similarity index 100%
rename from src/main/jni/openssl/crypto/rsa/rsa_locl.h
rename to jni/openssl/crypto/rsa/rsa_locl.h
diff --git a/src/main/jni/openssl/crypto/rsa/rsa_none.c b/jni/openssl/crypto/rsa/rsa_none.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rsa/rsa_none.c
rename to jni/openssl/crypto/rsa/rsa_none.c
diff --git a/src/main/jni/openssl/crypto/rsa/rsa_null.c b/jni/openssl/crypto/rsa/rsa_null.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rsa/rsa_null.c
rename to jni/openssl/crypto/rsa/rsa_null.c
diff --git a/src/main/jni/openssl/crypto/rsa/rsa_oaep.c b/jni/openssl/crypto/rsa/rsa_oaep.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rsa/rsa_oaep.c
rename to jni/openssl/crypto/rsa/rsa_oaep.c
diff --git a/src/main/jni/openssl/crypto/rsa/rsa_pk1.c b/jni/openssl/crypto/rsa/rsa_pk1.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rsa/rsa_pk1.c
rename to jni/openssl/crypto/rsa/rsa_pk1.c
diff --git a/src/main/jni/openssl/crypto/rsa/rsa_pmeth.c b/jni/openssl/crypto/rsa/rsa_pmeth.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rsa/rsa_pmeth.c
rename to jni/openssl/crypto/rsa/rsa_pmeth.c
diff --git a/src/main/jni/openssl/crypto/rsa/rsa_prn.c b/jni/openssl/crypto/rsa/rsa_prn.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rsa/rsa_prn.c
rename to jni/openssl/crypto/rsa/rsa_prn.c
diff --git a/src/main/jni/openssl/crypto/rsa/rsa_pss.c b/jni/openssl/crypto/rsa/rsa_pss.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rsa/rsa_pss.c
rename to jni/openssl/crypto/rsa/rsa_pss.c
diff --git a/src/main/jni/openssl/crypto/rsa/rsa_saos.c b/jni/openssl/crypto/rsa/rsa_saos.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rsa/rsa_saos.c
rename to jni/openssl/crypto/rsa/rsa_saos.c
diff --git a/src/main/jni/openssl/crypto/rsa/rsa_sign.c b/jni/openssl/crypto/rsa/rsa_sign.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rsa/rsa_sign.c
rename to jni/openssl/crypto/rsa/rsa_sign.c
diff --git a/src/main/jni/openssl/crypto/rsa/rsa_ssl.c b/jni/openssl/crypto/rsa/rsa_ssl.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rsa/rsa_ssl.c
rename to jni/openssl/crypto/rsa/rsa_ssl.c
diff --git a/src/main/jni/openssl/crypto/rsa/rsa_test.c b/jni/openssl/crypto/rsa/rsa_test.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rsa/rsa_test.c
rename to jni/openssl/crypto/rsa/rsa_test.c
diff --git a/src/main/jni/openssl/crypto/rsa/rsa_x931.c b/jni/openssl/crypto/rsa/rsa_x931.c
similarity index 100%
rename from src/main/jni/openssl/crypto/rsa/rsa_x931.c
rename to jni/openssl/crypto/rsa/rsa_x931.c
diff --git a/src/main/jni/openssl/crypto/s390xcap.c b/jni/openssl/crypto/s390xcap.c
similarity index 100%
rename from src/main/jni/openssl/crypto/s390xcap.c
rename to jni/openssl/crypto/s390xcap.c
diff --git a/src/main/jni/openssl/crypto/s390xcpuid.S b/jni/openssl/crypto/s390xcpuid.S
similarity index 100%
rename from src/main/jni/openssl/crypto/s390xcpuid.S
rename to jni/openssl/crypto/s390xcpuid.S
diff --git a/src/main/jni/openssl/crypto/seed/Makefile b/jni/openssl/crypto/seed/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/seed/Makefile
rename to jni/openssl/crypto/seed/Makefile
diff --git a/src/main/jni/openssl/crypto/seed/seed.c b/jni/openssl/crypto/seed/seed.c
similarity index 100%
rename from src/main/jni/openssl/crypto/seed/seed.c
rename to jni/openssl/crypto/seed/seed.c
diff --git a/src/main/jni/openssl/crypto/seed/seed.h b/jni/openssl/crypto/seed/seed.h
similarity index 100%
rename from src/main/jni/openssl/crypto/seed/seed.h
rename to jni/openssl/crypto/seed/seed.h
diff --git a/src/main/jni/openssl/crypto/seed/seed_cbc.c b/jni/openssl/crypto/seed/seed_cbc.c
similarity index 100%
rename from src/main/jni/openssl/crypto/seed/seed_cbc.c
rename to jni/openssl/crypto/seed/seed_cbc.c
diff --git a/src/main/jni/openssl/crypto/seed/seed_cfb.c b/jni/openssl/crypto/seed/seed_cfb.c
similarity index 100%
rename from src/main/jni/openssl/crypto/seed/seed_cfb.c
rename to jni/openssl/crypto/seed/seed_cfb.c
diff --git a/src/main/jni/openssl/crypto/seed/seed_ecb.c b/jni/openssl/crypto/seed/seed_ecb.c
similarity index 100%
rename from src/main/jni/openssl/crypto/seed/seed_ecb.c
rename to jni/openssl/crypto/seed/seed_ecb.c
diff --git a/src/main/jni/openssl/crypto/seed/seed_locl.h b/jni/openssl/crypto/seed/seed_locl.h
similarity index 100%
rename from src/main/jni/openssl/crypto/seed/seed_locl.h
rename to jni/openssl/crypto/seed/seed_locl.h
diff --git a/src/main/jni/openssl/crypto/seed/seed_ofb.c b/jni/openssl/crypto/seed/seed_ofb.c
similarity index 100%
rename from src/main/jni/openssl/crypto/seed/seed_ofb.c
rename to jni/openssl/crypto/seed/seed_ofb.c
diff --git a/src/main/jni/openssl/crypto/sha/Makefile b/jni/openssl/crypto/sha/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/Makefile
rename to jni/openssl/crypto/sha/Makefile
diff --git a/src/main/jni/openssl/crypto/sha/asm/README b/jni/openssl/crypto/sha/asm/README
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/asm/README
rename to jni/openssl/crypto/sha/asm/README
diff --git a/src/main/jni/openssl/crypto/sha/asm/sha1-586.pl b/jni/openssl/crypto/sha/asm/sha1-586.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/asm/sha1-586.pl
rename to jni/openssl/crypto/sha/asm/sha1-586.pl
diff --git a/src/main/jni/openssl/crypto/sha/asm/sha1-alpha.pl b/jni/openssl/crypto/sha/asm/sha1-alpha.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/asm/sha1-alpha.pl
rename to jni/openssl/crypto/sha/asm/sha1-alpha.pl
diff --git a/src/main/jni/openssl/crypto/sha/asm/sha1-armv4-large.S b/jni/openssl/crypto/sha/asm/sha1-armv4-large.S
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/asm/sha1-armv4-large.S
rename to jni/openssl/crypto/sha/asm/sha1-armv4-large.S
diff --git a/src/main/jni/openssl/crypto/sha/asm/sha1-armv4-large.pl b/jni/openssl/crypto/sha/asm/sha1-armv4-large.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/asm/sha1-armv4-large.pl
rename to jni/openssl/crypto/sha/asm/sha1-armv4-large.pl
diff --git a/src/main/jni/openssl/crypto/sha/asm/sha1-ia64.pl b/jni/openssl/crypto/sha/asm/sha1-ia64.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/asm/sha1-ia64.pl
rename to jni/openssl/crypto/sha/asm/sha1-ia64.pl
diff --git a/src/main/jni/openssl/crypto/sha/asm/sha1-mips.pl b/jni/openssl/crypto/sha/asm/sha1-mips.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/asm/sha1-mips.pl
rename to jni/openssl/crypto/sha/asm/sha1-mips.pl
diff --git a/src/main/jni/openssl/crypto/sha/asm/sha1-parisc.pl b/jni/openssl/crypto/sha/asm/sha1-parisc.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/asm/sha1-parisc.pl
rename to jni/openssl/crypto/sha/asm/sha1-parisc.pl
diff --git a/src/main/jni/openssl/crypto/sha/asm/sha1-ppc.pl b/jni/openssl/crypto/sha/asm/sha1-ppc.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/asm/sha1-ppc.pl
rename to jni/openssl/crypto/sha/asm/sha1-ppc.pl
diff --git a/src/main/jni/openssl/crypto/sha/asm/sha1-s390x.pl b/jni/openssl/crypto/sha/asm/sha1-s390x.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/asm/sha1-s390x.pl
rename to jni/openssl/crypto/sha/asm/sha1-s390x.pl
diff --git a/src/main/jni/openssl/crypto/sha/asm/sha1-sparcv9.pl b/jni/openssl/crypto/sha/asm/sha1-sparcv9.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/asm/sha1-sparcv9.pl
rename to jni/openssl/crypto/sha/asm/sha1-sparcv9.pl
diff --git a/src/main/jni/openssl/crypto/sha/asm/sha1-sparcv9a.pl b/jni/openssl/crypto/sha/asm/sha1-sparcv9a.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/asm/sha1-sparcv9a.pl
rename to jni/openssl/crypto/sha/asm/sha1-sparcv9a.pl
diff --git a/src/main/jni/openssl/crypto/sha/asm/sha1-thumb.pl b/jni/openssl/crypto/sha/asm/sha1-thumb.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/asm/sha1-thumb.pl
rename to jni/openssl/crypto/sha/asm/sha1-thumb.pl
diff --git a/src/main/jni/openssl/crypto/sha/asm/sha1-x86_64.pl b/jni/openssl/crypto/sha/asm/sha1-x86_64.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/asm/sha1-x86_64.pl
rename to jni/openssl/crypto/sha/asm/sha1-x86_64.pl
diff --git a/src/main/jni/openssl/crypto/sha/asm/sha256-586.pl b/jni/openssl/crypto/sha/asm/sha256-586.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/asm/sha256-586.pl
rename to jni/openssl/crypto/sha/asm/sha256-586.pl
diff --git a/src/main/jni/openssl/crypto/sha/asm/sha256-armv4.S b/jni/openssl/crypto/sha/asm/sha256-armv4.S
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/asm/sha256-armv4.S
rename to jni/openssl/crypto/sha/asm/sha256-armv4.S
diff --git a/src/main/jni/openssl/crypto/sha/asm/sha256-armv4.pl b/jni/openssl/crypto/sha/asm/sha256-armv4.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/asm/sha256-armv4.pl
rename to jni/openssl/crypto/sha/asm/sha256-armv4.pl
diff --git a/src/main/jni/openssl/crypto/sha/asm/sha512-586.pl b/jni/openssl/crypto/sha/asm/sha512-586.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/asm/sha512-586.pl
rename to jni/openssl/crypto/sha/asm/sha512-586.pl
diff --git a/src/main/jni/openssl/crypto/sha/asm/sha512-armv4.S b/jni/openssl/crypto/sha/asm/sha512-armv4.S
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/asm/sha512-armv4.S
rename to jni/openssl/crypto/sha/asm/sha512-armv4.S
diff --git a/src/main/jni/openssl/crypto/sha/asm/sha512-armv4.pl b/jni/openssl/crypto/sha/asm/sha512-armv4.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/asm/sha512-armv4.pl
rename to jni/openssl/crypto/sha/asm/sha512-armv4.pl
diff --git a/src/main/jni/openssl/crypto/sha/asm/sha512-ia64.pl b/jni/openssl/crypto/sha/asm/sha512-ia64.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/asm/sha512-ia64.pl
rename to jni/openssl/crypto/sha/asm/sha512-ia64.pl
diff --git a/src/main/jni/openssl/crypto/sha/asm/sha512-mips.pl b/jni/openssl/crypto/sha/asm/sha512-mips.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/asm/sha512-mips.pl
rename to jni/openssl/crypto/sha/asm/sha512-mips.pl
diff --git a/src/main/jni/openssl/crypto/sha/asm/sha512-parisc.pl b/jni/openssl/crypto/sha/asm/sha512-parisc.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/asm/sha512-parisc.pl
rename to jni/openssl/crypto/sha/asm/sha512-parisc.pl
diff --git a/src/main/jni/openssl/crypto/sha/asm/sha512-ppc.pl b/jni/openssl/crypto/sha/asm/sha512-ppc.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/asm/sha512-ppc.pl
rename to jni/openssl/crypto/sha/asm/sha512-ppc.pl
diff --git a/src/main/jni/openssl/crypto/sha/asm/sha512-s390x.pl b/jni/openssl/crypto/sha/asm/sha512-s390x.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/asm/sha512-s390x.pl
rename to jni/openssl/crypto/sha/asm/sha512-s390x.pl
diff --git a/src/main/jni/openssl/crypto/sha/asm/sha512-sparcv9.pl b/jni/openssl/crypto/sha/asm/sha512-sparcv9.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/asm/sha512-sparcv9.pl
rename to jni/openssl/crypto/sha/asm/sha512-sparcv9.pl
diff --git a/src/main/jni/openssl/crypto/sha/asm/sha512-x86_64.pl b/jni/openssl/crypto/sha/asm/sha512-x86_64.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/asm/sha512-x86_64.pl
rename to jni/openssl/crypto/sha/asm/sha512-x86_64.pl
diff --git a/src/main/jni/openssl/crypto/sha/sha.c b/jni/openssl/crypto/sha/sha.c
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/sha.c
rename to jni/openssl/crypto/sha/sha.c
diff --git a/src/main/jni/openssl/crypto/sha/sha.h b/jni/openssl/crypto/sha/sha.h
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/sha.h
rename to jni/openssl/crypto/sha/sha.h
diff --git a/src/main/jni/openssl/crypto/sha/sha1.c b/jni/openssl/crypto/sha/sha1.c
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/sha1.c
rename to jni/openssl/crypto/sha/sha1.c
diff --git a/src/main/jni/openssl/crypto/sha/sha1_one.c b/jni/openssl/crypto/sha/sha1_one.c
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/sha1_one.c
rename to jni/openssl/crypto/sha/sha1_one.c
diff --git a/src/main/jni/openssl/crypto/sha/sha1dgst.c b/jni/openssl/crypto/sha/sha1dgst.c
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/sha1dgst.c
rename to jni/openssl/crypto/sha/sha1dgst.c
diff --git a/src/main/jni/openssl/crypto/sha/sha1test.c b/jni/openssl/crypto/sha/sha1test.c
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/sha1test.c
rename to jni/openssl/crypto/sha/sha1test.c
diff --git a/src/main/jni/openssl/crypto/sha/sha256.c b/jni/openssl/crypto/sha/sha256.c
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/sha256.c
rename to jni/openssl/crypto/sha/sha256.c
diff --git a/src/main/jni/openssl/crypto/sha/sha256t.c b/jni/openssl/crypto/sha/sha256t.c
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/sha256t.c
rename to jni/openssl/crypto/sha/sha256t.c
diff --git a/src/main/jni/openssl/crypto/sha/sha512.c b/jni/openssl/crypto/sha/sha512.c
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/sha512.c
rename to jni/openssl/crypto/sha/sha512.c
diff --git a/src/main/jni/openssl/crypto/sha/sha512t.c b/jni/openssl/crypto/sha/sha512t.c
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/sha512t.c
rename to jni/openssl/crypto/sha/sha512t.c
diff --git a/src/main/jni/openssl/crypto/sha/sha_dgst.c b/jni/openssl/crypto/sha/sha_dgst.c
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/sha_dgst.c
rename to jni/openssl/crypto/sha/sha_dgst.c
diff --git a/src/main/jni/openssl/crypto/sha/sha_locl.h b/jni/openssl/crypto/sha/sha_locl.h
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/sha_locl.h
rename to jni/openssl/crypto/sha/sha_locl.h
diff --git a/src/main/jni/openssl/crypto/sha/sha_one.c b/jni/openssl/crypto/sha/sha_one.c
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/sha_one.c
rename to jni/openssl/crypto/sha/sha_one.c
diff --git a/src/main/jni/openssl/crypto/sha/shatest.c b/jni/openssl/crypto/sha/shatest.c
similarity index 100%
rename from src/main/jni/openssl/crypto/sha/shatest.c
rename to jni/openssl/crypto/sha/shatest.c
diff --git a/src/main/jni/openssl/crypto/sparccpuid.S b/jni/openssl/crypto/sparccpuid.S
similarity index 100%
rename from src/main/jni/openssl/crypto/sparccpuid.S
rename to jni/openssl/crypto/sparccpuid.S
diff --git a/src/main/jni/openssl/crypto/sparcv9cap.c b/jni/openssl/crypto/sparcv9cap.c
similarity index 100%
rename from src/main/jni/openssl/crypto/sparcv9cap.c
rename to jni/openssl/crypto/sparcv9cap.c
diff --git a/src/main/jni/openssl/crypto/srp/Makefile b/jni/openssl/crypto/srp/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/srp/Makefile
rename to jni/openssl/crypto/srp/Makefile
diff --git a/src/main/jni/openssl/crypto/srp/srp.h b/jni/openssl/crypto/srp/srp.h
similarity index 100%
rename from src/main/jni/openssl/crypto/srp/srp.h
rename to jni/openssl/crypto/srp/srp.h
diff --git a/src/main/jni/openssl/crypto/srp/srp_grps.h b/jni/openssl/crypto/srp/srp_grps.h
similarity index 100%
rename from src/main/jni/openssl/crypto/srp/srp_grps.h
rename to jni/openssl/crypto/srp/srp_grps.h
diff --git a/src/main/jni/openssl/crypto/srp/srp_lcl.h b/jni/openssl/crypto/srp/srp_lcl.h
similarity index 100%
rename from src/main/jni/openssl/crypto/srp/srp_lcl.h
rename to jni/openssl/crypto/srp/srp_lcl.h
diff --git a/src/main/jni/openssl/crypto/srp/srp_lib.c b/jni/openssl/crypto/srp/srp_lib.c
similarity index 100%
rename from src/main/jni/openssl/crypto/srp/srp_lib.c
rename to jni/openssl/crypto/srp/srp_lib.c
diff --git a/src/main/jni/openssl/crypto/srp/srp_vfy.c b/jni/openssl/crypto/srp/srp_vfy.c
similarity index 100%
rename from src/main/jni/openssl/crypto/srp/srp_vfy.c
rename to jni/openssl/crypto/srp/srp_vfy.c
diff --git a/src/main/jni/openssl/crypto/srp/srptest.c b/jni/openssl/crypto/srp/srptest.c
similarity index 100%
rename from src/main/jni/openssl/crypto/srp/srptest.c
rename to jni/openssl/crypto/srp/srptest.c
diff --git a/src/main/jni/openssl/crypto/stack/Makefile b/jni/openssl/crypto/stack/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/stack/Makefile
rename to jni/openssl/crypto/stack/Makefile
diff --git a/src/main/jni/openssl/crypto/stack/safestack.h b/jni/openssl/crypto/stack/safestack.h
similarity index 100%
rename from src/main/jni/openssl/crypto/stack/safestack.h
rename to jni/openssl/crypto/stack/safestack.h
diff --git a/src/main/jni/openssl/crypto/stack/stack.c b/jni/openssl/crypto/stack/stack.c
similarity index 100%
rename from src/main/jni/openssl/crypto/stack/stack.c
rename to jni/openssl/crypto/stack/stack.c
diff --git a/src/main/jni/openssl/crypto/stack/stack.h b/jni/openssl/crypto/stack/stack.h
similarity index 100%
rename from src/main/jni/openssl/crypto/stack/stack.h
rename to jni/openssl/crypto/stack/stack.h
diff --git a/src/main/jni/openssl/crypto/store/Makefile b/jni/openssl/crypto/store/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/store/Makefile
rename to jni/openssl/crypto/store/Makefile
diff --git a/src/main/jni/openssl/crypto/store/README b/jni/openssl/crypto/store/README
similarity index 100%
rename from src/main/jni/openssl/crypto/store/README
rename to jni/openssl/crypto/store/README
diff --git a/src/main/jni/openssl/crypto/store/store.h b/jni/openssl/crypto/store/store.h
similarity index 100%
rename from src/main/jni/openssl/crypto/store/store.h
rename to jni/openssl/crypto/store/store.h
diff --git a/src/main/jni/openssl/crypto/store/str_err.c b/jni/openssl/crypto/store/str_err.c
similarity index 100%
rename from src/main/jni/openssl/crypto/store/str_err.c
rename to jni/openssl/crypto/store/str_err.c
diff --git a/src/main/jni/openssl/crypto/store/str_lib.c b/jni/openssl/crypto/store/str_lib.c
similarity index 100%
rename from src/main/jni/openssl/crypto/store/str_lib.c
rename to jni/openssl/crypto/store/str_lib.c
diff --git a/src/main/jni/openssl/crypto/store/str_locl.h b/jni/openssl/crypto/store/str_locl.h
similarity index 100%
rename from src/main/jni/openssl/crypto/store/str_locl.h
rename to jni/openssl/crypto/store/str_locl.h
diff --git a/src/main/jni/openssl/crypto/store/str_mem.c b/jni/openssl/crypto/store/str_mem.c
similarity index 100%
rename from src/main/jni/openssl/crypto/store/str_mem.c
rename to jni/openssl/crypto/store/str_mem.c
diff --git a/src/main/jni/openssl/crypto/store/str_meth.c b/jni/openssl/crypto/store/str_meth.c
similarity index 100%
rename from src/main/jni/openssl/crypto/store/str_meth.c
rename to jni/openssl/crypto/store/str_meth.c
diff --git a/src/main/jni/openssl/crypto/symhacks.h b/jni/openssl/crypto/symhacks.h
similarity index 100%
rename from src/main/jni/openssl/crypto/symhacks.h
rename to jni/openssl/crypto/symhacks.h
diff --git a/src/main/jni/openssl/crypto/threads/README b/jni/openssl/crypto/threads/README
similarity index 100%
rename from src/main/jni/openssl/crypto/threads/README
rename to jni/openssl/crypto/threads/README
diff --git a/src/main/jni/openssl/crypto/threads/mttest.c b/jni/openssl/crypto/threads/mttest.c
similarity index 100%
rename from src/main/jni/openssl/crypto/threads/mttest.c
rename to jni/openssl/crypto/threads/mttest.c
diff --git a/src/main/jni/openssl/crypto/threads/netware.bat b/jni/openssl/crypto/threads/netware.bat
similarity index 100%
rename from src/main/jni/openssl/crypto/threads/netware.bat
rename to jni/openssl/crypto/threads/netware.bat
diff --git a/src/main/jni/openssl/crypto/threads/profile.sh b/jni/openssl/crypto/threads/profile.sh
similarity index 100%
rename from src/main/jni/openssl/crypto/threads/profile.sh
rename to jni/openssl/crypto/threads/profile.sh
diff --git a/src/main/jni/openssl/crypto/threads/ptest.bat b/jni/openssl/crypto/threads/ptest.bat
similarity index 100%
rename from src/main/jni/openssl/crypto/threads/ptest.bat
rename to jni/openssl/crypto/threads/ptest.bat
diff --git a/src/main/jni/openssl/crypto/threads/pthread.sh b/jni/openssl/crypto/threads/pthread.sh
similarity index 100%
rename from src/main/jni/openssl/crypto/threads/pthread.sh
rename to jni/openssl/crypto/threads/pthread.sh
diff --git a/src/main/jni/openssl/crypto/threads/pthread2.sh b/jni/openssl/crypto/threads/pthread2.sh
similarity index 100%
rename from src/main/jni/openssl/crypto/threads/pthread2.sh
rename to jni/openssl/crypto/threads/pthread2.sh
diff --git a/src/main/jni/openssl/crypto/threads/pthreads-vms.com b/jni/openssl/crypto/threads/pthreads-vms.com
similarity index 100%
rename from src/main/jni/openssl/crypto/threads/pthreads-vms.com
rename to jni/openssl/crypto/threads/pthreads-vms.com
diff --git a/src/main/jni/openssl/crypto/threads/purify.sh b/jni/openssl/crypto/threads/purify.sh
similarity index 100%
rename from src/main/jni/openssl/crypto/threads/purify.sh
rename to jni/openssl/crypto/threads/purify.sh
diff --git a/src/main/jni/openssl/crypto/threads/solaris.sh b/jni/openssl/crypto/threads/solaris.sh
similarity index 100%
rename from src/main/jni/openssl/crypto/threads/solaris.sh
rename to jni/openssl/crypto/threads/solaris.sh
diff --git a/src/main/jni/openssl/crypto/threads/th-lock.c b/jni/openssl/crypto/threads/th-lock.c
similarity index 100%
rename from src/main/jni/openssl/crypto/threads/th-lock.c
rename to jni/openssl/crypto/threads/th-lock.c
diff --git a/src/main/jni/openssl/crypto/threads/win32.bat b/jni/openssl/crypto/threads/win32.bat
similarity index 100%
rename from src/main/jni/openssl/crypto/threads/win32.bat
rename to jni/openssl/crypto/threads/win32.bat
diff --git a/src/main/jni/openssl/crypto/ts/Makefile b/jni/openssl/crypto/ts/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/ts/Makefile
rename to jni/openssl/crypto/ts/Makefile
diff --git a/src/main/jni/openssl/crypto/ts/ts.h b/jni/openssl/crypto/ts/ts.h
similarity index 100%
rename from src/main/jni/openssl/crypto/ts/ts.h
rename to jni/openssl/crypto/ts/ts.h
diff --git a/src/main/jni/openssl/crypto/ts/ts_asn1.c b/jni/openssl/crypto/ts/ts_asn1.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ts/ts_asn1.c
rename to jni/openssl/crypto/ts/ts_asn1.c
diff --git a/src/main/jni/openssl/crypto/ts/ts_conf.c b/jni/openssl/crypto/ts/ts_conf.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ts/ts_conf.c
rename to jni/openssl/crypto/ts/ts_conf.c
diff --git a/src/main/jni/openssl/crypto/ts/ts_err.c b/jni/openssl/crypto/ts/ts_err.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ts/ts_err.c
rename to jni/openssl/crypto/ts/ts_err.c
diff --git a/src/main/jni/openssl/crypto/ts/ts_lib.c b/jni/openssl/crypto/ts/ts_lib.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ts/ts_lib.c
rename to jni/openssl/crypto/ts/ts_lib.c
diff --git a/src/main/jni/openssl/crypto/ts/ts_req_print.c b/jni/openssl/crypto/ts/ts_req_print.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ts/ts_req_print.c
rename to jni/openssl/crypto/ts/ts_req_print.c
diff --git a/src/main/jni/openssl/crypto/ts/ts_req_utils.c b/jni/openssl/crypto/ts/ts_req_utils.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ts/ts_req_utils.c
rename to jni/openssl/crypto/ts/ts_req_utils.c
diff --git a/src/main/jni/openssl/crypto/ts/ts_rsp_print.c b/jni/openssl/crypto/ts/ts_rsp_print.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ts/ts_rsp_print.c
rename to jni/openssl/crypto/ts/ts_rsp_print.c
diff --git a/src/main/jni/openssl/crypto/ts/ts_rsp_sign.c b/jni/openssl/crypto/ts/ts_rsp_sign.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ts/ts_rsp_sign.c
rename to jni/openssl/crypto/ts/ts_rsp_sign.c
diff --git a/src/main/jni/openssl/crypto/ts/ts_rsp_utils.c b/jni/openssl/crypto/ts/ts_rsp_utils.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ts/ts_rsp_utils.c
rename to jni/openssl/crypto/ts/ts_rsp_utils.c
diff --git a/src/main/jni/openssl/crypto/ts/ts_rsp_verify.c b/jni/openssl/crypto/ts/ts_rsp_verify.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ts/ts_rsp_verify.c
rename to jni/openssl/crypto/ts/ts_rsp_verify.c
diff --git a/src/main/jni/openssl/crypto/ts/ts_verify_ctx.c b/jni/openssl/crypto/ts/ts_verify_ctx.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ts/ts_verify_ctx.c
rename to jni/openssl/crypto/ts/ts_verify_ctx.c
diff --git a/src/main/jni/openssl/crypto/txt_db/Makefile b/jni/openssl/crypto/txt_db/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/txt_db/Makefile
rename to jni/openssl/crypto/txt_db/Makefile
diff --git a/src/main/jni/openssl/crypto/txt_db/txt_db.c b/jni/openssl/crypto/txt_db/txt_db.c
similarity index 100%
rename from src/main/jni/openssl/crypto/txt_db/txt_db.c
rename to jni/openssl/crypto/txt_db/txt_db.c
diff --git a/src/main/jni/openssl/crypto/txt_db/txt_db.h b/jni/openssl/crypto/txt_db/txt_db.h
similarity index 100%
rename from src/main/jni/openssl/crypto/txt_db/txt_db.h
rename to jni/openssl/crypto/txt_db/txt_db.h
diff --git a/src/main/jni/openssl/crypto/ui/Makefile b/jni/openssl/crypto/ui/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/ui/Makefile
rename to jni/openssl/crypto/ui/Makefile
diff --git a/src/main/jni/openssl/crypto/ui/ui.h b/jni/openssl/crypto/ui/ui.h
similarity index 100%
rename from src/main/jni/openssl/crypto/ui/ui.h
rename to jni/openssl/crypto/ui/ui.h
diff --git a/src/main/jni/openssl/crypto/ui/ui_compat.c b/jni/openssl/crypto/ui/ui_compat.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ui/ui_compat.c
rename to jni/openssl/crypto/ui/ui_compat.c
diff --git a/src/main/jni/openssl/crypto/ui/ui_compat.h b/jni/openssl/crypto/ui/ui_compat.h
similarity index 100%
rename from src/main/jni/openssl/crypto/ui/ui_compat.h
rename to jni/openssl/crypto/ui/ui_compat.h
diff --git a/src/main/jni/openssl/crypto/ui/ui_err.c b/jni/openssl/crypto/ui/ui_err.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ui/ui_err.c
rename to jni/openssl/crypto/ui/ui_err.c
diff --git a/src/main/jni/openssl/crypto/ui/ui_lib.c b/jni/openssl/crypto/ui/ui_lib.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ui/ui_lib.c
rename to jni/openssl/crypto/ui/ui_lib.c
diff --git a/src/main/jni/openssl/crypto/ui/ui_locl.h b/jni/openssl/crypto/ui/ui_locl.h
similarity index 100%
rename from src/main/jni/openssl/crypto/ui/ui_locl.h
rename to jni/openssl/crypto/ui/ui_locl.h
diff --git a/src/main/jni/openssl/crypto/ui/ui_openssl.c b/jni/openssl/crypto/ui/ui_openssl.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ui/ui_openssl.c
rename to jni/openssl/crypto/ui/ui_openssl.c
diff --git a/src/main/jni/openssl/crypto/ui/ui_util.c b/jni/openssl/crypto/ui/ui_util.c
similarity index 100%
rename from src/main/jni/openssl/crypto/ui/ui_util.c
rename to jni/openssl/crypto/ui/ui_util.c
diff --git a/src/main/jni/openssl/crypto/uid.c b/jni/openssl/crypto/uid.c
similarity index 100%
rename from src/main/jni/openssl/crypto/uid.c
rename to jni/openssl/crypto/uid.c
diff --git a/src/main/jni/openssl/crypto/vms_rms.h b/jni/openssl/crypto/vms_rms.h
similarity index 100%
rename from src/main/jni/openssl/crypto/vms_rms.h
rename to jni/openssl/crypto/vms_rms.h
diff --git a/src/main/jni/openssl/crypto/whrlpool/Makefile b/jni/openssl/crypto/whrlpool/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/whrlpool/Makefile
rename to jni/openssl/crypto/whrlpool/Makefile
diff --git a/src/main/jni/openssl/crypto/whrlpool/asm/wp-mmx.pl b/jni/openssl/crypto/whrlpool/asm/wp-mmx.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/whrlpool/asm/wp-mmx.pl
rename to jni/openssl/crypto/whrlpool/asm/wp-mmx.pl
diff --git a/src/main/jni/openssl/crypto/whrlpool/asm/wp-x86_64.pl b/jni/openssl/crypto/whrlpool/asm/wp-x86_64.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/whrlpool/asm/wp-x86_64.pl
rename to jni/openssl/crypto/whrlpool/asm/wp-x86_64.pl
diff --git a/src/main/jni/openssl/crypto/whrlpool/whrlpool.h b/jni/openssl/crypto/whrlpool/whrlpool.h
similarity index 100%
rename from src/main/jni/openssl/crypto/whrlpool/whrlpool.h
rename to jni/openssl/crypto/whrlpool/whrlpool.h
diff --git a/src/main/jni/openssl/crypto/whrlpool/wp_block.c b/jni/openssl/crypto/whrlpool/wp_block.c
similarity index 100%
rename from src/main/jni/openssl/crypto/whrlpool/wp_block.c
rename to jni/openssl/crypto/whrlpool/wp_block.c
diff --git a/src/main/jni/openssl/crypto/whrlpool/wp_dgst.c b/jni/openssl/crypto/whrlpool/wp_dgst.c
similarity index 100%
rename from src/main/jni/openssl/crypto/whrlpool/wp_dgst.c
rename to jni/openssl/crypto/whrlpool/wp_dgst.c
diff --git a/src/main/jni/openssl/crypto/whrlpool/wp_locl.h b/jni/openssl/crypto/whrlpool/wp_locl.h
similarity index 100%
rename from src/main/jni/openssl/crypto/whrlpool/wp_locl.h
rename to jni/openssl/crypto/whrlpool/wp_locl.h
diff --git a/src/main/jni/openssl/crypto/whrlpool/wp_test.c b/jni/openssl/crypto/whrlpool/wp_test.c
similarity index 100%
rename from src/main/jni/openssl/crypto/whrlpool/wp_test.c
rename to jni/openssl/crypto/whrlpool/wp_test.c
diff --git a/src/main/jni/openssl/crypto/x509/Makefile b/jni/openssl/crypto/x509/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/x509/Makefile
rename to jni/openssl/crypto/x509/Makefile
diff --git a/src/main/jni/openssl/crypto/x509/by_dir.c b/jni/openssl/crypto/x509/by_dir.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509/by_dir.c
rename to jni/openssl/crypto/x509/by_dir.c
diff --git a/src/main/jni/openssl/crypto/x509/by_file.c b/jni/openssl/crypto/x509/by_file.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509/by_file.c
rename to jni/openssl/crypto/x509/by_file.c
diff --git a/src/main/jni/openssl/crypto/x509/x509.h b/jni/openssl/crypto/x509/x509.h
similarity index 100%
rename from src/main/jni/openssl/crypto/x509/x509.h
rename to jni/openssl/crypto/x509/x509.h
diff --git a/src/main/jni/openssl/crypto/x509/x509_att.c b/jni/openssl/crypto/x509/x509_att.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509/x509_att.c
rename to jni/openssl/crypto/x509/x509_att.c
diff --git a/src/main/jni/openssl/crypto/x509/x509_cmp.c b/jni/openssl/crypto/x509/x509_cmp.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509/x509_cmp.c
rename to jni/openssl/crypto/x509/x509_cmp.c
diff --git a/src/main/jni/openssl/crypto/x509/x509_d2.c b/jni/openssl/crypto/x509/x509_d2.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509/x509_d2.c
rename to jni/openssl/crypto/x509/x509_d2.c
diff --git a/src/main/jni/openssl/crypto/x509/x509_def.c b/jni/openssl/crypto/x509/x509_def.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509/x509_def.c
rename to jni/openssl/crypto/x509/x509_def.c
diff --git a/src/main/jni/openssl/crypto/x509/x509_err.c b/jni/openssl/crypto/x509/x509_err.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509/x509_err.c
rename to jni/openssl/crypto/x509/x509_err.c
diff --git a/src/main/jni/openssl/crypto/x509/x509_ext.c b/jni/openssl/crypto/x509/x509_ext.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509/x509_ext.c
rename to jni/openssl/crypto/x509/x509_ext.c
diff --git a/src/main/jni/openssl/crypto/x509/x509_lu.c b/jni/openssl/crypto/x509/x509_lu.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509/x509_lu.c
rename to jni/openssl/crypto/x509/x509_lu.c
diff --git a/src/main/jni/openssl/crypto/x509/x509_obj.c b/jni/openssl/crypto/x509/x509_obj.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509/x509_obj.c
rename to jni/openssl/crypto/x509/x509_obj.c
diff --git a/src/main/jni/openssl/crypto/x509/x509_r2x.c b/jni/openssl/crypto/x509/x509_r2x.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509/x509_r2x.c
rename to jni/openssl/crypto/x509/x509_r2x.c
diff --git a/src/main/jni/openssl/crypto/x509/x509_req.c b/jni/openssl/crypto/x509/x509_req.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509/x509_req.c
rename to jni/openssl/crypto/x509/x509_req.c
diff --git a/src/main/jni/openssl/crypto/x509/x509_set.c b/jni/openssl/crypto/x509/x509_set.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509/x509_set.c
rename to jni/openssl/crypto/x509/x509_set.c
diff --git a/src/main/jni/openssl/crypto/x509/x509_trs.c b/jni/openssl/crypto/x509/x509_trs.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509/x509_trs.c
rename to jni/openssl/crypto/x509/x509_trs.c
diff --git a/src/main/jni/openssl/crypto/x509/x509_txt.c b/jni/openssl/crypto/x509/x509_txt.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509/x509_txt.c
rename to jni/openssl/crypto/x509/x509_txt.c
diff --git a/src/main/jni/openssl/crypto/x509/x509_v3.c b/jni/openssl/crypto/x509/x509_v3.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509/x509_v3.c
rename to jni/openssl/crypto/x509/x509_v3.c
diff --git a/src/main/jni/openssl/crypto/x509/x509_vfy.c b/jni/openssl/crypto/x509/x509_vfy.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509/x509_vfy.c
rename to jni/openssl/crypto/x509/x509_vfy.c
diff --git a/src/main/jni/openssl/crypto/x509/x509_vfy.h b/jni/openssl/crypto/x509/x509_vfy.h
similarity index 100%
rename from src/main/jni/openssl/crypto/x509/x509_vfy.h
rename to jni/openssl/crypto/x509/x509_vfy.h
diff --git a/src/main/jni/openssl/crypto/x509/x509_vpm.c b/jni/openssl/crypto/x509/x509_vpm.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509/x509_vpm.c
rename to jni/openssl/crypto/x509/x509_vpm.c
diff --git a/src/main/jni/openssl/crypto/x509/x509cset.c b/jni/openssl/crypto/x509/x509cset.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509/x509cset.c
rename to jni/openssl/crypto/x509/x509cset.c
diff --git a/src/main/jni/openssl/crypto/x509/x509name.c b/jni/openssl/crypto/x509/x509name.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509/x509name.c
rename to jni/openssl/crypto/x509/x509name.c
diff --git a/src/main/jni/openssl/crypto/x509/x509rset.c b/jni/openssl/crypto/x509/x509rset.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509/x509rset.c
rename to jni/openssl/crypto/x509/x509rset.c
diff --git a/src/main/jni/openssl/crypto/x509/x509spki.c b/jni/openssl/crypto/x509/x509spki.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509/x509spki.c
rename to jni/openssl/crypto/x509/x509spki.c
diff --git a/src/main/jni/openssl/crypto/x509/x509type.c b/jni/openssl/crypto/x509/x509type.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509/x509type.c
rename to jni/openssl/crypto/x509/x509type.c
diff --git a/src/main/jni/openssl/crypto/x509/x_all.c b/jni/openssl/crypto/x509/x_all.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509/x_all.c
rename to jni/openssl/crypto/x509/x_all.c
diff --git a/src/main/jni/openssl/crypto/x509v3/Makefile b/jni/openssl/crypto/x509v3/Makefile
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/Makefile
rename to jni/openssl/crypto/x509v3/Makefile
diff --git a/src/main/jni/openssl/crypto/x509v3/ext_dat.h b/jni/openssl/crypto/x509v3/ext_dat.h
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/ext_dat.h
rename to jni/openssl/crypto/x509v3/ext_dat.h
diff --git a/src/main/jni/openssl/crypto/x509v3/pcy_cache.c b/jni/openssl/crypto/x509v3/pcy_cache.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/pcy_cache.c
rename to jni/openssl/crypto/x509v3/pcy_cache.c
diff --git a/src/main/jni/openssl/crypto/x509v3/pcy_data.c b/jni/openssl/crypto/x509v3/pcy_data.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/pcy_data.c
rename to jni/openssl/crypto/x509v3/pcy_data.c
diff --git a/src/main/jni/openssl/crypto/x509v3/pcy_int.h b/jni/openssl/crypto/x509v3/pcy_int.h
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/pcy_int.h
rename to jni/openssl/crypto/x509v3/pcy_int.h
diff --git a/src/main/jni/openssl/crypto/x509v3/pcy_lib.c b/jni/openssl/crypto/x509v3/pcy_lib.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/pcy_lib.c
rename to jni/openssl/crypto/x509v3/pcy_lib.c
diff --git a/src/main/jni/openssl/crypto/x509v3/pcy_map.c b/jni/openssl/crypto/x509v3/pcy_map.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/pcy_map.c
rename to jni/openssl/crypto/x509v3/pcy_map.c
diff --git a/src/main/jni/openssl/crypto/x509v3/pcy_node.c b/jni/openssl/crypto/x509v3/pcy_node.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/pcy_node.c
rename to jni/openssl/crypto/x509v3/pcy_node.c
diff --git a/src/main/jni/openssl/crypto/x509v3/pcy_tree.c b/jni/openssl/crypto/x509v3/pcy_tree.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/pcy_tree.c
rename to jni/openssl/crypto/x509v3/pcy_tree.c
diff --git a/src/main/jni/openssl/crypto/x509v3/tabtest.c b/jni/openssl/crypto/x509v3/tabtest.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/tabtest.c
rename to jni/openssl/crypto/x509v3/tabtest.c
diff --git a/src/main/jni/openssl/crypto/x509v3/v3_addr.c b/jni/openssl/crypto/x509v3/v3_addr.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/v3_addr.c
rename to jni/openssl/crypto/x509v3/v3_addr.c
diff --git a/src/main/jni/openssl/crypto/x509v3/v3_akey.c b/jni/openssl/crypto/x509v3/v3_akey.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/v3_akey.c
rename to jni/openssl/crypto/x509v3/v3_akey.c
diff --git a/src/main/jni/openssl/crypto/x509v3/v3_akeya.c b/jni/openssl/crypto/x509v3/v3_akeya.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/v3_akeya.c
rename to jni/openssl/crypto/x509v3/v3_akeya.c
diff --git a/src/main/jni/openssl/crypto/x509v3/v3_alt.c b/jni/openssl/crypto/x509v3/v3_alt.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/v3_alt.c
rename to jni/openssl/crypto/x509v3/v3_alt.c
diff --git a/src/main/jni/openssl/crypto/x509v3/v3_asid.c b/jni/openssl/crypto/x509v3/v3_asid.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/v3_asid.c
rename to jni/openssl/crypto/x509v3/v3_asid.c
diff --git a/src/main/jni/openssl/crypto/x509v3/v3_bcons.c b/jni/openssl/crypto/x509v3/v3_bcons.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/v3_bcons.c
rename to jni/openssl/crypto/x509v3/v3_bcons.c
diff --git a/src/main/jni/openssl/crypto/x509v3/v3_bitst.c b/jni/openssl/crypto/x509v3/v3_bitst.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/v3_bitst.c
rename to jni/openssl/crypto/x509v3/v3_bitst.c
diff --git a/src/main/jni/openssl/crypto/x509v3/v3_conf.c b/jni/openssl/crypto/x509v3/v3_conf.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/v3_conf.c
rename to jni/openssl/crypto/x509v3/v3_conf.c
diff --git a/src/main/jni/openssl/crypto/x509v3/v3_cpols.c b/jni/openssl/crypto/x509v3/v3_cpols.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/v3_cpols.c
rename to jni/openssl/crypto/x509v3/v3_cpols.c
diff --git a/src/main/jni/openssl/crypto/x509v3/v3_crld.c b/jni/openssl/crypto/x509v3/v3_crld.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/v3_crld.c
rename to jni/openssl/crypto/x509v3/v3_crld.c
diff --git a/src/main/jni/openssl/crypto/x509v3/v3_enum.c b/jni/openssl/crypto/x509v3/v3_enum.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/v3_enum.c
rename to jni/openssl/crypto/x509v3/v3_enum.c
diff --git a/src/main/jni/openssl/crypto/x509v3/v3_extku.c b/jni/openssl/crypto/x509v3/v3_extku.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/v3_extku.c
rename to jni/openssl/crypto/x509v3/v3_extku.c
diff --git a/src/main/jni/openssl/crypto/x509v3/v3_genn.c b/jni/openssl/crypto/x509v3/v3_genn.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/v3_genn.c
rename to jni/openssl/crypto/x509v3/v3_genn.c
diff --git a/src/main/jni/openssl/crypto/x509v3/v3_ia5.c b/jni/openssl/crypto/x509v3/v3_ia5.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/v3_ia5.c
rename to jni/openssl/crypto/x509v3/v3_ia5.c
diff --git a/src/main/jni/openssl/crypto/x509v3/v3_info.c b/jni/openssl/crypto/x509v3/v3_info.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/v3_info.c
rename to jni/openssl/crypto/x509v3/v3_info.c
diff --git a/src/main/jni/openssl/crypto/x509v3/v3_int.c b/jni/openssl/crypto/x509v3/v3_int.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/v3_int.c
rename to jni/openssl/crypto/x509v3/v3_int.c
diff --git a/src/main/jni/openssl/crypto/x509v3/v3_lib.c b/jni/openssl/crypto/x509v3/v3_lib.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/v3_lib.c
rename to jni/openssl/crypto/x509v3/v3_lib.c
diff --git a/src/main/jni/openssl/crypto/x509v3/v3_ncons.c b/jni/openssl/crypto/x509v3/v3_ncons.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/v3_ncons.c
rename to jni/openssl/crypto/x509v3/v3_ncons.c
diff --git a/src/main/jni/openssl/crypto/x509v3/v3_ocsp.c b/jni/openssl/crypto/x509v3/v3_ocsp.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/v3_ocsp.c
rename to jni/openssl/crypto/x509v3/v3_ocsp.c
diff --git a/src/main/jni/openssl/crypto/x509v3/v3_pci.c b/jni/openssl/crypto/x509v3/v3_pci.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/v3_pci.c
rename to jni/openssl/crypto/x509v3/v3_pci.c
diff --git a/src/main/jni/openssl/crypto/x509v3/v3_pcia.c b/jni/openssl/crypto/x509v3/v3_pcia.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/v3_pcia.c
rename to jni/openssl/crypto/x509v3/v3_pcia.c
diff --git a/src/main/jni/openssl/crypto/x509v3/v3_pcons.c b/jni/openssl/crypto/x509v3/v3_pcons.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/v3_pcons.c
rename to jni/openssl/crypto/x509v3/v3_pcons.c
diff --git a/src/main/jni/openssl/crypto/x509v3/v3_pku.c b/jni/openssl/crypto/x509v3/v3_pku.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/v3_pku.c
rename to jni/openssl/crypto/x509v3/v3_pku.c
diff --git a/src/main/jni/openssl/crypto/x509v3/v3_pmaps.c b/jni/openssl/crypto/x509v3/v3_pmaps.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/v3_pmaps.c
rename to jni/openssl/crypto/x509v3/v3_pmaps.c
diff --git a/src/main/jni/openssl/crypto/x509v3/v3_prn.c b/jni/openssl/crypto/x509v3/v3_prn.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/v3_prn.c
rename to jni/openssl/crypto/x509v3/v3_prn.c
diff --git a/src/main/jni/openssl/crypto/x509v3/v3_purp.c b/jni/openssl/crypto/x509v3/v3_purp.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/v3_purp.c
rename to jni/openssl/crypto/x509v3/v3_purp.c
diff --git a/src/main/jni/openssl/crypto/x509v3/v3_skey.c b/jni/openssl/crypto/x509v3/v3_skey.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/v3_skey.c
rename to jni/openssl/crypto/x509v3/v3_skey.c
diff --git a/src/main/jni/openssl/crypto/x509v3/v3_sxnet.c b/jni/openssl/crypto/x509v3/v3_sxnet.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/v3_sxnet.c
rename to jni/openssl/crypto/x509v3/v3_sxnet.c
diff --git a/src/main/jni/openssl/crypto/x509v3/v3_utl.c b/jni/openssl/crypto/x509v3/v3_utl.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/v3_utl.c
rename to jni/openssl/crypto/x509v3/v3_utl.c
diff --git a/src/main/jni/openssl/crypto/x509v3/v3conf.c b/jni/openssl/crypto/x509v3/v3conf.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/v3conf.c
rename to jni/openssl/crypto/x509v3/v3conf.c
diff --git a/src/main/jni/openssl/crypto/x509v3/v3err.c b/jni/openssl/crypto/x509v3/v3err.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/v3err.c
rename to jni/openssl/crypto/x509v3/v3err.c
diff --git a/src/main/jni/openssl/crypto/x509v3/v3prin.c b/jni/openssl/crypto/x509v3/v3prin.c
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/v3prin.c
rename to jni/openssl/crypto/x509v3/v3prin.c
diff --git a/src/main/jni/openssl/crypto/x509v3/x509v3.h b/jni/openssl/crypto/x509v3/x509v3.h
similarity index 100%
rename from src/main/jni/openssl/crypto/x509v3/x509v3.h
rename to jni/openssl/crypto/x509v3/x509v3.h
diff --git a/src/main/jni/openssl/crypto/x86_64cpuid.pl b/jni/openssl/crypto/x86_64cpuid.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/x86_64cpuid.pl
rename to jni/openssl/crypto/x86_64cpuid.pl
diff --git a/src/main/jni/openssl/crypto/x86cpuid.pl b/jni/openssl/crypto/x86cpuid.pl
similarity index 100%
rename from src/main/jni/openssl/crypto/x86cpuid.pl
rename to jni/openssl/crypto/x86cpuid.pl
diff --git a/src/main/jni/openssl/e_os.h b/jni/openssl/e_os.h
similarity index 100%
rename from src/main/jni/openssl/e_os.h
rename to jni/openssl/e_os.h
diff --git a/src/main/jni/openssl/e_os2.h b/jni/openssl/e_os2.h
similarity index 100%
rename from src/main/jni/openssl/e_os2.h
rename to jni/openssl/e_os2.h
diff --git a/src/main/jni/openssl/include/openssl/aes.h b/jni/openssl/include/openssl/aes.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/aes.h
rename to jni/openssl/include/openssl/aes.h
diff --git a/src/main/jni/openssl/include/openssl/asn1.h b/jni/openssl/include/openssl/asn1.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/asn1.h
rename to jni/openssl/include/openssl/asn1.h
diff --git a/src/main/jni/openssl/include/openssl/asn1_mac.h b/jni/openssl/include/openssl/asn1_mac.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/asn1_mac.h
rename to jni/openssl/include/openssl/asn1_mac.h
diff --git a/src/main/jni/openssl/include/openssl/asn1t.h b/jni/openssl/include/openssl/asn1t.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/asn1t.h
rename to jni/openssl/include/openssl/asn1t.h
diff --git a/src/main/jni/openssl/include/openssl/bio.h b/jni/openssl/include/openssl/bio.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/bio.h
rename to jni/openssl/include/openssl/bio.h
diff --git a/src/main/jni/openssl/include/openssl/blowfish.h b/jni/openssl/include/openssl/blowfish.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/blowfish.h
rename to jni/openssl/include/openssl/blowfish.h
diff --git a/src/main/jni/openssl/include/openssl/bn.h b/jni/openssl/include/openssl/bn.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/bn.h
rename to jni/openssl/include/openssl/bn.h
diff --git a/src/main/jni/openssl/include/openssl/buffer.h b/jni/openssl/include/openssl/buffer.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/buffer.h
rename to jni/openssl/include/openssl/buffer.h
diff --git a/src/main/jni/openssl/include/openssl/camellia.h b/jni/openssl/include/openssl/camellia.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/camellia.h
rename to jni/openssl/include/openssl/camellia.h
diff --git a/src/main/jni/openssl/include/openssl/cast.h b/jni/openssl/include/openssl/cast.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/cast.h
rename to jni/openssl/include/openssl/cast.h
diff --git a/src/main/jni/openssl/include/openssl/cmac.h b/jni/openssl/include/openssl/cmac.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/cmac.h
rename to jni/openssl/include/openssl/cmac.h
diff --git a/src/main/jni/openssl/include/openssl/comp.h b/jni/openssl/include/openssl/comp.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/comp.h
rename to jni/openssl/include/openssl/comp.h
diff --git a/src/main/jni/openssl/include/openssl/conf.h b/jni/openssl/include/openssl/conf.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/conf.h
rename to jni/openssl/include/openssl/conf.h
diff --git a/src/main/jni/openssl/include/openssl/conf_api.h b/jni/openssl/include/openssl/conf_api.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/conf_api.h
rename to jni/openssl/include/openssl/conf_api.h
diff --git a/src/main/jni/openssl/include/openssl/crypto.h b/jni/openssl/include/openssl/crypto.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/crypto.h
rename to jni/openssl/include/openssl/crypto.h
diff --git a/src/main/jni/openssl/include/openssl/des.h b/jni/openssl/include/openssl/des.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/des.h
rename to jni/openssl/include/openssl/des.h
diff --git a/src/main/jni/openssl/include/openssl/des_old.h b/jni/openssl/include/openssl/des_old.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/des_old.h
rename to jni/openssl/include/openssl/des_old.h
diff --git a/src/main/jni/openssl/include/openssl/dh.h b/jni/openssl/include/openssl/dh.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/dh.h
rename to jni/openssl/include/openssl/dh.h
diff --git a/src/main/jni/openssl/include/openssl/dsa.h b/jni/openssl/include/openssl/dsa.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/dsa.h
rename to jni/openssl/include/openssl/dsa.h
diff --git a/src/main/jni/openssl/include/openssl/dso.h b/jni/openssl/include/openssl/dso.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/dso.h
rename to jni/openssl/include/openssl/dso.h
diff --git a/src/main/jni/openssl/include/openssl/dtls1.h b/jni/openssl/include/openssl/dtls1.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/dtls1.h
rename to jni/openssl/include/openssl/dtls1.h
diff --git a/src/main/jni/openssl/include/openssl/e_os2.h b/jni/openssl/include/openssl/e_os2.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/e_os2.h
rename to jni/openssl/include/openssl/e_os2.h
diff --git a/src/main/jni/openssl/include/openssl/ebcdic.h b/jni/openssl/include/openssl/ebcdic.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/ebcdic.h
rename to jni/openssl/include/openssl/ebcdic.h
diff --git a/src/main/jni/openssl/include/openssl/ec.h b/jni/openssl/include/openssl/ec.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/ec.h
rename to jni/openssl/include/openssl/ec.h
diff --git a/src/main/jni/openssl/include/openssl/ecdh.h b/jni/openssl/include/openssl/ecdh.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/ecdh.h
rename to jni/openssl/include/openssl/ecdh.h
diff --git a/src/main/jni/openssl/include/openssl/ecdsa.h b/jni/openssl/include/openssl/ecdsa.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/ecdsa.h
rename to jni/openssl/include/openssl/ecdsa.h
diff --git a/src/main/jni/openssl/include/openssl/engine.h b/jni/openssl/include/openssl/engine.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/engine.h
rename to jni/openssl/include/openssl/engine.h
diff --git a/src/main/jni/openssl/include/openssl/err.h b/jni/openssl/include/openssl/err.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/err.h
rename to jni/openssl/include/openssl/err.h
diff --git a/src/main/jni/openssl/include/openssl/evp.h b/jni/openssl/include/openssl/evp.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/evp.h
rename to jni/openssl/include/openssl/evp.h
diff --git a/src/main/jni/openssl/include/openssl/hmac.h b/jni/openssl/include/openssl/hmac.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/hmac.h
rename to jni/openssl/include/openssl/hmac.h
diff --git a/src/main/jni/openssl/include/openssl/idea.h b/jni/openssl/include/openssl/idea.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/idea.h
rename to jni/openssl/include/openssl/idea.h
diff --git a/src/main/jni/openssl/include/openssl/krb5_asn.h b/jni/openssl/include/openssl/krb5_asn.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/krb5_asn.h
rename to jni/openssl/include/openssl/krb5_asn.h
diff --git a/src/main/jni/openssl/include/openssl/kssl.h b/jni/openssl/include/openssl/kssl.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/kssl.h
rename to jni/openssl/include/openssl/kssl.h
diff --git a/src/main/jni/openssl/include/openssl/lhash.h b/jni/openssl/include/openssl/lhash.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/lhash.h
rename to jni/openssl/include/openssl/lhash.h
diff --git a/src/main/jni/openssl/include/openssl/md4.h b/jni/openssl/include/openssl/md4.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/md4.h
rename to jni/openssl/include/openssl/md4.h
diff --git a/src/main/jni/openssl/include/openssl/md5.h b/jni/openssl/include/openssl/md5.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/md5.h
rename to jni/openssl/include/openssl/md5.h
diff --git a/src/main/jni/openssl/include/openssl/mdc2.h b/jni/openssl/include/openssl/mdc2.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/mdc2.h
rename to jni/openssl/include/openssl/mdc2.h
diff --git a/src/main/jni/openssl/include/openssl/modes.h b/jni/openssl/include/openssl/modes.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/modes.h
rename to jni/openssl/include/openssl/modes.h
diff --git a/src/main/jni/openssl/include/openssl/obj_mac.h b/jni/openssl/include/openssl/obj_mac.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/obj_mac.h
rename to jni/openssl/include/openssl/obj_mac.h
diff --git a/src/main/jni/openssl/include/openssl/objects.h b/jni/openssl/include/openssl/objects.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/objects.h
rename to jni/openssl/include/openssl/objects.h
diff --git a/src/main/jni/openssl/include/openssl/ocsp.h b/jni/openssl/include/openssl/ocsp.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/ocsp.h
rename to jni/openssl/include/openssl/ocsp.h
diff --git a/src/main/jni/openssl/include/openssl/opensslconf.h b/jni/openssl/include/openssl/opensslconf.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/opensslconf.h
rename to jni/openssl/include/openssl/opensslconf.h
diff --git a/src/main/jni/openssl/include/openssl/opensslv.h b/jni/openssl/include/openssl/opensslv.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/opensslv.h
rename to jni/openssl/include/openssl/opensslv.h
diff --git a/src/main/jni/openssl/include/openssl/ossl_typ.h b/jni/openssl/include/openssl/ossl_typ.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/ossl_typ.h
rename to jni/openssl/include/openssl/ossl_typ.h
diff --git a/src/main/jni/openssl/include/openssl/pem.h b/jni/openssl/include/openssl/pem.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/pem.h
rename to jni/openssl/include/openssl/pem.h
diff --git a/src/main/jni/openssl/include/openssl/pem2.h b/jni/openssl/include/openssl/pem2.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/pem2.h
rename to jni/openssl/include/openssl/pem2.h
diff --git a/src/main/jni/openssl/include/openssl/pkcs12.h b/jni/openssl/include/openssl/pkcs12.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/pkcs12.h
rename to jni/openssl/include/openssl/pkcs12.h
diff --git a/src/main/jni/openssl/include/openssl/pkcs7.h b/jni/openssl/include/openssl/pkcs7.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/pkcs7.h
rename to jni/openssl/include/openssl/pkcs7.h
diff --git a/src/main/jni/openssl/include/openssl/pqueue.h b/jni/openssl/include/openssl/pqueue.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/pqueue.h
rename to jni/openssl/include/openssl/pqueue.h
diff --git a/src/main/jni/openssl/include/openssl/rand.h b/jni/openssl/include/openssl/rand.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/rand.h
rename to jni/openssl/include/openssl/rand.h
diff --git a/src/main/jni/openssl/include/openssl/rc2.h b/jni/openssl/include/openssl/rc2.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/rc2.h
rename to jni/openssl/include/openssl/rc2.h
diff --git a/src/main/jni/openssl/include/openssl/rc4.h b/jni/openssl/include/openssl/rc4.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/rc4.h
rename to jni/openssl/include/openssl/rc4.h
diff --git a/src/main/jni/openssl/include/openssl/ripemd.h b/jni/openssl/include/openssl/ripemd.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/ripemd.h
rename to jni/openssl/include/openssl/ripemd.h
diff --git a/src/main/jni/openssl/include/openssl/rsa.h b/jni/openssl/include/openssl/rsa.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/rsa.h
rename to jni/openssl/include/openssl/rsa.h
diff --git a/src/main/jni/openssl/include/openssl/safestack.h b/jni/openssl/include/openssl/safestack.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/safestack.h
rename to jni/openssl/include/openssl/safestack.h
diff --git a/src/main/jni/openssl/include/openssl/seed.h b/jni/openssl/include/openssl/seed.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/seed.h
rename to jni/openssl/include/openssl/seed.h
diff --git a/src/main/jni/openssl/include/openssl/sha.h b/jni/openssl/include/openssl/sha.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/sha.h
rename to jni/openssl/include/openssl/sha.h
diff --git a/src/main/jni/openssl/include/openssl/srp.h b/jni/openssl/include/openssl/srp.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/srp.h
rename to jni/openssl/include/openssl/srp.h
diff --git a/src/main/jni/openssl/include/openssl/srtp.h b/jni/openssl/include/openssl/srtp.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/srtp.h
rename to jni/openssl/include/openssl/srtp.h
diff --git a/src/main/jni/openssl/include/openssl/ssl.h b/jni/openssl/include/openssl/ssl.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/ssl.h
rename to jni/openssl/include/openssl/ssl.h
diff --git a/src/main/jni/openssl/include/openssl/ssl2.h b/jni/openssl/include/openssl/ssl2.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/ssl2.h
rename to jni/openssl/include/openssl/ssl2.h
diff --git a/src/main/jni/openssl/include/openssl/ssl23.h b/jni/openssl/include/openssl/ssl23.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/ssl23.h
rename to jni/openssl/include/openssl/ssl23.h
diff --git a/src/main/jni/openssl/include/openssl/ssl3.h b/jni/openssl/include/openssl/ssl3.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/ssl3.h
rename to jni/openssl/include/openssl/ssl3.h
diff --git a/src/main/jni/openssl/include/openssl/stack.h b/jni/openssl/include/openssl/stack.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/stack.h
rename to jni/openssl/include/openssl/stack.h
diff --git a/src/main/jni/openssl/include/openssl/symhacks.h b/jni/openssl/include/openssl/symhacks.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/symhacks.h
rename to jni/openssl/include/openssl/symhacks.h
diff --git a/src/main/jni/openssl/include/openssl/tls1.h b/jni/openssl/include/openssl/tls1.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/tls1.h
rename to jni/openssl/include/openssl/tls1.h
diff --git a/src/main/jni/openssl/include/openssl/ts.h b/jni/openssl/include/openssl/ts.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/ts.h
rename to jni/openssl/include/openssl/ts.h
diff --git a/src/main/jni/openssl/include/openssl/txt_db.h b/jni/openssl/include/openssl/txt_db.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/txt_db.h
rename to jni/openssl/include/openssl/txt_db.h
diff --git a/src/main/jni/openssl/include/openssl/ui.h b/jni/openssl/include/openssl/ui.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/ui.h
rename to jni/openssl/include/openssl/ui.h
diff --git a/src/main/jni/openssl/include/openssl/ui_compat.h b/jni/openssl/include/openssl/ui_compat.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/ui_compat.h
rename to jni/openssl/include/openssl/ui_compat.h
diff --git a/src/main/jni/openssl/include/openssl/whrlpool.h b/jni/openssl/include/openssl/whrlpool.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/whrlpool.h
rename to jni/openssl/include/openssl/whrlpool.h
diff --git a/src/main/jni/openssl/include/openssl/x509.h b/jni/openssl/include/openssl/x509.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/x509.h
rename to jni/openssl/include/openssl/x509.h
diff --git a/src/main/jni/openssl/include/openssl/x509_vfy.h b/jni/openssl/include/openssl/x509_vfy.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/x509_vfy.h
rename to jni/openssl/include/openssl/x509_vfy.h
diff --git a/src/main/jni/openssl/include/openssl/x509v3.h b/jni/openssl/include/openssl/x509v3.h
similarity index 100%
rename from src/main/jni/openssl/include/openssl/x509v3.h
rename to jni/openssl/include/openssl/x509v3.h
diff --git a/src/main/jni/openssl/ssl/Android.mk b/jni/openssl/ssl/Android.mk
similarity index 100%
rename from src/main/jni/openssl/ssl/Android.mk
rename to jni/openssl/ssl/Android.mk
diff --git a/src/main/jni/openssl/ssl/Makefile b/jni/openssl/ssl/Makefile
similarity index 100%
rename from src/main/jni/openssl/ssl/Makefile
rename to jni/openssl/ssl/Makefile
diff --git a/src/main/jni/openssl/ssl/bio_ssl.c b/jni/openssl/ssl/bio_ssl.c
similarity index 100%
rename from src/main/jni/openssl/ssl/bio_ssl.c
rename to jni/openssl/ssl/bio_ssl.c
diff --git a/src/main/jni/openssl/ssl/d1_both.c b/jni/openssl/ssl/d1_both.c
similarity index 100%
rename from src/main/jni/openssl/ssl/d1_both.c
rename to jni/openssl/ssl/d1_both.c
diff --git a/src/main/jni/openssl/ssl/d1_clnt.c b/jni/openssl/ssl/d1_clnt.c
similarity index 100%
rename from src/main/jni/openssl/ssl/d1_clnt.c
rename to jni/openssl/ssl/d1_clnt.c
diff --git a/src/main/jni/openssl/ssl/d1_enc.c b/jni/openssl/ssl/d1_enc.c
similarity index 100%
rename from src/main/jni/openssl/ssl/d1_enc.c
rename to jni/openssl/ssl/d1_enc.c
diff --git a/src/main/jni/openssl/ssl/d1_lib.c b/jni/openssl/ssl/d1_lib.c
similarity index 100%
rename from src/main/jni/openssl/ssl/d1_lib.c
rename to jni/openssl/ssl/d1_lib.c
diff --git a/src/main/jni/openssl/ssl/d1_meth.c b/jni/openssl/ssl/d1_meth.c
similarity index 100%
rename from src/main/jni/openssl/ssl/d1_meth.c
rename to jni/openssl/ssl/d1_meth.c
diff --git a/src/main/jni/openssl/ssl/d1_pkt.c b/jni/openssl/ssl/d1_pkt.c
similarity index 100%
rename from src/main/jni/openssl/ssl/d1_pkt.c
rename to jni/openssl/ssl/d1_pkt.c
diff --git a/src/main/jni/openssl/ssl/d1_srtp.c b/jni/openssl/ssl/d1_srtp.c
similarity index 100%
rename from src/main/jni/openssl/ssl/d1_srtp.c
rename to jni/openssl/ssl/d1_srtp.c
diff --git a/src/main/jni/openssl/ssl/d1_srvr.c b/jni/openssl/ssl/d1_srvr.c
similarity index 100%
rename from src/main/jni/openssl/ssl/d1_srvr.c
rename to jni/openssl/ssl/d1_srvr.c
diff --git a/src/main/jni/openssl/ssl/dtls1.h b/jni/openssl/ssl/dtls1.h
similarity index 100%
rename from src/main/jni/openssl/ssl/dtls1.h
rename to jni/openssl/ssl/dtls1.h
diff --git a/src/main/jni/openssl/ssl/install-ssl.com b/jni/openssl/ssl/install-ssl.com
similarity index 100%
rename from src/main/jni/openssl/ssl/install-ssl.com
rename to jni/openssl/ssl/install-ssl.com
diff --git a/src/main/jni/openssl/ssl/kssl.c b/jni/openssl/ssl/kssl.c
similarity index 100%
rename from src/main/jni/openssl/ssl/kssl.c
rename to jni/openssl/ssl/kssl.c
diff --git a/src/main/jni/openssl/ssl/kssl.h b/jni/openssl/ssl/kssl.h
similarity index 100%
rename from src/main/jni/openssl/ssl/kssl.h
rename to jni/openssl/ssl/kssl.h
diff --git a/src/main/jni/openssl/ssl/kssl_lcl.h b/jni/openssl/ssl/kssl_lcl.h
similarity index 100%
rename from src/main/jni/openssl/ssl/kssl_lcl.h
rename to jni/openssl/ssl/kssl_lcl.h
diff --git a/src/main/jni/openssl/ssl/s23_clnt.c b/jni/openssl/ssl/s23_clnt.c
similarity index 100%
rename from src/main/jni/openssl/ssl/s23_clnt.c
rename to jni/openssl/ssl/s23_clnt.c
diff --git a/src/main/jni/openssl/ssl/s23_lib.c b/jni/openssl/ssl/s23_lib.c
similarity index 100%
rename from src/main/jni/openssl/ssl/s23_lib.c
rename to jni/openssl/ssl/s23_lib.c
diff --git a/src/main/jni/openssl/ssl/s23_meth.c b/jni/openssl/ssl/s23_meth.c
similarity index 100%
rename from src/main/jni/openssl/ssl/s23_meth.c
rename to jni/openssl/ssl/s23_meth.c
diff --git a/src/main/jni/openssl/ssl/s23_pkt.c b/jni/openssl/ssl/s23_pkt.c
similarity index 100%
rename from src/main/jni/openssl/ssl/s23_pkt.c
rename to jni/openssl/ssl/s23_pkt.c
diff --git a/src/main/jni/openssl/ssl/s23_srvr.c b/jni/openssl/ssl/s23_srvr.c
similarity index 100%
rename from src/main/jni/openssl/ssl/s23_srvr.c
rename to jni/openssl/ssl/s23_srvr.c
diff --git a/src/main/jni/openssl/ssl/s2_clnt.c b/jni/openssl/ssl/s2_clnt.c
similarity index 100%
rename from src/main/jni/openssl/ssl/s2_clnt.c
rename to jni/openssl/ssl/s2_clnt.c
diff --git a/src/main/jni/openssl/ssl/s2_enc.c b/jni/openssl/ssl/s2_enc.c
similarity index 100%
rename from src/main/jni/openssl/ssl/s2_enc.c
rename to jni/openssl/ssl/s2_enc.c
diff --git a/src/main/jni/openssl/ssl/s2_lib.c b/jni/openssl/ssl/s2_lib.c
similarity index 100%
rename from src/main/jni/openssl/ssl/s2_lib.c
rename to jni/openssl/ssl/s2_lib.c
diff --git a/src/main/jni/openssl/ssl/s2_meth.c b/jni/openssl/ssl/s2_meth.c
similarity index 100%
rename from src/main/jni/openssl/ssl/s2_meth.c
rename to jni/openssl/ssl/s2_meth.c
diff --git a/src/main/jni/openssl/ssl/s2_pkt.c b/jni/openssl/ssl/s2_pkt.c
similarity index 100%
rename from src/main/jni/openssl/ssl/s2_pkt.c
rename to jni/openssl/ssl/s2_pkt.c
diff --git a/src/main/jni/openssl/ssl/s2_srvr.c b/jni/openssl/ssl/s2_srvr.c
similarity index 100%
rename from src/main/jni/openssl/ssl/s2_srvr.c
rename to jni/openssl/ssl/s2_srvr.c
diff --git a/src/main/jni/openssl/ssl/s3_both.c b/jni/openssl/ssl/s3_both.c
similarity index 100%
rename from src/main/jni/openssl/ssl/s3_both.c
rename to jni/openssl/ssl/s3_both.c
diff --git a/src/main/jni/openssl/ssl/s3_clnt.c b/jni/openssl/ssl/s3_clnt.c
similarity index 100%
rename from src/main/jni/openssl/ssl/s3_clnt.c
rename to jni/openssl/ssl/s3_clnt.c
diff --git a/src/main/jni/openssl/ssl/s3_enc.c b/jni/openssl/ssl/s3_enc.c
similarity index 100%
rename from src/main/jni/openssl/ssl/s3_enc.c
rename to jni/openssl/ssl/s3_enc.c
diff --git a/src/main/jni/openssl/ssl/s3_lib.c b/jni/openssl/ssl/s3_lib.c
similarity index 100%
rename from src/main/jni/openssl/ssl/s3_lib.c
rename to jni/openssl/ssl/s3_lib.c
diff --git a/src/main/jni/openssl/ssl/s3_meth.c b/jni/openssl/ssl/s3_meth.c
similarity index 100%
rename from src/main/jni/openssl/ssl/s3_meth.c
rename to jni/openssl/ssl/s3_meth.c
diff --git a/src/main/jni/openssl/ssl/s3_pkt.c b/jni/openssl/ssl/s3_pkt.c
similarity index 100%
rename from src/main/jni/openssl/ssl/s3_pkt.c
rename to jni/openssl/ssl/s3_pkt.c
diff --git a/src/main/jni/openssl/ssl/s3_srvr.c b/jni/openssl/ssl/s3_srvr.c
similarity index 100%
rename from src/main/jni/openssl/ssl/s3_srvr.c
rename to jni/openssl/ssl/s3_srvr.c
diff --git a/src/main/jni/openssl/ssl/srtp.h b/jni/openssl/ssl/srtp.h
similarity index 100%
rename from src/main/jni/openssl/ssl/srtp.h
rename to jni/openssl/ssl/srtp.h
diff --git a/src/main/jni/openssl/ssl/ssl-lib.com b/jni/openssl/ssl/ssl-lib.com
similarity index 100%
rename from src/main/jni/openssl/ssl/ssl-lib.com
rename to jni/openssl/ssl/ssl-lib.com
diff --git a/src/main/jni/openssl/ssl/ssl.h b/jni/openssl/ssl/ssl.h
similarity index 100%
rename from src/main/jni/openssl/ssl/ssl.h
rename to jni/openssl/ssl/ssl.h
diff --git a/src/main/jni/openssl/ssl/ssl2.h b/jni/openssl/ssl/ssl2.h
similarity index 100%
rename from src/main/jni/openssl/ssl/ssl2.h
rename to jni/openssl/ssl/ssl2.h
diff --git a/src/main/jni/openssl/ssl/ssl23.h b/jni/openssl/ssl/ssl23.h
similarity index 100%
rename from src/main/jni/openssl/ssl/ssl23.h
rename to jni/openssl/ssl/ssl23.h
diff --git a/src/main/jni/openssl/ssl/ssl3.h b/jni/openssl/ssl/ssl3.h
similarity index 100%
rename from src/main/jni/openssl/ssl/ssl3.h
rename to jni/openssl/ssl/ssl3.h
diff --git a/src/main/jni/openssl/ssl/ssl_algs.c b/jni/openssl/ssl/ssl_algs.c
similarity index 100%
rename from src/main/jni/openssl/ssl/ssl_algs.c
rename to jni/openssl/ssl/ssl_algs.c
diff --git a/src/main/jni/openssl/ssl/ssl_asn1.c b/jni/openssl/ssl/ssl_asn1.c
similarity index 100%
rename from src/main/jni/openssl/ssl/ssl_asn1.c
rename to jni/openssl/ssl/ssl_asn1.c
diff --git a/src/main/jni/openssl/ssl/ssl_cert.c b/jni/openssl/ssl/ssl_cert.c
similarity index 100%
rename from src/main/jni/openssl/ssl/ssl_cert.c
rename to jni/openssl/ssl/ssl_cert.c
diff --git a/src/main/jni/openssl/ssl/ssl_ciph.c b/jni/openssl/ssl/ssl_ciph.c
similarity index 100%
rename from src/main/jni/openssl/ssl/ssl_ciph.c
rename to jni/openssl/ssl/ssl_ciph.c
diff --git a/src/main/jni/openssl/ssl/ssl_err.c b/jni/openssl/ssl/ssl_err.c
similarity index 100%
rename from src/main/jni/openssl/ssl/ssl_err.c
rename to jni/openssl/ssl/ssl_err.c
diff --git a/src/main/jni/openssl/ssl/ssl_err2.c b/jni/openssl/ssl/ssl_err2.c
similarity index 100%
rename from src/main/jni/openssl/ssl/ssl_err2.c
rename to jni/openssl/ssl/ssl_err2.c
diff --git a/src/main/jni/openssl/ssl/ssl_lib.c b/jni/openssl/ssl/ssl_lib.c
similarity index 100%
rename from src/main/jni/openssl/ssl/ssl_lib.c
rename to jni/openssl/ssl/ssl_lib.c
diff --git a/src/main/jni/openssl/ssl/ssl_locl.h b/jni/openssl/ssl/ssl_locl.h
similarity index 100%
rename from src/main/jni/openssl/ssl/ssl_locl.h
rename to jni/openssl/ssl/ssl_locl.h
diff --git a/src/main/jni/openssl/ssl/ssl_rsa.c b/jni/openssl/ssl/ssl_rsa.c
similarity index 100%
rename from src/main/jni/openssl/ssl/ssl_rsa.c
rename to jni/openssl/ssl/ssl_rsa.c
diff --git a/src/main/jni/openssl/ssl/ssl_sess.c b/jni/openssl/ssl/ssl_sess.c
similarity index 100%
rename from src/main/jni/openssl/ssl/ssl_sess.c
rename to jni/openssl/ssl/ssl_sess.c
diff --git a/src/main/jni/openssl/ssl/ssl_stat.c b/jni/openssl/ssl/ssl_stat.c
similarity index 100%
rename from src/main/jni/openssl/ssl/ssl_stat.c
rename to jni/openssl/ssl/ssl_stat.c
diff --git a/src/main/jni/openssl/ssl/ssl_task.c b/jni/openssl/ssl/ssl_task.c
similarity index 100%
rename from src/main/jni/openssl/ssl/ssl_task.c
rename to jni/openssl/ssl/ssl_task.c
diff --git a/src/main/jni/openssl/ssl/ssl_txt.c b/jni/openssl/ssl/ssl_txt.c
similarity index 100%
rename from src/main/jni/openssl/ssl/ssl_txt.c
rename to jni/openssl/ssl/ssl_txt.c
diff --git a/src/main/jni/openssl/ssl/ssltest.c b/jni/openssl/ssl/ssltest.c
similarity index 100%
rename from src/main/jni/openssl/ssl/ssltest.c
rename to jni/openssl/ssl/ssltest.c
diff --git a/src/main/jni/openssl/ssl/t1_clnt.c b/jni/openssl/ssl/t1_clnt.c
similarity index 100%
rename from src/main/jni/openssl/ssl/t1_clnt.c
rename to jni/openssl/ssl/t1_clnt.c
diff --git a/src/main/jni/openssl/ssl/t1_enc.c b/jni/openssl/ssl/t1_enc.c
similarity index 100%
rename from src/main/jni/openssl/ssl/t1_enc.c
rename to jni/openssl/ssl/t1_enc.c
diff --git a/src/main/jni/openssl/ssl/t1_lib.c b/jni/openssl/ssl/t1_lib.c
similarity index 100%
rename from src/main/jni/openssl/ssl/t1_lib.c
rename to jni/openssl/ssl/t1_lib.c
diff --git a/src/main/jni/openssl/ssl/t1_meth.c b/jni/openssl/ssl/t1_meth.c
similarity index 100%
rename from src/main/jni/openssl/ssl/t1_meth.c
rename to jni/openssl/ssl/t1_meth.c
diff --git a/src/main/jni/openssl/ssl/t1_reneg.c b/jni/openssl/ssl/t1_reneg.c
similarity index 100%
rename from src/main/jni/openssl/ssl/t1_reneg.c
rename to jni/openssl/ssl/t1_reneg.c
diff --git a/src/main/jni/openssl/ssl/t1_srvr.c b/jni/openssl/ssl/t1_srvr.c
similarity index 100%
rename from src/main/jni/openssl/ssl/t1_srvr.c
rename to jni/openssl/ssl/t1_srvr.c
diff --git a/src/main/jni/openssl/ssl/tls1.h b/jni/openssl/ssl/tls1.h
similarity index 100%
rename from src/main/jni/openssl/ssl/tls1.h
rename to jni/openssl/ssl/tls1.h
diff --git a/src/main/jni/openssl/ssl/tls_srp.c b/jni/openssl/ssl/tls_srp.c
similarity index 100%
rename from src/main/jni/openssl/ssl/tls_srp.c
rename to jni/openssl/ssl/tls_srp.c
diff --git a/src/main/jni/pdnsd/AUTHORS b/jni/pdnsd/AUTHORS
similarity index 100%
rename from src/main/jni/pdnsd/AUTHORS
rename to jni/pdnsd/AUTHORS
diff --git a/src/main/jni/pdnsd/COPYING b/jni/pdnsd/COPYING
similarity index 100%
rename from src/main/jni/pdnsd/COPYING
rename to jni/pdnsd/COPYING
diff --git a/src/main/jni/pdnsd/COPYING.BSD b/jni/pdnsd/COPYING.BSD
similarity index 100%
rename from src/main/jni/pdnsd/COPYING.BSD
rename to jni/pdnsd/COPYING.BSD
diff --git a/src/main/jni/pdnsd/ChangeLog b/jni/pdnsd/ChangeLog
similarity index 100%
rename from src/main/jni/pdnsd/ChangeLog
rename to jni/pdnsd/ChangeLog
diff --git a/src/main/jni/pdnsd/ChangeLog.old b/jni/pdnsd/ChangeLog.old
similarity index 100%
rename from src/main/jni/pdnsd/ChangeLog.old
rename to jni/pdnsd/ChangeLog.old
diff --git a/src/main/jni/pdnsd/INSTALL b/jni/pdnsd/INSTALL
similarity index 100%
rename from src/main/jni/pdnsd/INSTALL
rename to jni/pdnsd/INSTALL
diff --git a/src/main/jni/pdnsd/Makefile.am b/jni/pdnsd/Makefile.am
similarity index 100%
rename from src/main/jni/pdnsd/Makefile.am
rename to jni/pdnsd/Makefile.am
diff --git a/src/main/jni/pdnsd/Makefile.in b/jni/pdnsd/Makefile.in
similarity index 100%
rename from src/main/jni/pdnsd/Makefile.in
rename to jni/pdnsd/Makefile.in
diff --git a/src/main/jni/pdnsd/NEWS b/jni/pdnsd/NEWS
similarity index 100%
rename from src/main/jni/pdnsd/NEWS
rename to jni/pdnsd/NEWS
diff --git a/src/main/jni/pdnsd/PKGBUILD.in b/jni/pdnsd/PKGBUILD.in
similarity index 100%
rename from src/main/jni/pdnsd/PKGBUILD.in
rename to jni/pdnsd/PKGBUILD.in
diff --git a/src/main/jni/pdnsd/README b/jni/pdnsd/README
similarity index 100%
rename from src/main/jni/pdnsd/README
rename to jni/pdnsd/README
diff --git a/src/main/jni/pdnsd/README.par b/jni/pdnsd/README.par
similarity index 100%
rename from src/main/jni/pdnsd/README.par
rename to jni/pdnsd/README.par
diff --git a/src/main/jni/pdnsd/README.par.old b/jni/pdnsd/README.par.old
similarity index 100%
rename from src/main/jni/pdnsd/README.par.old
rename to jni/pdnsd/README.par.old
diff --git a/src/main/jni/pdnsd/THANKS b/jni/pdnsd/THANKS
similarity index 100%
rename from src/main/jni/pdnsd/THANKS
rename to jni/pdnsd/THANKS
diff --git a/src/main/jni/pdnsd/TODO b/jni/pdnsd/TODO
similarity index 100%
rename from src/main/jni/pdnsd/TODO
rename to jni/pdnsd/TODO
diff --git a/src/main/jni/pdnsd/acconfig.h b/jni/pdnsd/acconfig.h
similarity index 100%
rename from src/main/jni/pdnsd/acconfig.h
rename to jni/pdnsd/acconfig.h
diff --git a/src/main/jni/pdnsd/aclocal.m4 b/jni/pdnsd/aclocal.m4
similarity index 100%
rename from src/main/jni/pdnsd/aclocal.m4
rename to jni/pdnsd/aclocal.m4
diff --git a/src/main/jni/pdnsd/compile b/jni/pdnsd/compile
similarity index 100%
rename from src/main/jni/pdnsd/compile
rename to jni/pdnsd/compile
diff --git a/src/main/jni/pdnsd/config.h b/jni/pdnsd/config.h
similarity index 100%
rename from src/main/jni/pdnsd/config.h
rename to jni/pdnsd/config.h
diff --git a/src/main/jni/pdnsd/config.h.in b/jni/pdnsd/config.h.in
similarity index 100%
rename from src/main/jni/pdnsd/config.h.in
rename to jni/pdnsd/config.h.in
diff --git a/src/main/jni/pdnsd/configure b/jni/pdnsd/configure
similarity index 100%
rename from src/main/jni/pdnsd/configure
rename to jni/pdnsd/configure
diff --git a/src/main/jni/pdnsd/configure.in b/jni/pdnsd/configure.in
similarity index 100%
rename from src/main/jni/pdnsd/configure.in
rename to jni/pdnsd/configure.in
diff --git a/src/main/jni/pdnsd/contrib/Makefile.am b/jni/pdnsd/contrib/Makefile.am
similarity index 100%
rename from src/main/jni/pdnsd/contrib/Makefile.am
rename to jni/pdnsd/contrib/Makefile.am
diff --git a/src/main/jni/pdnsd/contrib/Makefile.in b/jni/pdnsd/contrib/Makefile.in
similarity index 100%
rename from src/main/jni/pdnsd/contrib/Makefile.in
rename to jni/pdnsd/contrib/Makefile.in
diff --git a/src/main/jni/pdnsd/contrib/README b/jni/pdnsd/contrib/README
similarity index 100%
rename from src/main/jni/pdnsd/contrib/README
rename to jni/pdnsd/contrib/README
diff --git a/src/main/jni/pdnsd/contrib/change_pdnsd_server_ip.pl b/jni/pdnsd/contrib/change_pdnsd_server_ip.pl
similarity index 100%
rename from src/main/jni/pdnsd/contrib/change_pdnsd_server_ip.pl
rename to jni/pdnsd/contrib/change_pdnsd_server_ip.pl
diff --git a/src/main/jni/pdnsd/contrib/dhcp2pdnsd b/jni/pdnsd/contrib/dhcp2pdnsd
similarity index 100%
rename from src/main/jni/pdnsd/contrib/dhcp2pdnsd
rename to jni/pdnsd/contrib/dhcp2pdnsd
diff --git a/src/main/jni/pdnsd/contrib/pdnsd_dhcp.pl b/jni/pdnsd/contrib/pdnsd_dhcp.pl
similarity index 100%
rename from src/main/jni/pdnsd/contrib/pdnsd_dhcp.pl
rename to jni/pdnsd/contrib/pdnsd_dhcp.pl
diff --git a/src/main/jni/pdnsd/depcomp b/jni/pdnsd/depcomp
similarity index 100%
rename from src/main/jni/pdnsd/depcomp
rename to jni/pdnsd/depcomp
diff --git a/src/main/jni/pdnsd/doc/Makefile.am b/jni/pdnsd/doc/Makefile.am
similarity index 100%
rename from src/main/jni/pdnsd/doc/Makefile.am
rename to jni/pdnsd/doc/Makefile.am
diff --git a/src/main/jni/pdnsd/doc/Makefile.in b/jni/pdnsd/doc/Makefile.in
similarity index 100%
rename from src/main/jni/pdnsd/doc/Makefile.in
rename to jni/pdnsd/doc/Makefile.in
diff --git a/src/main/jni/pdnsd/doc/doc_makefile b/jni/pdnsd/doc/doc_makefile
similarity index 100%
rename from src/main/jni/pdnsd/doc/doc_makefile
rename to jni/pdnsd/doc/doc_makefile
diff --git a/src/main/jni/pdnsd/doc/html/dl.html b/jni/pdnsd/doc/html/dl.html
similarity index 100%
rename from src/main/jni/pdnsd/doc/html/dl.html
rename to jni/pdnsd/doc/html/dl.html
diff --git a/src/main/jni/pdnsd/doc/html/dl.html.in b/jni/pdnsd/doc/html/dl.html.in
similarity index 100%
rename from src/main/jni/pdnsd/doc/html/dl.html.in
rename to jni/pdnsd/doc/html/dl.html.in
diff --git a/src/main/jni/pdnsd/doc/html/doc.html b/jni/pdnsd/doc/html/doc.html
similarity index 100%
rename from src/main/jni/pdnsd/doc/html/doc.html
rename to jni/pdnsd/doc/html/doc.html
diff --git a/src/main/jni/pdnsd/doc/html/doc_makefile b/jni/pdnsd/doc/html/doc_makefile
similarity index 100%
rename from src/main/jni/pdnsd/doc/html/doc_makefile
rename to jni/pdnsd/doc/html/doc_makefile
diff --git a/src/main/jni/pdnsd/doc/html/faq.html b/jni/pdnsd/doc/html/faq.html
similarity index 100%
rename from src/main/jni/pdnsd/doc/html/faq.html
rename to jni/pdnsd/doc/html/faq.html
diff --git a/src/main/jni/pdnsd/doc/html/htmlsubst.pl b/jni/pdnsd/doc/html/htmlsubst.pl
similarity index 100%
rename from src/main/jni/pdnsd/doc/html/htmlsubst.pl
rename to jni/pdnsd/doc/html/htmlsubst.pl
diff --git a/src/main/jni/pdnsd/doc/html/index.html b/jni/pdnsd/doc/html/index.html
similarity index 100%
rename from src/main/jni/pdnsd/doc/html/index.html
rename to jni/pdnsd/doc/html/index.html
diff --git a/src/main/jni/pdnsd/doc/html2confman.pl b/jni/pdnsd/doc/html2confman.pl
similarity index 100%
rename from src/main/jni/pdnsd/doc/html2confman.pl
rename to jni/pdnsd/doc/html2confman.pl
diff --git a/src/main/jni/pdnsd/doc/pdnsd-ctl.8 b/jni/pdnsd/doc/pdnsd-ctl.8
similarity index 100%
rename from src/main/jni/pdnsd/doc/pdnsd-ctl.8
rename to jni/pdnsd/doc/pdnsd-ctl.8
diff --git a/src/main/jni/pdnsd/doc/pdnsd.8.in b/jni/pdnsd/doc/pdnsd.8.in
similarity index 100%
rename from src/main/jni/pdnsd/doc/pdnsd.8.in
rename to jni/pdnsd/doc/pdnsd.8.in
diff --git a/src/main/jni/pdnsd/doc/pdnsd.conf.5.in b/jni/pdnsd/doc/pdnsd.conf.5.in
similarity index 100%
rename from src/main/jni/pdnsd/doc/pdnsd.conf.5.in
rename to jni/pdnsd/doc/pdnsd.conf.5.in
diff --git a/src/main/jni/pdnsd/doc/pdnsd.conf.in b/jni/pdnsd/doc/pdnsd.conf.in
similarity index 100%
rename from src/main/jni/pdnsd/doc/pdnsd.conf.in
rename to jni/pdnsd/doc/pdnsd.conf.in
diff --git a/src/main/jni/pdnsd/doc/txt/doc_makefile b/jni/pdnsd/doc/txt/doc_makefile
similarity index 100%
rename from src/main/jni/pdnsd/doc/txt/doc_makefile
rename to jni/pdnsd/doc/txt/doc_makefile
diff --git a/src/main/jni/pdnsd/doc/txt/faq.txt b/jni/pdnsd/doc/txt/faq.txt
similarity index 100%
rename from src/main/jni/pdnsd/doc/txt/faq.txt
rename to jni/pdnsd/doc/txt/faq.txt
diff --git a/src/main/jni/pdnsd/doc/txt/intro.txt b/jni/pdnsd/doc/txt/intro.txt
similarity index 100%
rename from src/main/jni/pdnsd/doc/txt/intro.txt
rename to jni/pdnsd/doc/txt/intro.txt
diff --git a/src/main/jni/pdnsd/doc/txt/manual.txt b/jni/pdnsd/doc/txt/manual.txt
similarity index 100%
rename from src/main/jni/pdnsd/doc/txt/manual.txt
rename to jni/pdnsd/doc/txt/manual.txt
diff --git a/src/main/jni/pdnsd/file-list.base.in b/jni/pdnsd/file-list.base.in
similarity index 100%
rename from src/main/jni/pdnsd/file-list.base.in
rename to jni/pdnsd/file-list.base.in
diff --git a/src/main/jni/pdnsd/install-sh b/jni/pdnsd/install-sh
similarity index 100%
rename from src/main/jni/pdnsd/install-sh
rename to jni/pdnsd/install-sh
diff --git a/src/main/jni/pdnsd/missing b/jni/pdnsd/missing
similarity index 100%
rename from src/main/jni/pdnsd/missing
rename to jni/pdnsd/missing
diff --git a/src/main/jni/pdnsd/pdnsd.spec.in b/jni/pdnsd/pdnsd.spec.in
similarity index 100%
rename from src/main/jni/pdnsd/pdnsd.spec.in
rename to jni/pdnsd/pdnsd.spec.in
diff --git a/src/main/jni/pdnsd/src/Makefile.am b/jni/pdnsd/src/Makefile.am
similarity index 100%
rename from src/main/jni/pdnsd/src/Makefile.am
rename to jni/pdnsd/src/Makefile.am
diff --git a/src/main/jni/pdnsd/src/Makefile.in b/jni/pdnsd/src/Makefile.in
similarity index 100%
rename from src/main/jni/pdnsd/src/Makefile.in
rename to jni/pdnsd/src/Makefile.in
diff --git a/src/main/jni/pdnsd/src/cache.c b/jni/pdnsd/src/cache.c
similarity index 100%
rename from src/main/jni/pdnsd/src/cache.c
rename to jni/pdnsd/src/cache.c
diff --git a/src/main/jni/pdnsd/src/cache.h b/jni/pdnsd/src/cache.h
similarity index 100%
rename from src/main/jni/pdnsd/src/cache.h
rename to jni/pdnsd/src/cache.h
diff --git a/src/main/jni/pdnsd/src/conf-keywords.h b/jni/pdnsd/src/conf-keywords.h
similarity index 100%
rename from src/main/jni/pdnsd/src/conf-keywords.h
rename to jni/pdnsd/src/conf-keywords.h
diff --git a/src/main/jni/pdnsd/src/conf-parser.c b/jni/pdnsd/src/conf-parser.c
similarity index 100%
rename from src/main/jni/pdnsd/src/conf-parser.c
rename to jni/pdnsd/src/conf-parser.c
diff --git a/src/main/jni/pdnsd/src/conf-parser.h b/jni/pdnsd/src/conf-parser.h
similarity index 100%
rename from src/main/jni/pdnsd/src/conf-parser.h
rename to jni/pdnsd/src/conf-parser.h
diff --git a/src/main/jni/pdnsd/src/conff.c b/jni/pdnsd/src/conff.c
similarity index 100%
rename from src/main/jni/pdnsd/src/conff.c
rename to jni/pdnsd/src/conff.c
diff --git a/src/main/jni/pdnsd/src/conff.h b/jni/pdnsd/src/conff.h
similarity index 100%
rename from src/main/jni/pdnsd/src/conff.h
rename to jni/pdnsd/src/conff.h
diff --git a/src/main/jni/pdnsd/src/consts.c b/jni/pdnsd/src/consts.c
similarity index 100%
rename from src/main/jni/pdnsd/src/consts.c
rename to jni/pdnsd/src/consts.c
diff --git a/src/main/jni/pdnsd/src/consts.h b/jni/pdnsd/src/consts.h
similarity index 100%
rename from src/main/jni/pdnsd/src/consts.h
rename to jni/pdnsd/src/consts.h
diff --git a/src/main/jni/pdnsd/src/debug.c b/jni/pdnsd/src/debug.c
similarity index 100%
rename from src/main/jni/pdnsd/src/debug.c
rename to jni/pdnsd/src/debug.c
diff --git a/src/main/jni/pdnsd/src/debug.h b/jni/pdnsd/src/debug.h
similarity index 100%
rename from src/main/jni/pdnsd/src/debug.h
rename to jni/pdnsd/src/debug.h
diff --git a/src/main/jni/pdnsd/src/dns.c b/jni/pdnsd/src/dns.c
similarity index 100%
rename from src/main/jni/pdnsd/src/dns.c
rename to jni/pdnsd/src/dns.c
diff --git a/src/main/jni/pdnsd/src/dns.h b/jni/pdnsd/src/dns.h
similarity index 100%
rename from src/main/jni/pdnsd/src/dns.h
rename to jni/pdnsd/src/dns.h
diff --git a/src/main/jni/pdnsd/src/dns_answer.c b/jni/pdnsd/src/dns_answer.c
similarity index 100%
rename from src/main/jni/pdnsd/src/dns_answer.c
rename to jni/pdnsd/src/dns_answer.c
diff --git a/src/main/jni/pdnsd/src/dns_answer.h b/jni/pdnsd/src/dns_answer.h
similarity index 100%
rename from src/main/jni/pdnsd/src/dns_answer.h
rename to jni/pdnsd/src/dns_answer.h
diff --git a/src/main/jni/pdnsd/src/dns_query.c b/jni/pdnsd/src/dns_query.c
similarity index 100%
rename from src/main/jni/pdnsd/src/dns_query.c
rename to jni/pdnsd/src/dns_query.c
diff --git a/src/main/jni/pdnsd/src/dns_query.h b/jni/pdnsd/src/dns_query.h
similarity index 100%
rename from src/main/jni/pdnsd/src/dns_query.h
rename to jni/pdnsd/src/dns_query.h
diff --git a/src/main/jni/pdnsd/src/error.c b/jni/pdnsd/src/error.c
similarity index 100%
rename from src/main/jni/pdnsd/src/error.c
rename to jni/pdnsd/src/error.c
diff --git a/src/main/jni/pdnsd/src/error.h b/jni/pdnsd/src/error.h
similarity index 100%
rename from src/main/jni/pdnsd/src/error.h
rename to jni/pdnsd/src/error.h
diff --git a/src/main/jni/pdnsd/src/freebsd_netinet_ip_icmp.h b/jni/pdnsd/src/freebsd_netinet_ip_icmp.h
similarity index 100%
rename from src/main/jni/pdnsd/src/freebsd_netinet_ip_icmp.h
rename to jni/pdnsd/src/freebsd_netinet_ip_icmp.h
diff --git a/src/main/jni/pdnsd/src/hash.c b/jni/pdnsd/src/hash.c
similarity index 100%
rename from src/main/jni/pdnsd/src/hash.c
rename to jni/pdnsd/src/hash.c
diff --git a/src/main/jni/pdnsd/src/hash.h b/jni/pdnsd/src/hash.h
similarity index 100%
rename from src/main/jni/pdnsd/src/hash.h
rename to jni/pdnsd/src/hash.h
diff --git a/src/main/jni/pdnsd/src/helpers.c b/jni/pdnsd/src/helpers.c
similarity index 100%
rename from src/main/jni/pdnsd/src/helpers.c
rename to jni/pdnsd/src/helpers.c
diff --git a/src/main/jni/pdnsd/src/helpers.h b/jni/pdnsd/src/helpers.h
similarity index 100%
rename from src/main/jni/pdnsd/src/helpers.h
rename to jni/pdnsd/src/helpers.h
diff --git a/src/main/jni/pdnsd/src/icmp.c b/jni/pdnsd/src/icmp.c
similarity index 100%
rename from src/main/jni/pdnsd/src/icmp.c
rename to jni/pdnsd/src/icmp.c
diff --git a/src/main/jni/pdnsd/src/icmp.h b/jni/pdnsd/src/icmp.h
similarity index 100%
rename from src/main/jni/pdnsd/src/icmp.h
rename to jni/pdnsd/src/icmp.h
diff --git a/src/main/jni/pdnsd/src/ipvers.h b/jni/pdnsd/src/ipvers.h
similarity index 100%
rename from src/main/jni/pdnsd/src/ipvers.h
rename to jni/pdnsd/src/ipvers.h
diff --git a/src/main/jni/pdnsd/src/list.c b/jni/pdnsd/src/list.c
similarity index 100%
rename from src/main/jni/pdnsd/src/list.c
rename to jni/pdnsd/src/list.c
diff --git a/src/main/jni/pdnsd/src/list.h b/jni/pdnsd/src/list.h
similarity index 100%
rename from src/main/jni/pdnsd/src/list.h
rename to jni/pdnsd/src/list.h
diff --git a/src/main/jni/pdnsd/src/main.c b/jni/pdnsd/src/main.c
similarity index 100%
rename from src/main/jni/pdnsd/src/main.c
rename to jni/pdnsd/src/main.c
diff --git a/src/main/jni/pdnsd/src/make_rr_types_h.pl b/jni/pdnsd/src/make_rr_types_h.pl
similarity index 100%
rename from src/main/jni/pdnsd/src/make_rr_types_h.pl
rename to jni/pdnsd/src/make_rr_types_h.pl
diff --git a/src/main/jni/pdnsd/src/netdev.c b/jni/pdnsd/src/netdev.c
similarity index 100%
rename from src/main/jni/pdnsd/src/netdev.c
rename to jni/pdnsd/src/netdev.c
diff --git a/src/main/jni/pdnsd/src/netdev.h b/jni/pdnsd/src/netdev.h
similarity index 100%
rename from src/main/jni/pdnsd/src/netdev.h
rename to jni/pdnsd/src/netdev.h
diff --git a/src/main/jni/pdnsd/src/pdnsd-ctl/Makefile.am b/jni/pdnsd/src/pdnsd-ctl/Makefile.am
similarity index 100%
rename from src/main/jni/pdnsd/src/pdnsd-ctl/Makefile.am
rename to jni/pdnsd/src/pdnsd-ctl/Makefile.am
diff --git a/src/main/jni/pdnsd/src/pdnsd-ctl/Makefile.in b/jni/pdnsd/src/pdnsd-ctl/Makefile.in
similarity index 100%
rename from src/main/jni/pdnsd/src/pdnsd-ctl/Makefile.in
rename to jni/pdnsd/src/pdnsd-ctl/Makefile.in
diff --git a/src/main/jni/pdnsd/src/pdnsd-ctl/pdnsd-ctl.c b/jni/pdnsd/src/pdnsd-ctl/pdnsd-ctl.c
similarity index 100%
rename from src/main/jni/pdnsd/src/pdnsd-ctl/pdnsd-ctl.c
rename to jni/pdnsd/src/pdnsd-ctl/pdnsd-ctl.c
diff --git a/src/main/jni/pdnsd/src/pdnsd_assert.h b/jni/pdnsd/src/pdnsd_assert.h
similarity index 100%
rename from src/main/jni/pdnsd/src/pdnsd_assert.h
rename to jni/pdnsd/src/pdnsd_assert.h
diff --git a/src/main/jni/pdnsd/src/rc/ArchLinux/Makefile.am b/jni/pdnsd/src/rc/ArchLinux/Makefile.am
similarity index 100%
rename from src/main/jni/pdnsd/src/rc/ArchLinux/Makefile.am
rename to jni/pdnsd/src/rc/ArchLinux/Makefile.am
diff --git a/src/main/jni/pdnsd/src/rc/ArchLinux/Makefile.in b/jni/pdnsd/src/rc/ArchLinux/Makefile.in
similarity index 100%
rename from src/main/jni/pdnsd/src/rc/ArchLinux/Makefile.in
rename to jni/pdnsd/src/rc/ArchLinux/Makefile.in
diff --git a/src/main/jni/pdnsd/src/rc/ArchLinux/pdnsd.in b/jni/pdnsd/src/rc/ArchLinux/pdnsd.in
similarity index 100%
rename from src/main/jni/pdnsd/src/rc/ArchLinux/pdnsd.in
rename to jni/pdnsd/src/rc/ArchLinux/pdnsd.in
diff --git a/src/main/jni/pdnsd/src/rc/Debian/Makefile.am b/jni/pdnsd/src/rc/Debian/Makefile.am
similarity index 100%
rename from src/main/jni/pdnsd/src/rc/Debian/Makefile.am
rename to jni/pdnsd/src/rc/Debian/Makefile.am
diff --git a/src/main/jni/pdnsd/src/rc/Debian/Makefile.in b/jni/pdnsd/src/rc/Debian/Makefile.in
similarity index 100%
rename from src/main/jni/pdnsd/src/rc/Debian/Makefile.in
rename to jni/pdnsd/src/rc/Debian/Makefile.in
diff --git a/src/main/jni/pdnsd/src/rc/Debian/pdnsd.in b/jni/pdnsd/src/rc/Debian/pdnsd.in
similarity index 100%
rename from src/main/jni/pdnsd/src/rc/Debian/pdnsd.in
rename to jni/pdnsd/src/rc/Debian/pdnsd.in
diff --git a/src/main/jni/pdnsd/src/rc/Makefile.am b/jni/pdnsd/src/rc/Makefile.am
similarity index 100%
rename from src/main/jni/pdnsd/src/rc/Makefile.am
rename to jni/pdnsd/src/rc/Makefile.am
diff --git a/src/main/jni/pdnsd/src/rc/Makefile.in b/jni/pdnsd/src/rc/Makefile.in
similarity index 100%
rename from src/main/jni/pdnsd/src/rc/Makefile.in
rename to jni/pdnsd/src/rc/Makefile.in
diff --git a/src/main/jni/pdnsd/src/rc/README b/jni/pdnsd/src/rc/README
similarity index 100%
rename from src/main/jni/pdnsd/src/rc/README
rename to jni/pdnsd/src/rc/README
diff --git a/src/main/jni/pdnsd/src/rc/RedHat/Makefile.am b/jni/pdnsd/src/rc/RedHat/Makefile.am
similarity index 100%
rename from src/main/jni/pdnsd/src/rc/RedHat/Makefile.am
rename to jni/pdnsd/src/rc/RedHat/Makefile.am
diff --git a/src/main/jni/pdnsd/src/rc/RedHat/Makefile.in b/jni/pdnsd/src/rc/RedHat/Makefile.in
similarity index 100%
rename from src/main/jni/pdnsd/src/rc/RedHat/Makefile.in
rename to jni/pdnsd/src/rc/RedHat/Makefile.in
diff --git a/src/main/jni/pdnsd/src/rc/RedHat/pdnsd.in b/jni/pdnsd/src/rc/RedHat/pdnsd.in
similarity index 100%
rename from src/main/jni/pdnsd/src/rc/RedHat/pdnsd.in
rename to jni/pdnsd/src/rc/RedHat/pdnsd.in
diff --git a/src/main/jni/pdnsd/src/rc/Slackware/Makefile.am b/jni/pdnsd/src/rc/Slackware/Makefile.am
similarity index 100%
rename from src/main/jni/pdnsd/src/rc/Slackware/Makefile.am
rename to jni/pdnsd/src/rc/Slackware/Makefile.am
diff --git a/src/main/jni/pdnsd/src/rc/Slackware/Makefile.in b/jni/pdnsd/src/rc/Slackware/Makefile.in
similarity index 100%
rename from src/main/jni/pdnsd/src/rc/Slackware/Makefile.in
rename to jni/pdnsd/src/rc/Slackware/Makefile.in
diff --git a/src/main/jni/pdnsd/src/rc/Slackware/rc.pdnsd.in b/jni/pdnsd/src/rc/Slackware/rc.pdnsd.in
similarity index 100%
rename from src/main/jni/pdnsd/src/rc/Slackware/rc.pdnsd.in
rename to jni/pdnsd/src/rc/Slackware/rc.pdnsd.in
diff --git a/src/main/jni/pdnsd/src/rc/SuSE/Makefile.am b/jni/pdnsd/src/rc/SuSE/Makefile.am
similarity index 100%
rename from src/main/jni/pdnsd/src/rc/SuSE/Makefile.am
rename to jni/pdnsd/src/rc/SuSE/Makefile.am
diff --git a/src/main/jni/pdnsd/src/rc/SuSE/Makefile.in b/jni/pdnsd/src/rc/SuSE/Makefile.in
similarity index 100%
rename from src/main/jni/pdnsd/src/rc/SuSE/Makefile.in
rename to jni/pdnsd/src/rc/SuSE/Makefile.in
diff --git a/src/main/jni/pdnsd/src/rc/SuSE/pdnsd.in b/jni/pdnsd/src/rc/SuSE/pdnsd.in
similarity index 100%
rename from src/main/jni/pdnsd/src/rc/SuSE/pdnsd.in
rename to jni/pdnsd/src/rc/SuSE/pdnsd.in
diff --git a/src/main/jni/pdnsd/src/rr_types.c b/jni/pdnsd/src/rr_types.c
similarity index 100%
rename from src/main/jni/pdnsd/src/rr_types.c
rename to jni/pdnsd/src/rr_types.c
diff --git a/src/main/jni/pdnsd/src/rr_types.h b/jni/pdnsd/src/rr_types.h
similarity index 100%
rename from src/main/jni/pdnsd/src/rr_types.h
rename to jni/pdnsd/src/rr_types.h
diff --git a/src/main/jni/pdnsd/src/rr_types.in b/jni/pdnsd/src/rr_types.in
similarity index 100%
rename from src/main/jni/pdnsd/src/rr_types.in
rename to jni/pdnsd/src/rr_types.in
diff --git a/src/main/jni/pdnsd/src/servers.c b/jni/pdnsd/src/servers.c
similarity index 100%
rename from src/main/jni/pdnsd/src/servers.c
rename to jni/pdnsd/src/servers.c
diff --git a/src/main/jni/pdnsd/src/servers.h b/jni/pdnsd/src/servers.h
similarity index 100%
rename from src/main/jni/pdnsd/src/servers.h
rename to jni/pdnsd/src/servers.h
diff --git a/src/main/jni/pdnsd/src/sort_namevalues.pl b/jni/pdnsd/src/sort_namevalues.pl
similarity index 100%
rename from src/main/jni/pdnsd/src/sort_namevalues.pl
rename to jni/pdnsd/src/sort_namevalues.pl
diff --git a/src/main/jni/pdnsd/src/status.c b/jni/pdnsd/src/status.c
similarity index 100%
rename from src/main/jni/pdnsd/src/status.c
rename to jni/pdnsd/src/status.c
diff --git a/src/main/jni/pdnsd/src/status.h b/jni/pdnsd/src/status.h
similarity index 100%
rename from src/main/jni/pdnsd/src/status.h
rename to jni/pdnsd/src/status.h
diff --git a/src/main/jni/pdnsd/src/test/Makefile.am b/jni/pdnsd/src/test/Makefile.am
similarity index 100%
rename from src/main/jni/pdnsd/src/test/Makefile.am
rename to jni/pdnsd/src/test/Makefile.am
diff --git a/src/main/jni/pdnsd/src/test/Makefile.in b/jni/pdnsd/src/test/Makefile.in
similarity index 100%
rename from src/main/jni/pdnsd/src/test/Makefile.in
rename to jni/pdnsd/src/test/Makefile.in
diff --git a/src/main/jni/pdnsd/src/test/if_up.c b/jni/pdnsd/src/test/if_up.c
similarity index 100%
rename from src/main/jni/pdnsd/src/test/if_up.c
rename to jni/pdnsd/src/test/if_up.c
diff --git a/src/main/jni/pdnsd/src/test/is_local_addr.c b/jni/pdnsd/src/test/is_local_addr.c
similarity index 100%
rename from src/main/jni/pdnsd/src/test/is_local_addr.c
rename to jni/pdnsd/src/test/is_local_addr.c
diff --git a/src/main/jni/pdnsd/src/test/random.c b/jni/pdnsd/src/test/random.c
similarity index 100%
rename from src/main/jni/pdnsd/src/test/random.c
rename to jni/pdnsd/src/test/random.c
diff --git a/src/main/jni/pdnsd/src/test/tping.c b/jni/pdnsd/src/test/tping.c
similarity index 100%
rename from src/main/jni/pdnsd/src/test/tping.c
rename to jni/pdnsd/src/test/tping.c
diff --git a/src/main/jni/pdnsd/src/thread.c b/jni/pdnsd/src/thread.c
similarity index 100%
rename from src/main/jni/pdnsd/src/thread.c
rename to jni/pdnsd/src/thread.c
diff --git a/src/main/jni/pdnsd/src/thread.h b/jni/pdnsd/src/thread.h
similarity index 100%
rename from src/main/jni/pdnsd/src/thread.h
rename to jni/pdnsd/src/thread.h
diff --git a/src/main/jni/pdnsd/version b/jni/pdnsd/version
similarity index 100%
rename from src/main/jni/pdnsd/version
rename to jni/pdnsd/version
diff --git a/src/main/jni/redsocks/README b/jni/redsocks/README
similarity index 100%
rename from src/main/jni/redsocks/README
rename to jni/redsocks/README
diff --git a/src/main/jni/redsocks/README.html b/jni/redsocks/README.html
similarity index 100%
rename from src/main/jni/redsocks/README.html
rename to jni/redsocks/README.html
diff --git a/src/main/jni/redsocks/base.c b/jni/redsocks/base.c
similarity index 100%
rename from src/main/jni/redsocks/base.c
rename to jni/redsocks/base.c
diff --git a/src/main/jni/redsocks/base.h b/jni/redsocks/base.h
similarity index 100%
rename from src/main/jni/redsocks/base.h
rename to jni/redsocks/base.h
diff --git a/src/main/jni/redsocks/base64.c b/jni/redsocks/base64.c
similarity index 100%
rename from src/main/jni/redsocks/base64.c
rename to jni/redsocks/base64.c
diff --git a/src/main/jni/redsocks/base64.h b/jni/redsocks/base64.h
similarity index 100%
rename from src/main/jni/redsocks/base64.h
rename to jni/redsocks/base64.h
diff --git a/src/main/jni/redsocks/config.h b/jni/redsocks/config.h
similarity index 100%
rename from src/main/jni/redsocks/config.h
rename to jni/redsocks/config.h
diff --git a/src/main/jni/redsocks/dnstc.c b/jni/redsocks/dnstc.c
similarity index 100%
rename from src/main/jni/redsocks/dnstc.c
rename to jni/redsocks/dnstc.c
diff --git a/src/main/jni/redsocks/dnstc.h b/jni/redsocks/dnstc.h
similarity index 100%
rename from src/main/jni/redsocks/dnstc.h
rename to jni/redsocks/dnstc.h
diff --git a/src/main/jni/redsocks/http-auth.c b/jni/redsocks/http-auth.c
similarity index 100%
rename from src/main/jni/redsocks/http-auth.c
rename to jni/redsocks/http-auth.c
diff --git a/src/main/jni/redsocks/http-auth.h b/jni/redsocks/http-auth.h
similarity index 100%
rename from src/main/jni/redsocks/http-auth.h
rename to jni/redsocks/http-auth.h
diff --git a/src/main/jni/redsocks/http-connect.c b/jni/redsocks/http-connect.c
similarity index 100%
rename from src/main/jni/redsocks/http-connect.c
rename to jni/redsocks/http-connect.c
diff --git a/src/main/jni/redsocks/http-relay.c b/jni/redsocks/http-relay.c
similarity index 100%
rename from src/main/jni/redsocks/http-relay.c
rename to jni/redsocks/http-relay.c
diff --git a/src/main/jni/redsocks/libc-compat.h b/jni/redsocks/libc-compat.h
similarity index 100%
rename from src/main/jni/redsocks/libc-compat.h
rename to jni/redsocks/libc-compat.h
diff --git a/src/main/jni/redsocks/libevent-compat.h b/jni/redsocks/libevent-compat.h
similarity index 100%
rename from src/main/jni/redsocks/libevent-compat.h
rename to jni/redsocks/libevent-compat.h
diff --git a/src/main/jni/redsocks/list.h b/jni/redsocks/list.h
similarity index 100%
rename from src/main/jni/redsocks/list.h
rename to jni/redsocks/list.h
diff --git a/src/main/jni/redsocks/log.c b/jni/redsocks/log.c
similarity index 100%
rename from src/main/jni/redsocks/log.c
rename to jni/redsocks/log.c
diff --git a/src/main/jni/redsocks/log.h b/jni/redsocks/log.h
similarity index 100%
rename from src/main/jni/redsocks/log.h
rename to jni/redsocks/log.h
diff --git a/src/main/jni/redsocks/main.c b/jni/redsocks/main.c
similarity index 100%
rename from src/main/jni/redsocks/main.c
rename to jni/redsocks/main.c
diff --git a/src/main/jni/redsocks/main.h b/jni/redsocks/main.h
similarity index 100%
rename from src/main/jni/redsocks/main.h
rename to jni/redsocks/main.h
diff --git a/src/main/jni/redsocks/md5.c b/jni/redsocks/md5.c
similarity index 100%
rename from src/main/jni/redsocks/md5.c
rename to jni/redsocks/md5.c
diff --git a/src/main/jni/redsocks/md5.h b/jni/redsocks/md5.h
similarity index 100%
rename from src/main/jni/redsocks/md5.h
rename to jni/redsocks/md5.h
diff --git a/src/main/jni/redsocks/parser.c b/jni/redsocks/parser.c
similarity index 100%
rename from src/main/jni/redsocks/parser.c
rename to jni/redsocks/parser.c
diff --git a/src/main/jni/redsocks/parser.h b/jni/redsocks/parser.h
similarity index 100%
rename from src/main/jni/redsocks/parser.h
rename to jni/redsocks/parser.h
diff --git a/src/main/jni/redsocks/reddns.c b/jni/redsocks/reddns.c
similarity index 100%
rename from src/main/jni/redsocks/reddns.c
rename to jni/redsocks/reddns.c
diff --git a/src/main/jni/redsocks/redsocks.c b/jni/redsocks/redsocks.c
similarity index 100%
rename from src/main/jni/redsocks/redsocks.c
rename to jni/redsocks/redsocks.c
diff --git a/src/main/jni/redsocks/redsocks.h b/jni/redsocks/redsocks.h
similarity index 100%
rename from src/main/jni/redsocks/redsocks.h
rename to jni/redsocks/redsocks.h
diff --git a/src/main/jni/redsocks/redudp.c b/jni/redsocks/redudp.c
similarity index 100%
rename from src/main/jni/redsocks/redudp.c
rename to jni/redsocks/redudp.c
diff --git a/src/main/jni/redsocks/redudp.h b/jni/redsocks/redudp.h
similarity index 100%
rename from src/main/jni/redsocks/redudp.h
rename to jni/redsocks/redudp.h
diff --git a/src/main/jni/redsocks/socks4.c b/jni/redsocks/socks4.c
similarity index 100%
rename from src/main/jni/redsocks/socks4.c
rename to jni/redsocks/socks4.c
diff --git a/src/main/jni/redsocks/socks5.c b/jni/redsocks/socks5.c
similarity index 100%
rename from src/main/jni/redsocks/socks5.c
rename to jni/redsocks/socks5.c
diff --git a/src/main/jni/redsocks/socks5.h b/jni/redsocks/socks5.h
similarity index 100%
rename from src/main/jni/redsocks/socks5.h
rename to jni/redsocks/socks5.h
diff --git a/src/main/jni/redsocks/utils.c b/jni/redsocks/utils.c
similarity index 100%
rename from src/main/jni/redsocks/utils.c
rename to jni/redsocks/utils.c
diff --git a/src/main/jni/redsocks/utils.h b/jni/redsocks/utils.h
similarity index 100%
rename from src/main/jni/redsocks/utils.h
rename to jni/redsocks/utils.h
diff --git a/src/main/jni/redsocks/version.h b/jni/redsocks/version.h
similarity index 100%
rename from src/main/jni/redsocks/version.h
rename to jni/redsocks/version.h
diff --git a/src/main/jni/shadowsocks b/jni/shadowsocks
similarity index 100%
rename from src/main/jni/shadowsocks
rename to jni/shadowsocks
diff --git a/src/main/jni/system.cpp b/jni/system.cpp
similarity index 100%
rename from src/main/jni/system.cpp
rename to jni/system.cpp
diff --git a/src/main/res/xml/pref_all.xml b/src/main/res/xml/pref_all.xml
index 031f9550..07db85df 100644
--- a/src/main/res/xml/pref_all.xml
+++ b/src/main/res/xml/pref_all.xml
@@ -1,91 +1,91 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-  <PreferenceCategory 
-      android:title="@string/proxy_cat">
+    <PreferenceCategory
+            android:title="@string/proxy_cat">
 
-  <com.github.shadowsocks.preferences.ProfileEditTextPreference
-      android:defaultValue="Default"
-      android:key="profileName"
-      android:summary="@string/profile_summary"
-      android:title="@string/profile">
-  </com.github.shadowsocks.preferences.ProfileEditTextPreference>
-  <com.github.shadowsocks.preferences.SummaryEditTextPreference
-      android:defaultValue="198.199.101.152"
-      android:key="proxy"
-      android:summary="@string/proxy_summary"
-      android:title="@string/proxy">
-  </com.github.shadowsocks.preferences.SummaryEditTextPreference>
-  <com.github.shadowsocks.preferences.SummaryEditTextPreference
-      android:defaultValue="443"
-      android:key="remotePort"
-      android:summary="@string/remote_port_summary"
-      android:title="@string/remote_port">
-  </com.github.shadowsocks.preferences.SummaryEditTextPreference>
-  <com.github.shadowsocks.preferences.SummaryEditTextPreference
-      android:defaultValue="1080"
-      android:key="port"
-      android:summary="@string/port_summary"
-      android:title="@string/port">
-  </com.github.shadowsocks.preferences.SummaryEditTextPreference>
-  <com.github.shadowsocks.preferences.PasswordEditTextPreference
-      android:inputType="textPassword"
-      android:defaultValue="u1rRWTssNv0p"
-      android:key="sitekey"
-      android:summary="@string/sitekey_summary"
-      android:title="@string/sitekey">
-  </com.github.shadowsocks.preferences.PasswordEditTextPreference>
-  <ListPreference
-      android:defaultValue="rc4"
-      android:key="encMethod"
-      android:entries="@array/enc_method_entry"
-      android:entryValues="@array/enc_method_value"
-      android:title="@string/enc_method">
-  </ListPreference>
+        <com.github.shadowsocks.preferences.ProfileEditTextPreference
+                android:defaultValue="Default"
+                android:key="profileName"
+                android:summary="@string/profile_summary"
+                android:title="@string/profile">
+        </com.github.shadowsocks.preferences.ProfileEditTextPreference>
+        <com.github.shadowsocks.preferences.SummaryEditTextPreference
+                android:defaultValue="198.199.101.152"
+                android:key="proxy"
+                android:summary="@string/proxy_summary"
+                android:title="@string/proxy">
+        </com.github.shadowsocks.preferences.SummaryEditTextPreference>
+        <com.github.shadowsocks.preferences.SummaryEditTextPreference
+                android:defaultValue="443"
+                android:key="remotePort"
+                android:summary="@string/remote_port_summary"
+                android:title="@string/remote_port">
+        </com.github.shadowsocks.preferences.SummaryEditTextPreference>
+        <com.github.shadowsocks.preferences.SummaryEditTextPreference
+                android:defaultValue="1080"
+                android:key="port"
+                android:summary="@string/port_summary"
+                android:title="@string/port">
+        </com.github.shadowsocks.preferences.SummaryEditTextPreference>
+        <com.github.shadowsocks.preferences.PasswordEditTextPreference
+                android:inputType="textPassword"
+                android:defaultValue="u1rRWTssNv0p"
+                android:key="sitekey"
+                android:summary="@string/sitekey_summary"
+                android:title="@string/sitekey">
+        </com.github.shadowsocks.preferences.PasswordEditTextPreference>
+        <ListPreference
+                android:defaultValue="rc4"
+                android:key="encMethod"
+                android:entries="@array/enc_method_entry"
+                android:entryValues="@array/enc_method_value"
+                android:title="@string/enc_method">
+        </ListPreference>
 
- </PreferenceCategory>
+    </PreferenceCategory>
 
- <PreferenceCategory 
-      android:title="@string/feature_cat">
+    <PreferenceCategory
+            android:title="@string/feature_cat">
 
-  <CheckBoxPreference
-      android:defaultValue="true"
-      android:key="isGFWList"
-      android:summary="@string/auto_set_gfwlist_summary"
-      android:title="@string/auto_set_gfwlist">
-  </CheckBoxPreference>
-  <CheckBoxPreference
-      android:defaultValue="true"
-      android:key="isGlobalProxy"
-      android:disableDependentsState="true"
-      android:summary="@string/auto_set_proxy_summary"
-      android:title="@string/auto_set_proxy">
-  </CheckBoxPreference>
-  <Preference
-      android:key="proxyedApps"
-      android:dependency="isGlobalProxy"
-      android:summary="@string/proxied_apps_summary"
-      android:title="@string/proxied_apps">
-    <intent android:action="com.github.shadowsocks.AppManager"/>
-  </Preference>
-  <CheckBoxPreference
-    android:key="isTrafficStat"
-    android:defaultValue="true"
-    android:summary="@string/traffic_stat_summary"
-    android:title="@string/traffic_stat">
-  </CheckBoxPreference>
-  <CheckBoxPreference
-      android:key="isUdpDns"
-      android:defaultValue="false"
-      android:summary="@string/udp_dns_summary"
-      android:title="@string/udp_dns">
-  </CheckBoxPreference>
-  <CheckBoxPreference
-      android:key="isAutoConnect"
-      android:summary="@string/auto_connect_summary"
-      android:title="@string/auto_connect">
-  </CheckBoxPreference>
+        <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="isGFWList"
+                android:summary="@string/auto_set_gfwlist_summary"
+                android:title="@string/auto_set_gfwlist">
+        </CheckBoxPreference>
+        <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="isGlobalProxy"
+                android:disableDependentsState="true"
+                android:summary="@string/auto_set_proxy_summary"
+                android:title="@string/auto_set_proxy">
+        </CheckBoxPreference>
+        <Preference
+                android:key="proxyedApps"
+                android:dependency="isGlobalProxy"
+                android:summary="@string/proxied_apps_summary"
+                android:title="@string/proxied_apps">
+            <intent android:action="com.github.shadowsocks.AppManager"/>
+        </Preference>
+        <CheckBoxPreference
+                android:key="isTrafficStat"
+                android:defaultValue="true"
+                android:summary="@string/traffic_stat_summary"
+                android:title="@string/traffic_stat">
+        </CheckBoxPreference>
+        <CheckBoxPreference
+                android:key="isUdpDns"
+                android:defaultValue="false"
+                android:summary="@string/udp_dns_summary"
+                android:title="@string/udp_dns">
+        </CheckBoxPreference>
+        <CheckBoxPreference
+                android:key="isAutoConnect"
+                android:summary="@string/auto_connect_summary"
+                android:title="@string/auto_connect">
+        </CheckBoxPreference>
 
- </PreferenceCategory>
+    </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/src/main/res/xml/pref_feature.xml b/src/main/res/xml/pref_feature.xml
deleted file mode 100755
index a9dadc18..00000000
--- a/src/main/res/xml/pref_feature.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <CheckBoxPreference
-      android:defaultValue="true"
-      android:key="isGFWList"
-      android:summary="@string/auto_set_gfwlist_summary"
-      android:title="@string/auto_set_gfwlist">
-  </CheckBoxPreference>
-  <CheckBoxPreference
-      android:defaultValue="true"
-      android:key="isGlobalProxy"
-      android:disableDependentsState="true"
-      android:summary="@string/auto_set_proxy_summary"
-      android:title="@string/auto_set_proxy">
-  </CheckBoxPreference>
-  <Preference
-      android:key="proxyedApps"
-      android:dependency="isGlobalProxy"
-      android:summary="@string/proxied_apps_summary"
-      android:title="@string/proxied_apps">
-    <intent android:action="com.github.shadowsocks.AppManager"/>
-  </Preference>
-  <CheckBoxPreference
-    android:key="isTrafficStat"
-    android:defaultValue="true"
-    android:summary="@string/traffic_stat_summary"
-    android:title="@string/traffic_stat">
-  </CheckBoxPreference>
-  <CheckBoxPreference
-      android:key="isUdpDns"
-      android:defaultValue="false"
-      android:summary="@string/udp_dns_summary"
-      android:title="@string/udp_dns">
-  </CheckBoxPreference>
-  <CheckBoxPreference
-      android:key="isAutoConnect"
-      android:summary="@string/auto_connect_summary"
-      android:title="@string/auto_connect">
-  </CheckBoxPreference>
-
-</PreferenceScreen>
diff --git a/src/main/res/xml/pref_proxy.xml b/src/main/res/xml/pref_proxy.xml
deleted file mode 100755
index 4b89448f..00000000
--- a/src/main/res/xml/pref_proxy.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <com.github.shadowsocks.preferences.ProfileEditTextPreference
-      android:defaultValue="Default"
-      android:key="profileName"
-      android:summary="@string/profile_summary"
-      android:title="@string/profile">
-  </com.github.shadowsocks.preferences.ProfileEditTextPreference>
-  <com.github.shadowsocks.preferences.SummaryEditTextPreference
-      android:defaultValue="198.199.101.152"
-      android:key="proxy"
-      android:summary="@string/proxy_summary"
-      android:title="@string/proxy">
-  </com.github.shadowsocks.preferences.SummaryEditTextPreference>
-  <com.github.shadowsocks.preferences.SummaryEditTextPreference
-      android:defaultValue="443"
-      android:key="remotePort"
-      android:summary="@string/remote_port_summary"
-      android:title="@string/remote_port">
-  </com.github.shadowsocks.preferences.SummaryEditTextPreference>
-  <com.github.shadowsocks.preferences.SummaryEditTextPreference
-      android:defaultValue="1080"
-      android:key="port"
-      android:summary="@string/port_summary"
-      android:title="@string/port">
-  </com.github.shadowsocks.preferences.SummaryEditTextPreference>
-  <com.github.shadowsocks.preferences.PasswordEditTextPreference
-      android:inputType="textPassword"
-      android:defaultValue="u1rRWTssNv0p"
-      android:key="sitekey"
-      android:summary="@string/sitekey_summary"
-      android:title="@string/sitekey">
-  </com.github.shadowsocks.preferences.PasswordEditTextPreference>
-  <ListPreference
-      android:defaultValue="rc4"
-      android:key="encMethod"
-      android:entries="@array/enc_method_entry"
-      android:entryValues="@array/enc_method_value"
-      android:title="@string/enc_method">
-  </ListPreference>
-
-</PreferenceScreen>
diff --git a/src/main/res/xml/shadowsocks_headers.xml b/src/main/res/xml/shadowsocks_headers.xml
deleted file mode 100644
index 12ad6450..00000000
--- a/src/main/res/xml/shadowsocks_headers.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <header
-      android:fragment="com.github.shadowsocks.Shadowsocks$ProxyFragment"
-      android:title="@string/proxy_cat" />
-  <header
-      android:fragment="com.github.shadowsocks.Shadowsocks$FeatureFragment"
-      android:title="@string/feature_cat" />
-
-</preference-headers>
diff --git a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
index a9f4d519..2f0c5cfc 100644
--- a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
+++ b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
@@ -67,8 +67,6 @@ import com.github.shadowsocks.database.Profile
 import com.nostra13.universalimageloader.core.download.BaseImageDownloader
 import com.github.shadowsocks.preferences.{ProfileEditTextPreference, PasswordEditTextPreference, SummaryEditTextPreference}
 import com.github.shadowsocks.utils._
-import com.github.shadowsocks.database.Item
-import com.github.shadowsocks.database.Category
 import com.google.zxing.integration.android.IntentIntegrator
 import com.github.shadowsocks.aidl.{IShadowsocksServiceCallback, IShadowsocksService}
 import java.io._
@@ -175,7 +173,7 @@ object Shadowsocks {
     }
   }
 
-  class ProxyFragment extends PreferenceFragment {
+  class SettingsFragment extends PreferenceFragment {
 
     var receiver: BroadcastReceiver = null
 
@@ -188,52 +186,6 @@ object Shadowsocks {
           pref.setEnabled(enabled)
         }
       }
-    }
-
-    private def updatePreferenceScreen() {
-      for (name <- Shadowsocks.PROXY_PREFS) {
-        val pref = findPreference(name)
-        Shadowsocks
-          .updatePreference(pref, name, getActivity.asInstanceOf[Shadowsocks].currentProfile)
-      }
-    }
-
-    override def onCreate(bundle: Bundle) {
-      super.onCreate(bundle)
-      addPreferencesFromResource(R.xml.pref_proxy)
-      val filter = new IntentFilter()
-      filter.addAction(Action.UPDATE_FRAGMENT)
-      receiver = new BroadcastReceiver {
-        def onReceive(p1: Context, p2: Intent) {
-          setPreferenceEnabled()
-          updatePreferenceScreen()
-        }
-      }
-      getActivity.getApplicationContext.registerReceiver(receiver, filter)
-    }
-
-    override def onDestroy() {
-      super.onDestroy()
-      getActivity.getApplicationContext.unregisterReceiver(receiver)
-    }
-
-    override def onResume() {
-      super.onResume()
-      setPreferenceEnabled()
-    }
-
-    override def onPause() {
-      super.onPause()
-    }
-  }
-
-  class FeatureFragment extends PreferenceFragment {
-
-    var receiver: BroadcastReceiver = null
-
-    private def setPreferenceEnabled() {
-      val state = getActivity.asInstanceOf[Shadowsocks].state
-      val enabled: Boolean = state != State.CONNECTED && state != State.CONNECTING
       for (name <- Shadowsocks.FEATRUE_PREFS) {
         val pref: Preference = findPreference(name)
         if (pref != null) {
@@ -250,6 +202,11 @@ object Shadowsocks {
     }
 
     private def updatePreferenceScreen() {
+      for (name <- Shadowsocks.PROXY_PREFS) {
+        val pref = findPreference(name)
+        Shadowsocks
+          .updatePreference(pref, name, getActivity.asInstanceOf[Shadowsocks].currentProfile)
+      }
       for (name <- Shadowsocks.FEATRUE_PREFS) {
         val pref = findPreference(name)
         Shadowsocks
@@ -259,7 +216,7 @@ object Shadowsocks {
 
     override def onCreate(bundle: Bundle) {
       super.onCreate(bundle)
-      addPreferencesFromResource(R.xml.pref_feature)
+      addPreferencesFromResource(R.xml.pref_all)
       val filter = new IntentFilter()
       filter.addAction(Action.UPDATE_FRAGMENT)
       receiver = new BroadcastReceiver {
@@ -358,27 +315,33 @@ class Shadowsocks
 
   val handler = new Handler()
 
+  def isFallbackPref: Boolean = {
+    Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB
+  }
+
   def isSinglePane: Boolean = {
     if (singlePane == -1) {
       val metrics = new DisplayMetrics()
-      getWindowManager().getDefaultDisplay().getMetrics(metrics)
+      getWindowManager.getDefaultDisplay.getMetrics(metrics)
       val widthPixels = metrics.widthPixels
       val scaleFactor = metrics.density
-      val widthDp = widthPixels / scaleFactor 
+      val widthDp = widthPixels / scaleFactor
 
-      singlePane = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB ||
-        widthPixels <= 720) 1 else 0
+      singlePane = if (widthDp <= 720) 1
+      else 0
     }
     singlePane == 1
   }
 
-  private def changeSwitch (checked: Boolean) {
+  private def changeSwitch(checked: Boolean) {
     switchButton.setOnCheckedChangeListener(null)
     switchButton.setChecked(checked)
     if (switchButton.isEnabled) {
       switchButton.setEnabled(false)
       handler.postDelayed(new Runnable {
-        override def run() { switchButton.setEnabled(true) }
+        override def run() {
+          switchButton.setEnabled(true)
+        }
       }, 1000)
     }
     switchButton.setOnCheckedChangeListener(this)
@@ -522,7 +485,9 @@ class Shadowsocks
       if (switchButton.isEnabled) {
         switchButton.setEnabled(false)
         handler.postDelayed(new Runnable {
-          override def run() { switchButton.setEnabled(true) }
+          override def run() {
+            switchButton.setEnabled(true)
+          }
         }, 1000)
       }
     }
@@ -538,20 +503,12 @@ class Shadowsocks
   def initAdView() {
     if (settings.getString(Key.proxy, "") == "198.199.101.152") {
       val layoutView = {
-        if (Build.VERSION.SDK_INT > 10) {
-          drawer.getContentContainer.asInstanceOf[ViewGroup].getChildAt(0)
-        } else {
           getLayoutView(drawer.getContentContainer.getParent)
-        }
       }
       if (layoutView != null) {
         val adView = new AdView(this)
         adView.setAdUnitId("ca-app-pub-9097031975646651/7760346322")
-        if (isSinglePane) {
-          adView.setAdSize(AdSize.SMART_BANNER) 
-        } else {
-          adView.setAdSize(AdSize.BANNER) 
-        }
+        adView.setAdSize(AdSize.SMART_BANNER)
         layoutView.asInstanceOf[ViewGroup].addView(adView, 0)
         adView.loadAd(new AdRequest.Builder().build())
       }
@@ -564,17 +521,18 @@ class Shadowsocks
     onContentChanged()
   }
 
-  override def onBuildHeaders(target: java.util.List[PreferenceActivity.Header]) {
-    loadHeadersFromResource(R.xml.shadowsocks_headers, target);
-  }
-
   override def onCreate(savedInstanceState: Bundle) {
 
     super.onCreate(savedInstanceState)
 
-    if (isSinglePane) {
+    if (isFallbackPref) {
       // Load the legacy preferences headers
-      addPreferencesFromResource(R.xml.pref_all);
+      addPreferencesFromResource(R.xml.pref_all)
+    } else {
+      // Display the fragment as the main content.
+      getFragmentManager.beginTransaction()
+        .replace(android.R.id.content, new Shadowsocks.SettingsFragment())
+        .commit()
     }
 
     // Initialize the profile
@@ -602,6 +560,9 @@ class Shadowsocks
     drawer.setSlideDrawable(R.drawable.ic_drawer)
     // Whether the previous drawable should be shown
     drawer.setDrawerIndicatorEnabled(true)
+    if (!isSinglePane) {
+      drawer.openMenu(false)
+    }
 
     // Initialize action bar
     val switchLayout = getLayoutInflater
@@ -717,7 +678,7 @@ class Shadowsocks
         profileManager.reload(currentProfile.id)
         menuAdapter.updateList(getMenuList, currentProfile.id)
 
-        if (!isSinglePane) {
+        if (!isFallbackPref) {
           sendBroadcast(new Intent(Action.UPDATE_FRAGMENT))
         } else {
           updatePreferenceScreen()
@@ -739,7 +700,7 @@ class Shadowsocks
         profileManager.save()
         menuAdapter.updateList(getMenuList, currentProfile.id)
 
-        if (!isSinglePane) {
+        if (!isFallbackPref) {
           sendBroadcast(new Intent(Action.UPDATE_FRAGMENT))
         } else {
           updatePreferenceScreen()
@@ -761,7 +722,7 @@ class Shadowsocks
         menuAdapter.setActiveId(id)
         menuAdapter.notifyDataSetChanged()
 
-        if (!isSinglePane) {
+        if (!isFallbackPref) {
           sendBroadcast(new Intent(Action.UPDATE_FRAGMENT))
         } else {
           updatePreferenceScreen()
@@ -795,7 +756,7 @@ class Shadowsocks
         currentProfile = profileManager.load(profileId)
         menuAdapter.updateList(getMenuList, currentProfile.id)
 
-        if (!isSinglePane) {
+        if (!isFallbackPref) {
           sendBroadcast(new Intent(Action.UPDATE_FRAGMENT))
         } else {
           updatePreferenceScreen()
@@ -1119,7 +1080,7 @@ class Shadowsocks
               }
               setPreferenceEnabled(enabled = true)
           }
-          if (!isSinglePane) sendBroadcast(new Intent(Action.UPDATE_FRAGMENT))
+          if (!isFallbackPref) sendBroadcast(new Intent(Action.UPDATE_FRAGMENT))
         }
       }
     })