diff --git a/.gitignore b/.gitignore
index 8eaed0c7..a3874d87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -160,3 +160,12 @@ src/java/Keepass2AndroidPluginSDK2/build/generated/mockable-Google-Inc.-Google-A
 /src/.vs
 /src/JavaFileStorageBindings/Jars/JavaFileStorage-release.aar
 /src/PluginSdkBinding/Jars/app-debug.aar
+/src/java/KP2AKdbLibrary/libs/arm64-v8a/libfinal-key.so
+/src/java/KP2AKdbLibrary/libs/x86_64/libfinal-key.so
+/src/java/KP2ASoftkeyboard_AS/app/src/main/libs/arm64-v8a/libkp2akeyboard_jni.so
+/src/java/KP2ASoftkeyboard_AS/app/src/main/libs/armeabi-v7a/libkp2akeyboard_jni.so
+/src/java/KP2ASoftkeyboard_AS/app/src/main/libs/x86/libkp2akeyboard_jni.so
+/src/java/KP2ASoftkeyboard_AS/app/src/main/libs/x86_64/libkp2akeyboard_jni.so
+/src/java/KP2AKdbLibrary/app/build
+/src/java/KP2ASoftkeyboard_AS/app/.cxx
+/src/java/KP2ASoftkeyboard_AS/app/src/main/libs
diff --git a/src/KP2AKdbLibraryBinding/KP2AKdbLibraryBinding.csproj b/src/KP2AKdbLibraryBinding/KP2AKdbLibraryBinding.csproj
index 15da8c76..02565414 100644
--- a/src/KP2AKdbLibraryBinding/KP2AKdbLibraryBinding.csproj
+++ b/src/KP2AKdbLibraryBinding/KP2AKdbLibraryBinding.csproj
@@ -52,10 +52,11 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <LibraryProjectZip Include="..\java\KP2AKdbLibrary\app\build\outputs\aar\app-debug.aar">
+      <Link>Jars\app-debug.aar</Link>
+    </LibraryProjectZip>
     <None Include="Jars\AboutJars.txt" />
     <None Include="Additions\AboutAdditions.txt" />
-    <EmbeddedNativeLibrary Include="libs\armeabi-v7a\libfinal-key.so" />
-    <EmbeddedNativeLibrary Include="libs\armeabi\libfinal-key.so" />
   </ItemGroup>
   <ItemGroup>
     <TransformFile Include="Transforms\Metadata.xml">
@@ -65,9 +66,7 @@
     <TransformFile Include="Transforms\EnumMethods.xml" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedJar Include="..\java\KP2AKdbLibrary\bin\kp2akdblibrary.jar">
-      <Link>Jars\kp2akdblibrary.jar</Link>
-    </EmbeddedJar>
+    <Folder Include="libs\" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/KP2AKdbLibraryBinding/libs/armeabi-v7a/libfinal-key.so b/src/KP2AKdbLibraryBinding/libs/armeabi-v7a/libfinal-key.so
deleted file mode 100644
index bc6b1237..00000000
Binary files a/src/KP2AKdbLibraryBinding/libs/armeabi-v7a/libfinal-key.so and /dev/null differ
diff --git a/src/KP2AKdbLibraryBinding/libs/armeabi/libfinal-key.so b/src/KP2AKdbLibraryBinding/libs/armeabi/libfinal-key.so
deleted file mode 100644
index 10345c0e..00000000
Binary files a/src/KP2AKdbLibraryBinding/libs/armeabi/libfinal-key.so and /dev/null differ
diff --git a/src/SamsungPass b/src/SamsungPass
index c8f1fb43..f3c6bbe2 160000
--- a/src/SamsungPass
+++ b/src/SamsungPass
@@ -1 +1 @@
-Subproject commit c8f1fb43f26c22931ad53f9691f7e8f77dde6b04
+Subproject commit f3c6bbe22436627376f36ba8f7efdc026bb75c60
diff --git a/src/build-scripts/build-java.bat b/src/build-scripts/build-java.bat
index 581fda44..e9f5da5e 100644
--- a/src/build-scripts/build-java.bat
+++ b/src/build-scripts/build-java.bat
@@ -7,6 +7,10 @@ call gradlew assemble
 cd ..\Keepass2AndroidPluginSDK2
 call gradlew assemble
 
+
+cd ..\KP2AKdbLibrary
+call gradlew assemble
+
 cd ..\PluginQR
 call gradlew assemble
 
diff --git a/src/java/KP2AKdbLibrary/.classpath b/src/java/KP2AKdbLibrary/.classpath
deleted file mode 100644
index 51769745..00000000
--- a/src/java/KP2AKdbLibrary/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>
diff --git a/src/java/KP2AKdbLibrary/.gitignore b/src/java/KP2AKdbLibrary/.gitignore
deleted file mode 100644
index eb8ccedb..00000000
--- a/src/java/KP2AKdbLibrary/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-build.properties
-local.properties
-bin
-gen
-obj
diff --git a/src/java/KP2AKdbLibrary/.project b/src/java/KP2AKdbLibrary/.project
deleted file mode 100644
index 3da51bd9..00000000
--- a/src/java/KP2AKdbLibrary/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>KP2AKdbLibrary</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/src/java/KP2AKdbLibrary/.settings/org.eclipse.jdt.core.prefs b/src/java/KP2AKdbLibrary/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index b080d2dd..00000000
--- a/src/java/KP2AKdbLibrary/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/src/java/KP2AKdbLibrary/COPYING.gpl-2.0 b/src/java/KP2AKdbLibrary/COPYING.gpl-2.0
deleted file mode 100644
index d511905c..00000000
--- a/src/java/KP2AKdbLibrary/COPYING.gpl-2.0
+++ /dev/null
@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/src/java/KP2AKdbLibrary/LICENSE b/src/java/KP2AKdbLibrary/LICENSE
deleted file mode 100644
index 6a72a87c..00000000
--- a/src/java/KP2AKdbLibrary/LICENSE
+++ /dev/null
@@ -1,306 +0,0 @@
----
-
-The KeePass icon was created by Francis Jacquerye and is licensed under the terms of the GPLv2 or GPLv3.
-
-
----
-
-Files under src/org/apache/*
-
-	Licensed to the Apache Software Foundation (ASF) under one or more
-	contributor license agreements.  See the NOTICE file distributed with
-	this work for additional information regarding copyright ownership.
-	The ASF licenses this file to You under the Apache License, Version 2.0
-	(the "License"); you may not use this file except in compliance with
-	the License.  You may obtain a copy of the License at
-      http://www.apache.org/licenses/LICENSE-2.0
-	  Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
----
-  
-Files under src/org/bouncycaste1x/*:
-
-    Copyright (c) 2000 - 2008 The Legion Of The Bouncy Castle
-    (http://www.bouncycastle.org)
-
-    Permission is hereby granted, free of charge, to any person obtaining a
-    copy of this software and associated documentation files (the "Software"),
-    to deal in the Software without restriction, including without limitation
-    the rights to use, copy, modify, merge, publish, distribute, sublicense,
-    and/or sell copies of the Software, and to permit persons to whom the
-    Software is furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-    DEALINGS IN THE SOFTWARE. 
-
----
-
-Files under src/org/phoneid/*:
-
-    KeePass for J2ME
-
-    Copyright 2007 Naomaru Itoi <nao@phoneid.org>
-
-    This file was derived from 
-
-    Java clone of KeePass - A KeePass file viewer for Java
-    Copyright 2006 Bill Zwicky <billzwicky@users.sourceforge.net>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; version 2
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
----
-
-Files under src/com/android/keepass/* :
-
-Copyright 2009 Brian Pellin <bpellin@gmail.com>.
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
----
-
-Files under jni/openssl-0.98l/*:
-
-/* ====================================================================
- * Copyright (c) 1998-2008 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
----
-
-Files under biz.source_code.base64Coder
-
-// Copyright 2003-2010 Christian d'Heureuse, Inventec Informatik AG, Zurich, Switzerland
-// www.source-code.biz, www.inventec.ch/chdh
-//
-// This module is multi-licensed and may be used under the terms
-// of any of the following licenses:
-//
-//  EPL, Eclipse Public License, http://www.eclipse.org/legal
-//  LGPL, GNU Lesser General Public License, http://www.gnu.org/licenses/lgpl.html
-//  AL, Apache License, http://www.apache.org/licenses
-//  BSD, BSD License, http://www.opensource.org/licenses/bsd-license.php
-//
-// Please contact the author if you need another license.
-// This module is provided "as is", without warranties of any kind.
-
----
- 
-Files ic00.png to ic61.png under res/drawable, res/drawable-hdpi and res/drawable-ldpi
-
-TITLE:    NUVOLA ICON THEME for KDE 3.x
-AUTHOR:    David Vignoni | ICON KING
-SITE:    http://www.icon-king.com
-MAILING LIST: http://mail.icon-king.com/mailman/listinfo/nuvola_icon-king.com
-
-Copyright (c)  2003-2004  David Vignoni.
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation,
-version 2.1 of the License.
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-You should have received a copy of the GNU Lesser General Public
-License along with this library (see the the license.txt file); if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#######**** NOTE THIS ADD-ON ****#######
-The GNU Lesser General Public License or LGPL is written for software libraries
-in the first place. The LGPL has to be considered valid for this artwork
-library too.
-Nuvola icon theme for KDE 3.x is a special kind of software library, it is an
-artwork library, it's elements can be used in a Graphical User Interface, or
-GUI.
-Source code, for this library means:
- - raster png image* .
-The LGPL in some sections obliges you to make the files carry
-notices. With images this is in some cases impossible or hardly usefull.
-With this library a notice is placed at a prominent place in the directory
-containing the elements. You may follow this practice.
-The exception in section 6 of the GNU Lesser General Public License covers
-the use of elements of this art library in a GUI.
-dave [at] icon-king.com
-
-Date:        15 october 2004
-Version:    1.0
-
-DESCRIPTION:
-
-Icon theme for KDE 3.x.
-Icons where designed using Adobe Illustrator, and then exported to PNG format.
-Icons shadows and minor corrections were done using Adobe Photoshop.
-Kiconedit was used to correct some 16x16 and 22x22 icons.
-
-LICENSE
-
-Released under GNU Lesser General Public License (LGPL)
-Look at the license.txt file.
-
-CONTACT
-
-David Vignoni
-e-mail :        david [at] icon-king.com
-ICQ :            117761009
-http:               http://www.icon-king.com
-
----
-
-Files ic62.png under res/drawable, res/drawable-hdpi and res/drawable-ldpi
-
-Based on http://de.wikipedia.org/w/index.php?title=Datei:Tux.svg&filetimestamp=20090927073505
-
-The copyright holder of this file allows anyone to use it for any purpose, 
-provided that the copyright holders Larry Ewing, Simon Budig and
-Anja Gerwinski are mentioned.
-
----
-
-Files ic63.png under res/drawable, res/drawable-hdpi and res/drawable-ldpi
-
-Based on http://en.wikipedia.org/wiki/File:ASF-logo.svg
-
-Apache logo
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License. You may
-obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-License for the specific language governing permissions and limitations under
-the License.
-
----
-
-Files ic64.png under res/drawable, res/drawable-hdpi and res/drawable-ldpi
-
-!!! Not included yet !!!
-
----
-
-Files ic65.png, ic67.png and ic68.png under res/drawable, res/drawable-hdpi and res/drawable-ldpi
-
-Created by Tobias Selig and licensed under the terms of the GPLv2 or GPLv3.
-
----
-
-File ic66.png under under res/drawable, res/drawable-hdpi and res/drawable-ldpi
-
-Based on http://commons.wikimedia.org/wiki/File:Dollar_symbol_gold.svg
-
-Author: Rugby471
-
-Permission is granted to copy, distribute and/or modify this document under
-the terms of the GNU Free Documentation License, Version 1.2 or any later
-version published by the Free Software Foundation; with no Invariant Sections,
-no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is
-included in the section entitled "GNU Free Documentation License".
-
----
-
-Many files under jni/final_key/ are coverage by the following license:
-
- Copyright (c) 1998-2008, Brian Gladman, Worcester, UK. All rights reserved.
-
- LICENSE TERMS
-
- The redistribution and use of this software (with or without changes)
- is allowed without the payment of fees or royalties provided that:
-
-  1. source code distributions include the above copyright notice, this
-     list of conditions and the following disclaimer;
-
-  2. binary distributions include the above copyright notice, this list
-     of conditions and the following disclaimer in their documentation;
-
-  3. the name of the copyright holder is not used to endorse products
-     built using this software without specific written permission.
-
- DISCLAIMER
-
- This software is provided 'as is' with no explicit or implied warranties
- in respect of its properties, including, but not limited to, correctness
- and/or fitness for purpose.
-
diff --git a/src/java/KP2AKdbLibrary/README b/src/java/KP2AKdbLibrary/README
deleted file mode 100644
index ab5f669e..00000000
--- a/src/java/KP2AKdbLibrary/README
+++ /dev/null
@@ -1 +0,0 @@
-Created by extracting parts of Keepassdroid 
\ No newline at end of file
diff --git a/src/java/KP2AKdbLibrary/app/build.gradle b/src/java/KP2AKdbLibrary/app/build.gradle
new file mode 100644
index 00000000..d8bb2f94
--- /dev/null
+++ b/src/java/KP2AKdbLibrary/app/build.gradle
@@ -0,0 +1,25 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 23
+    buildToolsVersion '28.0.3'
+
+    defaultConfig {
+        ndk.abiFilters 'armeabi-v7a','arm64-v8a','x86','x86_64'
+
+
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+        }
+    }
+
+    externalNativeBuild {
+        ndkBuild {
+            path 'src/main/jni/Android.mk'
+        }
+    }
+}
diff --git a/src/java/KP2AKdbLibrary/AndroidManifest.xml b/src/java/KP2AKdbLibrary/app/src/main/AndroidManifest.xml
similarity index 59%
rename from src/java/KP2AKdbLibrary/AndroidManifest.xml
rename to src/java/KP2AKdbLibrary/app/src/main/AndroidManifest.xml
index d2e540ed..1b4134bc 100644
--- a/src/java/KP2AKdbLibrary/AndroidManifest.xml
+++ b/src/java/KP2AKdbLibrary/app/src/main/AndroidManifest.xml
@@ -3,12 +3,8 @@
     android:versionCode="1"
     android:versionName="1.0" >
 
-    <uses-sdk
-        android:minSdkVersion="8"
-        android:targetSdkVersion="17" />
 
-    <application
-        android:allowBackup="true">
+    <application>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/UpdateStatus.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/UpdateStatus.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/UpdateStatus.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/UpdateStatus.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/crypto/AESProvider.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/crypto/AESProvider.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/crypto/AESProvider.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/crypto/AESProvider.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/crypto/BouncyCastleProvider.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/crypto/BouncyCastleProvider.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/crypto/BouncyCastleProvider.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/crypto/BouncyCastleProvider.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/crypto/CipherFactory.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/crypto/CipherFactory.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/crypto/CipherFactory.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/crypto/CipherFactory.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/crypto/NativeAESCipherSpi.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/crypto/NativeAESCipherSpi.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/crypto/NativeAESCipherSpi.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/crypto/NativeAESCipherSpi.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/crypto/NativeLib.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/crypto/NativeLib.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/crypto/NativeLib.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/crypto/NativeLib.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/crypto/PwStreamCipherFactory.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/crypto/PwStreamCipherFactory.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/crypto/PwStreamCipherFactory.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/crypto/PwStreamCipherFactory.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/crypto/finalkey/AndroidFinalKey.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/crypto/finalkey/AndroidFinalKey.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/crypto/finalkey/AndroidFinalKey.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/crypto/finalkey/AndroidFinalKey.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/crypto/finalkey/FinalKey.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/crypto/finalkey/FinalKey.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/crypto/finalkey/FinalKey.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/crypto/finalkey/FinalKey.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/crypto/finalkey/FinalKeyFactory.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/crypto/finalkey/FinalKeyFactory.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/crypto/finalkey/FinalKeyFactory.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/crypto/finalkey/FinalKeyFactory.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/crypto/finalkey/NativeFinalKey.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/crypto/finalkey/NativeFinalKey.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/crypto/finalkey/NativeFinalKey.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/crypto/finalkey/NativeFinalKey.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/database/CrsAlgorithm.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/CrsAlgorithm.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/database/CrsAlgorithm.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/CrsAlgorithm.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/database/ITimeLogger.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/ITimeLogger.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/database/ITimeLogger.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/ITimeLogger.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/database/PwCompressionAlgorithm.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/PwCompressionAlgorithm.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/database/PwCompressionAlgorithm.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/PwCompressionAlgorithm.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/database/PwDatabaseV3.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/PwDatabaseV3.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/database/PwDatabaseV3.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/PwDatabaseV3.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/database/PwDate.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/PwDate.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/database/PwDate.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/PwDate.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/database/PwDbHeader.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/PwDbHeader.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/database/PwDbHeader.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/PwDbHeader.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/database/PwDbHeaderFactory.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/PwDbHeaderFactory.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/database/PwDbHeaderFactory.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/PwDbHeaderFactory.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/database/PwDbHeaderV3.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/PwDbHeaderV3.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/database/PwDbHeaderV3.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/PwDbHeaderV3.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/database/PwDeletedObject.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/PwDeletedObject.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/database/PwDeletedObject.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/PwDeletedObject.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/database/PwEncryptionAlgorithm.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/PwEncryptionAlgorithm.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/database/PwEncryptionAlgorithm.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/PwEncryptionAlgorithm.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/database/PwEntryV3.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/PwEntryV3.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/database/PwEntryV3.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/PwEntryV3.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/database/PwGroupId.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/PwGroupId.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/database/PwGroupId.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/PwGroupId.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/database/PwGroupIdV3.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/PwGroupIdV3.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/database/PwGroupIdV3.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/PwGroupIdV3.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/database/PwGroupV3.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/PwGroupV3.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/database/PwGroupV3.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/PwGroupV3.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/database/PwIconFactory.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/PwIconFactory.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/database/PwIconFactory.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/PwIconFactory.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/database/PwIconStandard.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/PwIconStandard.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/database/PwIconStandard.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/PwIconStandard.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/database/exception/ArcFourException.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/exception/ArcFourException.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/database/exception/ArcFourException.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/exception/ArcFourException.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/database/exception/InconsistentDBException.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/exception/InconsistentDBException.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/database/exception/InconsistentDBException.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/exception/InconsistentDBException.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/database/exception/InvalidAlgorithmException.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/exception/InvalidAlgorithmException.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/database/exception/InvalidAlgorithmException.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/exception/InvalidAlgorithmException.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/database/exception/InvalidDBException.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/exception/InvalidDBException.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/database/exception/InvalidDBException.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/exception/InvalidDBException.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/database/exception/InvalidDBSignatureException.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/exception/InvalidDBSignatureException.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/database/exception/InvalidDBSignatureException.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/exception/InvalidDBSignatureException.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/database/exception/InvalidDBVersionException.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/exception/InvalidDBVersionException.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/database/exception/InvalidDBVersionException.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/exception/InvalidDBVersionException.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/database/exception/InvalidKeyFileException.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/exception/InvalidKeyFileException.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/database/exception/InvalidKeyFileException.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/exception/InvalidKeyFileException.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/database/exception/InvalidPasswordException.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/exception/InvalidPasswordException.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/database/exception/InvalidPasswordException.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/exception/InvalidPasswordException.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/database/exception/KeyFileEmptyException.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/exception/KeyFileEmptyException.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/database/exception/KeyFileEmptyException.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/exception/KeyFileEmptyException.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/database/exception/PwDbOutputException.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/exception/PwDbOutputException.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/database/exception/PwDbOutputException.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/exception/PwDbOutputException.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/database/exception/SamsungClipboardException.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/exception/SamsungClipboardException.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/database/exception/SamsungClipboardException.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/exception/SamsungClipboardException.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/database/load/ImporterV3.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/load/ImporterV3.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/database/load/ImporterV3.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/load/ImporterV3.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/database/save/PwDbHeaderOutput.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/save/PwDbHeaderOutput.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/database/save/PwDbHeaderOutput.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/save/PwDbHeaderOutput.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/database/save/PwDbHeaderOutputV3.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/save/PwDbHeaderOutputV3.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/database/save/PwDbHeaderOutputV3.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/save/PwDbHeaderOutputV3.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/database/save/PwDbOutput.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/save/PwDbOutput.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/database/save/PwDbOutput.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/save/PwDbOutput.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/database/save/PwDbV3Output.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/save/PwDbV3Output.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/database/save/PwDbV3Output.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/save/PwDbV3Output.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/database/save/PwEntryOutputV3.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/save/PwEntryOutputV3.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/database/save/PwEntryOutputV3.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/save/PwEntryOutputV3.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/database/save/PwGroupOutputV3.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/save/PwGroupOutputV3.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/database/save/PwGroupOutputV3.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/save/PwGroupOutputV3.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/database/security/ProtectedBinary.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/security/ProtectedBinary.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/database/security/ProtectedBinary.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/security/ProtectedBinary.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/database/security/ProtectedString.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/security/ProtectedString.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/database/security/ProtectedString.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/database/security/ProtectedString.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/stream/BetterCipherInputStream.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/stream/BetterCipherInputStream.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/stream/BetterCipherInputStream.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/stream/BetterCipherInputStream.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/stream/CopyInputStream.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/stream/CopyInputStream.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/stream/CopyInputStream.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/stream/CopyInputStream.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/stream/CountInputStream.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/stream/CountInputStream.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/stream/CountInputStream.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/stream/CountInputStream.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/stream/CountOutputStream.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/stream/CountOutputStream.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/stream/CountOutputStream.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/stream/CountOutputStream.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/stream/HashedBlockInputStream.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/stream/HashedBlockInputStream.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/stream/HashedBlockInputStream.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/stream/HashedBlockInputStream.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/stream/HashedBlockOutputStream.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/stream/HashedBlockOutputStream.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/stream/HashedBlockOutputStream.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/stream/HashedBlockOutputStream.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/stream/LEDataInputStream.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/stream/LEDataInputStream.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/stream/LEDataInputStream.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/stream/LEDataInputStream.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/stream/LEDataOutputStream.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/stream/LEDataOutputStream.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/stream/LEDataOutputStream.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/stream/LEDataOutputStream.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/stream/NullOutputStream.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/stream/NullOutputStream.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/stream/NullOutputStream.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/stream/NullOutputStream.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/stream/RandomFileOutputStream.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/stream/RandomFileOutputStream.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/stream/RandomFileOutputStream.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/stream/RandomFileOutputStream.java
diff --git a/src/java/KP2AKdbLibrary/src/com/keepassdroid/utils/Types.java b/src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/utils/Types.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/com/keepassdroid/utils/Types.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/com/keepassdroid/utils/Types.java
diff --git a/src/java/KP2AKdbLibrary/src/org/apache/commons/collections/IterableMap.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/apache/commons/collections/IterableMap.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/apache/commons/collections/IterableMap.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/apache/commons/collections/IterableMap.java
diff --git a/src/java/KP2AKdbLibrary/src/org/apache/commons/collections/KeyValue.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/apache/commons/collections/KeyValue.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/apache/commons/collections/KeyValue.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/apache/commons/collections/KeyValue.java
diff --git a/src/java/KP2AKdbLibrary/src/org/apache/commons/collections/MapIterator.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/apache/commons/collections/MapIterator.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/apache/commons/collections/MapIterator.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/apache/commons/collections/MapIterator.java
diff --git a/src/java/KP2AKdbLibrary/src/org/apache/commons/collections/ResettableIterator.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/apache/commons/collections/ResettableIterator.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/apache/commons/collections/ResettableIterator.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/apache/commons/collections/ResettableIterator.java
diff --git a/src/java/KP2AKdbLibrary/src/org/apache/commons/collections/iterators/AbstractEmptyIterator.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/apache/commons/collections/iterators/AbstractEmptyIterator.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/apache/commons/collections/iterators/AbstractEmptyIterator.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/apache/commons/collections/iterators/AbstractEmptyIterator.java
diff --git a/src/java/KP2AKdbLibrary/src/org/apache/commons/collections/iterators/EmptyIterator.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/apache/commons/collections/iterators/EmptyIterator.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/apache/commons/collections/iterators/EmptyIterator.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/apache/commons/collections/iterators/EmptyIterator.java
diff --git a/src/java/KP2AKdbLibrary/src/org/apache/commons/collections/iterators/EmptyMapIterator.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/apache/commons/collections/iterators/EmptyMapIterator.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/apache/commons/collections/iterators/EmptyMapIterator.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/apache/commons/collections/iterators/EmptyMapIterator.java
diff --git a/src/java/KP2AKdbLibrary/src/org/apache/commons/collections/keyvalue/AbstractKeyValue.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/apache/commons/collections/keyvalue/AbstractKeyValue.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/apache/commons/collections/keyvalue/AbstractKeyValue.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/apache/commons/collections/keyvalue/AbstractKeyValue.java
diff --git a/src/java/KP2AKdbLibrary/src/org/apache/commons/collections/keyvalue/AbstractMapEntry.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/apache/commons/collections/keyvalue/AbstractMapEntry.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/apache/commons/collections/keyvalue/AbstractMapEntry.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/apache/commons/collections/keyvalue/AbstractMapEntry.java
diff --git a/src/java/KP2AKdbLibrary/src/org/apache/commons/collections/keyvalue/DefaultMapEntry.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/apache/commons/collections/keyvalue/DefaultMapEntry.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/apache/commons/collections/keyvalue/DefaultMapEntry.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/apache/commons/collections/keyvalue/DefaultMapEntry.java
diff --git a/src/java/KP2AKdbLibrary/src/org/apache/commons/collections/map/AbstractHashedMap.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/apache/commons/collections/map/AbstractHashedMap.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/apache/commons/collections/map/AbstractHashedMap.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/apache/commons/collections/map/AbstractHashedMap.java
diff --git a/src/java/KP2AKdbLibrary/src/org/apache/commons/collections/map/AbstractReferenceMap.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/apache/commons/collections/map/AbstractReferenceMap.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/apache/commons/collections/map/AbstractReferenceMap.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/apache/commons/collections/map/AbstractReferenceMap.java
diff --git a/src/java/KP2AKdbLibrary/src/org/apache/commons/collections/map/ReferenceMap.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/apache/commons/collections/map/ReferenceMap.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/apache/commons/collections/map/ReferenceMap.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/apache/commons/collections/map/ReferenceMap.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ASN1ApplicationSpecificParser.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ASN1ApplicationSpecificParser.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ASN1ApplicationSpecificParser.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ASN1ApplicationSpecificParser.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ASN1Choice.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ASN1Choice.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ASN1Choice.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ASN1Choice.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ASN1Encodable.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ASN1Encodable.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ASN1Encodable.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ASN1Encodable.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ASN1EncodableVector.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ASN1EncodableVector.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ASN1EncodableVector.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ASN1EncodableVector.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ASN1Generator.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ASN1Generator.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ASN1Generator.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ASN1Generator.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ASN1InputStream.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ASN1InputStream.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ASN1InputStream.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ASN1InputStream.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ASN1Null.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ASN1Null.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ASN1Null.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ASN1Null.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ASN1Object.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ASN1Object.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ASN1Object.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ASN1Object.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ASN1ObjectParser.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ASN1ObjectParser.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ASN1ObjectParser.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ASN1ObjectParser.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ASN1OctetString.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ASN1OctetString.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ASN1OctetString.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ASN1OctetString.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ASN1OctetStringParser.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ASN1OctetStringParser.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ASN1OctetStringParser.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ASN1OctetStringParser.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ASN1OutputStream.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ASN1OutputStream.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ASN1OutputStream.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ASN1OutputStream.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ASN1ParsingException.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ASN1ParsingException.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ASN1ParsingException.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ASN1ParsingException.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ASN1Sequence.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ASN1Sequence.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ASN1Sequence.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ASN1Sequence.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ASN1SequenceParser.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ASN1SequenceParser.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ASN1SequenceParser.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ASN1SequenceParser.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ASN1Set.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ASN1Set.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ASN1Set.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ASN1Set.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ASN1SetParser.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ASN1SetParser.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ASN1SetParser.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ASN1SetParser.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ASN1StreamParser.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ASN1StreamParser.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ASN1StreamParser.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ASN1StreamParser.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ASN1TaggedObject.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ASN1TaggedObject.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ASN1TaggedObject.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ASN1TaggedObject.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ASN1TaggedObjectParser.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ASN1TaggedObjectParser.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ASN1TaggedObjectParser.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ASN1TaggedObjectParser.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/BERApplicationSpecific.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/BERApplicationSpecific.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/BERApplicationSpecific.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/BERApplicationSpecific.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/BERApplicationSpecificParser.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/BERApplicationSpecificParser.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/BERApplicationSpecificParser.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/BERApplicationSpecificParser.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/BERConstructedOctetString.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/BERConstructedOctetString.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/BERConstructedOctetString.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/BERConstructedOctetString.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/BERConstructedSequence.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/BERConstructedSequence.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/BERConstructedSequence.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/BERConstructedSequence.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/BERFactory.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/BERFactory.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/BERFactory.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/BERFactory.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/BERGenerator.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/BERGenerator.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/BERGenerator.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/BERGenerator.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/BERInputStream.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/BERInputStream.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/BERInputStream.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/BERInputStream.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/BERNull.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/BERNull.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/BERNull.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/BERNull.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/BEROctetStringGenerator.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/BEROctetStringGenerator.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/BEROctetStringGenerator.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/BEROctetStringGenerator.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/BEROctetStringParser.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/BEROctetStringParser.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/BEROctetStringParser.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/BEROctetStringParser.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/BEROutputStream.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/BEROutputStream.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/BEROutputStream.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/BEROutputStream.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/BERSequence.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/BERSequence.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/BERSequence.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/BERSequence.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/BERSequenceGenerator.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/BERSequenceGenerator.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/BERSequenceGenerator.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/BERSequenceGenerator.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/BERSequenceParser.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/BERSequenceParser.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/BERSequenceParser.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/BERSequenceParser.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/BERSet.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/BERSet.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/BERSet.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/BERSet.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/BERSetParser.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/BERSetParser.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/BERSetParser.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/BERSetParser.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/BERTaggedObject.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/BERTaggedObject.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/BERTaggedObject.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/BERTaggedObject.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/BERTaggedObjectParser.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/BERTaggedObjectParser.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/BERTaggedObjectParser.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/BERTaggedObjectParser.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ConstructedOctetStream.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ConstructedOctetStream.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/ConstructedOctetStream.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/ConstructedOctetStream.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERApplicationSpecific.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERApplicationSpecific.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERApplicationSpecific.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERApplicationSpecific.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERBMPString.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERBMPString.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERBMPString.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERBMPString.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERBitString.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERBitString.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERBitString.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERBitString.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERBoolean.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERBoolean.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERBoolean.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERBoolean.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERConstructedSequence.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERConstructedSequence.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERConstructedSequence.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERConstructedSequence.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERConstructedSet.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERConstructedSet.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERConstructedSet.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERConstructedSet.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DEREncodable.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DEREncodable.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DEREncodable.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DEREncodable.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DEREncodableVector.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DEREncodableVector.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DEREncodableVector.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DEREncodableVector.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DEREnumerated.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DEREnumerated.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DEREnumerated.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DEREnumerated.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERExternal.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERExternal.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERExternal.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERExternal.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERExternalParser.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERExternalParser.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERExternalParser.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERExternalParser.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERFactory.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERFactory.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERFactory.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERFactory.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERGeneralString.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERGeneralString.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERGeneralString.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERGeneralString.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERGeneralizedTime.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERGeneralizedTime.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERGeneralizedTime.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERGeneralizedTime.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERGenerator.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERGenerator.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERGenerator.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERGenerator.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERIA5String.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERIA5String.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERIA5String.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERIA5String.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERInputStream.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERInputStream.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERInputStream.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERInputStream.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERInteger.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERInteger.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERInteger.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERInteger.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERNull.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERNull.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERNull.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERNull.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERNumericString.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERNumericString.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERNumericString.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERNumericString.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERObject.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERObject.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERObject.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERObject.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERObjectIdentifier.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERObjectIdentifier.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERObjectIdentifier.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERObjectIdentifier.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DEROctetString.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DEROctetString.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DEROctetString.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DEROctetString.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DEROctetStringParser.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DEROctetStringParser.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DEROctetStringParser.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DEROctetStringParser.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DEROutputStream.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DEROutputStream.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DEROutputStream.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DEROutputStream.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERPrintableString.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERPrintableString.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERPrintableString.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERPrintableString.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERSequence.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERSequence.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERSequence.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERSequence.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERSequenceGenerator.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERSequenceGenerator.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERSequenceGenerator.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERSequenceGenerator.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERSequenceParser.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERSequenceParser.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERSequenceParser.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERSequenceParser.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERSet.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERSet.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERSet.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERSet.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERSetParser.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERSetParser.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERSetParser.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERSetParser.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERString.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERString.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERString.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERString.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERT61String.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERT61String.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERT61String.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERT61String.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERTaggedObject.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERTaggedObject.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERTaggedObject.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERTaggedObject.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERTags.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERTags.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERTags.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERTags.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERUTCTime.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERUTCTime.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERUTCTime.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERUTCTime.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERUTF8String.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERUTF8String.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERUTF8String.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERUTF8String.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERUniversalString.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERUniversalString.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERUniversalString.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERUniversalString.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERUnknownTag.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERUnknownTag.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERUnknownTag.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERUnknownTag.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERVisibleString.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERVisibleString.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DERVisibleString.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DERVisibleString.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DefiniteLengthInputStream.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DefiniteLengthInputStream.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/DefiniteLengthInputStream.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/DefiniteLengthInputStream.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/IndefiniteLengthInputStream.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/IndefiniteLengthInputStream.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/IndefiniteLengthInputStream.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/IndefiniteLengthInputStream.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/LazyDERConstructionEnumeration.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/LazyDERConstructionEnumeration.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/LazyDERConstructionEnumeration.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/LazyDERConstructionEnumeration.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/LimitedInputStream.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/LimitedInputStream.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/LimitedInputStream.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/LimitedInputStream.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/OIDTokenizer.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/OIDTokenizer.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/OIDTokenizer.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/OIDTokenizer.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/oiw/ElGamalParameter.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/oiw/ElGamalParameter.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/oiw/ElGamalParameter.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/oiw/ElGamalParameter.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/oiw/OIWObjectIdentifiers.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/oiw/OIWObjectIdentifiers.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/oiw/OIWObjectIdentifiers.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/oiw/OIWObjectIdentifiers.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/pkcs/Attribute.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/pkcs/Attribute.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/pkcs/Attribute.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/pkcs/Attribute.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/pkcs/AuthenticatedSafe.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/pkcs/AuthenticatedSafe.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/pkcs/AuthenticatedSafe.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/pkcs/AuthenticatedSafe.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/pkcs/CertBag.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/pkcs/CertBag.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/pkcs/CertBag.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/pkcs/CertBag.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/pkcs/ContentInfo.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/pkcs/ContentInfo.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/pkcs/ContentInfo.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/pkcs/ContentInfo.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/pkcs/DHParameter.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/pkcs/DHParameter.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/pkcs/DHParameter.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/pkcs/DHParameter.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/pkcs/PBKDF2Params.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/pkcs/PBKDF2Params.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/pkcs/PBKDF2Params.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/pkcs/PBKDF2Params.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/pkcs/PKCS12PBEParams.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/pkcs/PKCS12PBEParams.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/pkcs/PKCS12PBEParams.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/pkcs/PKCS12PBEParams.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/pkcs/PKCSObjectIdentifiers.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/pkcs/PKCSObjectIdentifiers.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/pkcs/PKCSObjectIdentifiers.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/pkcs/PKCSObjectIdentifiers.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/pkcs/RC2CBCParameter.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/pkcs/RC2CBCParameter.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/pkcs/RC2CBCParameter.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/pkcs/RC2CBCParameter.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/pkcs/RSAPrivateKeyStructure.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/pkcs/RSAPrivateKeyStructure.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/pkcs/RSAPrivateKeyStructure.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/pkcs/RSAPrivateKeyStructure.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/pkcs/SafeBag.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/pkcs/SafeBag.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/pkcs/SafeBag.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/pkcs/SafeBag.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/pkcs/SignedData.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/pkcs/SignedData.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/pkcs/SignedData.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/pkcs/SignedData.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/util/ASN1Dump.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/util/ASN1Dump.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/util/ASN1Dump.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/util/ASN1Dump.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/util/DERDump.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/util/DERDump.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/util/DERDump.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/util/DERDump.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/util/Dump.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/util/Dump.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/util/Dump.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/asn1/util/Dump.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/BlockCipher.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/BlockCipher.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/BlockCipher.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/BlockCipher.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/BufferedBlockCipher.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/BufferedBlockCipher.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/BufferedBlockCipher.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/BufferedBlockCipher.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/CipherParameters.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/CipherParameters.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/CipherParameters.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/CipherParameters.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/CryptoException.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/CryptoException.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/CryptoException.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/CryptoException.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/DataLengthException.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/DataLengthException.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/DataLengthException.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/DataLengthException.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/Digest.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/Digest.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/Digest.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/Digest.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/ExtendedDigest.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/ExtendedDigest.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/ExtendedDigest.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/ExtendedDigest.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/InvalidCipherTextException.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/InvalidCipherTextException.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/InvalidCipherTextException.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/InvalidCipherTextException.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/Mac.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/Mac.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/Mac.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/Mac.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/MaxBytesExceededException.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/MaxBytesExceededException.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/MaxBytesExceededException.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/MaxBytesExceededException.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/PBEParametersGenerator.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/PBEParametersGenerator.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/PBEParametersGenerator.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/PBEParametersGenerator.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/RuntimeCryptoException.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/RuntimeCryptoException.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/RuntimeCryptoException.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/RuntimeCryptoException.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/StreamBlockCipher.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/StreamBlockCipher.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/StreamBlockCipher.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/StreamBlockCipher.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/StreamCipher.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/StreamCipher.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/StreamCipher.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/StreamCipher.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/Wrapper.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/Wrapper.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/Wrapper.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/Wrapper.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/digests/GeneralDigest.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/digests/GeneralDigest.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/digests/GeneralDigest.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/digests/GeneralDigest.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/digests/MD2Digest.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/digests/MD2Digest.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/digests/MD2Digest.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/digests/MD2Digest.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/digests/MD5Digest.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/digests/MD5Digest.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/digests/MD5Digest.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/digests/MD5Digest.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/digests/RIPEMD160Digest.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/digests/RIPEMD160Digest.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/digests/RIPEMD160Digest.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/digests/RIPEMD160Digest.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/digests/SHA1Digest.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/digests/SHA1Digest.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/digests/SHA1Digest.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/digests/SHA1Digest.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/digests/SHA256Digest.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/digests/SHA256Digest.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/digests/SHA256Digest.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/digests/SHA256Digest.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/digests/TigerDigest.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/digests/TigerDigest.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/digests/TigerDigest.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/digests/TigerDigest.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/engines/Salsa20Engine.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/engines/Salsa20Engine.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/engines/Salsa20Engine.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/engines/Salsa20Engine.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/engines/TwofishEngine.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/engines/TwofishEngine.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/engines/TwofishEngine.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/engines/TwofishEngine.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/generators/OpenSSLPBEParametersGenerator.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/generators/OpenSSLPBEParametersGenerator.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/generators/OpenSSLPBEParametersGenerator.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/generators/OpenSSLPBEParametersGenerator.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/generators/PKCS12ParametersGenerator.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/generators/PKCS12ParametersGenerator.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/generators/PKCS12ParametersGenerator.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/generators/PKCS12ParametersGenerator.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/generators/PKCS5S1ParametersGenerator.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/generators/PKCS5S1ParametersGenerator.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/generators/PKCS5S1ParametersGenerator.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/generators/PKCS5S1ParametersGenerator.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/generators/PKCS5S2ParametersGenerator.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/generators/PKCS5S2ParametersGenerator.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/generators/PKCS5S2ParametersGenerator.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/generators/PKCS5S2ParametersGenerator.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/macs/HMac.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/macs/HMac.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/macs/HMac.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/macs/HMac.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/modes/AEADBlockCipher.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/modes/AEADBlockCipher.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/modes/AEADBlockCipher.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/modes/AEADBlockCipher.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/modes/CBCBlockCipher.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/modes/CBCBlockCipher.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/modes/CBCBlockCipher.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/modes/CBCBlockCipher.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/modes/CFBBlockCipher.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/modes/CFBBlockCipher.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/modes/CFBBlockCipher.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/modes/CFBBlockCipher.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/modes/CTSBlockCipher.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/modes/CTSBlockCipher.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/modes/CTSBlockCipher.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/modes/CTSBlockCipher.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/modes/OFBBlockCipher.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/modes/OFBBlockCipher.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/modes/OFBBlockCipher.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/modes/OFBBlockCipher.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/paddings/BlockCipherPadding.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/paddings/BlockCipherPadding.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/paddings/BlockCipherPadding.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/paddings/BlockCipherPadding.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/paddings/PKCS7Padding.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/paddings/PKCS7Padding.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/paddings/PKCS7Padding.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/paddings/PKCS7Padding.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/paddings/PaddedBufferedBlockCipher.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/paddings/PaddedBufferedBlockCipher.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/paddings/PaddedBufferedBlockCipher.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/paddings/PaddedBufferedBlockCipher.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/params/AsymmetricKeyParameter.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/params/AsymmetricKeyParameter.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/params/AsymmetricKeyParameter.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/params/AsymmetricKeyParameter.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/params/DESParameters.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/params/DESParameters.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/params/DESParameters.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/params/DESParameters.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/params/DHKeyParameters.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/params/DHKeyParameters.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/params/DHKeyParameters.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/params/DHKeyParameters.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/params/DHParameters.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/params/DHParameters.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/params/DHParameters.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/params/DHParameters.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/params/DHPrivateKeyParameters.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/params/DHPrivateKeyParameters.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/params/DHPrivateKeyParameters.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/params/DHPrivateKeyParameters.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/params/DHValidationParameters.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/params/DHValidationParameters.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/params/DHValidationParameters.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/params/DHValidationParameters.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/params/DSAKeyParameters.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/params/DSAKeyParameters.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/params/DSAKeyParameters.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/params/DSAKeyParameters.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/params/DSAParameters.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/params/DSAParameters.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/params/DSAParameters.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/params/DSAParameters.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/params/DSAPrivateKeyParameters.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/params/DSAPrivateKeyParameters.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/params/DSAPrivateKeyParameters.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/params/DSAPrivateKeyParameters.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/params/DSAValidationParameters.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/params/DSAValidationParameters.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/params/DSAValidationParameters.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/params/DSAValidationParameters.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/params/KeyParameter.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/params/KeyParameter.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/params/KeyParameter.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/params/KeyParameter.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/params/ParametersWithIV.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/params/ParametersWithIV.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/params/ParametersWithIV.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/params/ParametersWithIV.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/params/ParametersWithRandom.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/params/ParametersWithRandom.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/params/ParametersWithRandom.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/params/ParametersWithRandom.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/params/RSAKeyParameters.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/params/RSAKeyParameters.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/params/RSAKeyParameters.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/params/RSAKeyParameters.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/params/RSAPrivateCrtKeyParameters.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/params/RSAPrivateCrtKeyParameters.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/params/RSAPrivateCrtKeyParameters.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/params/RSAPrivateCrtKeyParameters.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/util/Pack.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/util/Pack.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/crypto/util/Pack.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/crypto/util/Pack.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/jce/interfaces/ConfigurableProvider.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/jce/interfaces/ConfigurableProvider.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/jce/interfaces/ConfigurableProvider.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/jce/interfaces/ConfigurableProvider.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/jce/interfaces/PKCS12BagAttributeCarrier.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/jce/interfaces/PKCS12BagAttributeCarrier.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/jce/interfaces/PKCS12BagAttributeCarrier.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/jce/interfaces/PKCS12BagAttributeCarrier.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/jce/provider/JCEBlockCipher.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/jce/provider/JCEBlockCipher.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/jce/provider/JCEBlockCipher.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/jce/provider/JCEBlockCipher.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/jce/provider/JCEPBEKey.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/jce/provider/JCEPBEKey.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/jce/provider/JCEPBEKey.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/jce/provider/JCEPBEKey.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/jce/provider/JCEStreamCipher.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/jce/provider/JCEStreamCipher.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/jce/provider/JCEStreamCipher.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/jce/provider/JCEStreamCipher.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/jce/provider/PBE.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/jce/provider/PBE.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/jce/provider/PBE.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/jce/provider/PBE.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/jce/provider/PKCS12BagAttributeCarrierImpl.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/jce/provider/PKCS12BagAttributeCarrierImpl.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/jce/provider/PKCS12BagAttributeCarrierImpl.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/jce/provider/PKCS12BagAttributeCarrierImpl.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/jce/provider/WrapCipherSpi.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/jce/provider/WrapCipherSpi.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/jce/provider/WrapCipherSpi.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/jce/provider/WrapCipherSpi.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/util/Arrays.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/util/Arrays.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/util/Arrays.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/util/Arrays.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/util/Strings.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/util/Strings.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/util/Strings.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/util/Strings.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/util/encoders/Encoder.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/util/encoders/Encoder.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/util/encoders/Encoder.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/util/encoders/Encoder.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/util/encoders/Hex.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/util/encoders/Hex.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/util/encoders/Hex.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/util/encoders/Hex.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/util/encoders/HexEncoder.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/util/encoders/HexEncoder.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/util/encoders/HexEncoder.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/util/encoders/HexEncoder.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/util/io/StreamOverflowException.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/util/io/StreamOverflowException.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/util/io/StreamOverflowException.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/util/io/StreamOverflowException.java
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/util/io/Streams.java b/src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/util/io/Streams.java
similarity index 100%
rename from src/java/KP2AKdbLibrary/src/org/bouncycastle/util/io/Streams.java
rename to src/java/KP2AKdbLibrary/app/src/main/java/org/bouncycastle/util/io/Streams.java
diff --git a/src/java/KP2AKdbLibrary/jni/.gitignore b/src/java/KP2AKdbLibrary/app/src/main/jni/.gitignore
similarity index 100%
rename from src/java/KP2AKdbLibrary/jni/.gitignore
rename to src/java/KP2AKdbLibrary/app/src/main/jni/.gitignore
diff --git a/src/java/KP2AKdbLibrary/jni/Android.mk b/src/java/KP2AKdbLibrary/app/src/main/jni/Android.mk
similarity index 100%
rename from src/java/KP2AKdbLibrary/jni/Android.mk
rename to src/java/KP2AKdbLibrary/app/src/main/jni/Android.mk
diff --git a/src/java/KP2AKdbLibrary/jni/Application.mk b/src/java/KP2AKdbLibrary/app/src/main/jni/Application.mk
similarity index 57%
rename from src/java/KP2AKdbLibrary/jni/Application.mk
rename to src/java/KP2AKdbLibrary/app/src/main/jni/Application.mk
index aff927b8..a2087cbd 100644
--- a/src/java/KP2AKdbLibrary/jni/Application.mk
+++ b/src/java/KP2AKdbLibrary/app/src/main/jni/Application.mk
@@ -1,3 +1,3 @@
 APP_MODULES      := aes sha final-key
 APP_OPTIM        := release
-APP_ABI          := armeabi armeabi-v7a x86 mips
+APP_ABI          := all
diff --git a/src/java/KP2AKdbLibrary/jni/aes/Android.mk b/src/java/KP2AKdbLibrary/app/src/main/jni/aes/Android.mk
similarity index 100%
rename from src/java/KP2AKdbLibrary/jni/aes/Android.mk
rename to src/java/KP2AKdbLibrary/app/src/main/jni/aes/Android.mk
diff --git a/src/java/KP2AKdbLibrary/jni/aes/aes.h b/src/java/KP2AKdbLibrary/app/src/main/jni/aes/aes.h
similarity index 100%
rename from src/java/KP2AKdbLibrary/jni/aes/aes.h
rename to src/java/KP2AKdbLibrary/app/src/main/jni/aes/aes.h
diff --git a/src/java/KP2AKdbLibrary/jni/aes/aes.txt b/src/java/KP2AKdbLibrary/app/src/main/jni/aes/aes.txt
similarity index 100%
rename from src/java/KP2AKdbLibrary/jni/aes/aes.txt
rename to src/java/KP2AKdbLibrary/app/src/main/jni/aes/aes.txt
diff --git a/src/java/KP2AKdbLibrary/jni/aes/aes_amd64.asm b/src/java/KP2AKdbLibrary/app/src/main/jni/aes/aes_amd64.asm
similarity index 100%
rename from src/java/KP2AKdbLibrary/jni/aes/aes_amd64.asm
rename to src/java/KP2AKdbLibrary/app/src/main/jni/aes/aes_amd64.asm
diff --git a/src/java/KP2AKdbLibrary/jni/aes/aes_modes.c b/src/java/KP2AKdbLibrary/app/src/main/jni/aes/aes_modes.c
similarity index 100%
rename from src/java/KP2AKdbLibrary/jni/aes/aes_modes.c
rename to src/java/KP2AKdbLibrary/app/src/main/jni/aes/aes_modes.c
diff --git a/src/java/KP2AKdbLibrary/jni/aes/aes_via_ace.h b/src/java/KP2AKdbLibrary/app/src/main/jni/aes/aes_via_ace.h
similarity index 100%
rename from src/java/KP2AKdbLibrary/jni/aes/aes_via_ace.h
rename to src/java/KP2AKdbLibrary/app/src/main/jni/aes/aes_via_ace.h
diff --git a/src/java/KP2AKdbLibrary/jni/aes/aes_x86_v1.asm b/src/java/KP2AKdbLibrary/app/src/main/jni/aes/aes_x86_v1.asm
similarity index 100%
rename from src/java/KP2AKdbLibrary/jni/aes/aes_x86_v1.asm
rename to src/java/KP2AKdbLibrary/app/src/main/jni/aes/aes_x86_v1.asm
diff --git a/src/java/KP2AKdbLibrary/jni/aes/aes_x86_v2.asm b/src/java/KP2AKdbLibrary/app/src/main/jni/aes/aes_x86_v2.asm
similarity index 100%
rename from src/java/KP2AKdbLibrary/jni/aes/aes_x86_v2.asm
rename to src/java/KP2AKdbLibrary/app/src/main/jni/aes/aes_x86_v2.asm
diff --git a/src/java/KP2AKdbLibrary/jni/aes/aescpp.h b/src/java/KP2AKdbLibrary/app/src/main/jni/aes/aescpp.h
similarity index 100%
rename from src/java/KP2AKdbLibrary/jni/aes/aescpp.h
rename to src/java/KP2AKdbLibrary/app/src/main/jni/aes/aescpp.h
diff --git a/src/java/KP2AKdbLibrary/jni/aes/aescrypt.c b/src/java/KP2AKdbLibrary/app/src/main/jni/aes/aescrypt.c
similarity index 100%
rename from src/java/KP2AKdbLibrary/jni/aes/aescrypt.c
rename to src/java/KP2AKdbLibrary/app/src/main/jni/aes/aescrypt.c
diff --git a/src/java/KP2AKdbLibrary/jni/aes/aeskey.c b/src/java/KP2AKdbLibrary/app/src/main/jni/aes/aeskey.c
similarity index 100%
rename from src/java/KP2AKdbLibrary/jni/aes/aeskey.c
rename to src/java/KP2AKdbLibrary/app/src/main/jni/aes/aeskey.c
diff --git a/src/java/KP2AKdbLibrary/jni/aes/aesopt.h b/src/java/KP2AKdbLibrary/app/src/main/jni/aes/aesopt.h
similarity index 100%
rename from src/java/KP2AKdbLibrary/jni/aes/aesopt.h
rename to src/java/KP2AKdbLibrary/app/src/main/jni/aes/aesopt.h
diff --git a/src/java/KP2AKdbLibrary/jni/aes/aestab.c b/src/java/KP2AKdbLibrary/app/src/main/jni/aes/aestab.c
similarity index 100%
rename from src/java/KP2AKdbLibrary/jni/aes/aestab.c
rename to src/java/KP2AKdbLibrary/app/src/main/jni/aes/aestab.c
diff --git a/src/java/KP2AKdbLibrary/jni/aes/aestab.h b/src/java/KP2AKdbLibrary/app/src/main/jni/aes/aestab.h
similarity index 100%
rename from src/java/KP2AKdbLibrary/jni/aes/aestab.h
rename to src/java/KP2AKdbLibrary/app/src/main/jni/aes/aestab.h
diff --git a/src/java/KP2AKdbLibrary/jni/aes/aesxam.c b/src/java/KP2AKdbLibrary/app/src/main/jni/aes/aesxam.c
similarity index 100%
rename from src/java/KP2AKdbLibrary/jni/aes/aesxam.c
rename to src/java/KP2AKdbLibrary/app/src/main/jni/aes/aesxam.c
diff --git a/src/java/KP2AKdbLibrary/jni/aes/brg_endian.h b/src/java/KP2AKdbLibrary/app/src/main/jni/aes/brg_endian.h
similarity index 100%
rename from src/java/KP2AKdbLibrary/jni/aes/brg_endian.h
rename to src/java/KP2AKdbLibrary/app/src/main/jni/aes/brg_endian.h
diff --git a/src/java/KP2AKdbLibrary/jni/aes/brg_types.h b/src/java/KP2AKdbLibrary/app/src/main/jni/aes/brg_types.h
similarity index 100%
rename from src/java/KP2AKdbLibrary/jni/aes/brg_types.h
rename to src/java/KP2AKdbLibrary/app/src/main/jni/aes/brg_types.h
diff --git a/src/java/KP2AKdbLibrary/jni/aes/rfc3686.c b/src/java/KP2AKdbLibrary/app/src/main/jni/aes/rfc3686.c
similarity index 100%
rename from src/java/KP2AKdbLibrary/jni/aes/rfc3686.c
rename to src/java/KP2AKdbLibrary/app/src/main/jni/aes/rfc3686.c
diff --git a/src/java/KP2AKdbLibrary/jni/aes/tablegen.c b/src/java/KP2AKdbLibrary/app/src/main/jni/aes/tablegen.c
similarity index 100%
rename from src/java/KP2AKdbLibrary/jni/aes/tablegen.c
rename to src/java/KP2AKdbLibrary/app/src/main/jni/aes/tablegen.c
diff --git a/src/java/KP2AKdbLibrary/jni/aes/vb.txt b/src/java/KP2AKdbLibrary/app/src/main/jni/aes/vb.txt
similarity index 100%
rename from src/java/KP2AKdbLibrary/jni/aes/vb.txt
rename to src/java/KP2AKdbLibrary/app/src/main/jni/aes/vb.txt
diff --git a/src/java/KP2AKdbLibrary/jni/aes/vbaxam.doc b/src/java/KP2AKdbLibrary/app/src/main/jni/aes/vbaxam.doc
similarity index 100%
rename from src/java/KP2AKdbLibrary/jni/aes/vbaxam.doc
rename to src/java/KP2AKdbLibrary/app/src/main/jni/aes/vbaxam.doc
diff --git a/src/java/KP2AKdbLibrary/jni/aes/via_ace.txt b/src/java/KP2AKdbLibrary/app/src/main/jni/aes/via_ace.txt
similarity index 100%
rename from src/java/KP2AKdbLibrary/jni/aes/via_ace.txt
rename to src/java/KP2AKdbLibrary/app/src/main/jni/aes/via_ace.txt
diff --git a/src/java/KP2AKdbLibrary/jni/final_key/Android.mk b/src/java/KP2AKdbLibrary/app/src/main/jni/final_key/Android.mk
similarity index 100%
rename from src/java/KP2AKdbLibrary/jni/final_key/Android.mk
rename to src/java/KP2AKdbLibrary/app/src/main/jni/final_key/Android.mk
diff --git a/src/java/KP2AKdbLibrary/jni/final_key/kpd_jni.c b/src/java/KP2AKdbLibrary/app/src/main/jni/final_key/kpd_jni.c
similarity index 100%
rename from src/java/KP2AKdbLibrary/jni/final_key/kpd_jni.c
rename to src/java/KP2AKdbLibrary/app/src/main/jni/final_key/kpd_jni.c
diff --git a/src/java/KP2AKdbLibrary/jni/sha/.gitignore b/src/java/KP2AKdbLibrary/app/src/main/jni/sha/.gitignore
similarity index 100%
rename from src/java/KP2AKdbLibrary/jni/sha/.gitignore
rename to src/java/KP2AKdbLibrary/app/src/main/jni/sha/.gitignore
diff --git a/src/java/KP2AKdbLibrary/jni/sha/Android.mk b/src/java/KP2AKdbLibrary/app/src/main/jni/sha/Android.mk
similarity index 100%
rename from src/java/KP2AKdbLibrary/jni/sha/Android.mk
rename to src/java/KP2AKdbLibrary/app/src/main/jni/sha/Android.mk
diff --git a/src/java/KP2AKdbLibrary/bin/kp2akdblibrary.jar b/src/java/KP2AKdbLibrary/bin/kp2akdblibrary.jar
deleted file mode 100644
index 6a241411..00000000
Binary files a/src/java/KP2AKdbLibrary/bin/kp2akdblibrary.jar and /dev/null differ
diff --git a/src/java/KP2AKdbLibrary/build.gradle b/src/java/KP2AKdbLibrary/build.gradle
new file mode 100644
index 00000000..f0629a5b
--- /dev/null
+++ b/src/java/KP2AKdbLibrary/build.gradle
@@ -0,0 +1,25 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+    repositories {
+        jcenter()
+        google()
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.5.0'
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+        google()
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
+    }
+}
diff --git a/src/java/KP2AKdbLibrary/gradle/wrapper/gradle-wrapper.jar b/src/java/KP2AKdbLibrary/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..f6b961fd
Binary files /dev/null and b/src/java/KP2AKdbLibrary/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/src/java/KP2AKdbLibrary/gradle/wrapper/gradle-wrapper.properties b/src/java/KP2AKdbLibrary/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000..934ac2ba
--- /dev/null
+++ b/src/java/KP2AKdbLibrary/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Sep 23 10:48:05 CEST 2019
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/src/java/KP2AKdbLibrary/gradlew b/src/java/KP2AKdbLibrary/gradlew
new file mode 100644
index 00000000..cccdd3d5
--- /dev/null
+++ b/src/java/KP2AKdbLibrary/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/src/java/KP2AKdbLibrary/gradlew.bat b/src/java/KP2AKdbLibrary/gradlew.bat
new file mode 100644
index 00000000..f9553162
--- /dev/null
+++ b/src/java/KP2AKdbLibrary/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/src/java/KP2AKdbLibrary/jni/prep_build.sh b/src/java/KP2AKdbLibrary/jni/prep_build.sh
deleted file mode 100644
index 057a15e4..00000000
--- a/src/java/KP2AKdbLibrary/jni/prep_build.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-SHA_FILE="sha2-07-01-07.zip"
-
-curl http://gladman.plushost.co.uk/oldsite/cryptography_technology/sha/$SHA_FILE > $SHA_FILE
-unzip $SHA_FILE -d sha
diff --git a/src/java/KP2AKdbLibrary/libs/.gitignore b/src/java/KP2AKdbLibrary/libs/.gitignore
deleted file mode 100644
index f1a2c82c..00000000
--- a/src/java/KP2AKdbLibrary/libs/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-[^.]
-armeabi
-armeabi-v7a
-x86
-mips
-mips-r2
-mips-r2-sf
-ant-contrib-0.3.jar
diff --git a/src/java/KP2AKdbLibrary/project.properties b/src/java/KP2AKdbLibrary/project.properties
deleted file mode 100644
index b83fc3aa..00000000
--- a/src/java/KP2AKdbLibrary/project.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system use,
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-
-# Indicates whether an apk should be generated for each density.
-split.density=false
-# Project target.
-target=android-17
-apk-configurations=
-android.library=true
diff --git a/src/java/KP2AKdbLibrary/settings.gradle b/src/java/KP2AKdbLibrary/settings.gradle
new file mode 100644
index 00000000..e7b4def4
--- /dev/null
+++ b/src/java/KP2AKdbLibrary/settings.gradle
@@ -0,0 +1 @@
+include ':app'
diff --git a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/util/ASN1Dump.java.orig b/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/util/ASN1Dump.java.orig
deleted file mode 100644
index 68c65cbe..00000000
--- a/src/java/KP2AKdbLibrary/src/org/bouncycastle/asn1/util/ASN1Dump.java.orig
+++ /dev/null
@@ -1,440 +0,0 @@
-package org.bouncycastle.asn1.util;
-
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.BERConstructedOctetString;
-import org.bouncycastle.asn1.BERConstructedSequence;
-import org.bouncycastle.asn1.BERSequence;
-import org.bouncycastle.asn1.BERSet;
-import org.bouncycastle.asn1.BERTaggedObject;
-import org.bouncycastle.asn1.DERBMPString;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERBoolean;
-import org.bouncycastle.asn1.DERConstructedSequence;
-import org.bouncycastle.asn1.DERConstructedSet;
-import org.bouncycastle.asn1.DEREncodable;
-import org.bouncycastle.asn1.DERGeneralizedTime;
-import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.DERInteger;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.DERObject;
-import org.bouncycastle.asn1.DERObjectIdentifier;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERPrintableString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.DERT61String;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.DERUTCTime;
-import org.bouncycastle.asn1.DERUTF8String;
-import org.bouncycastle.asn1.DERUnknownTag;
-import org.bouncycastle.asn1.DERVisibleString;
-import org.bouncycastle.asn1.DERApplicationSpecific;
-import org.bouncycastle.asn1.DERTags;
-import org.bouncycastle.asn1.BERApplicationSpecific;
-import org.bouncycastle.util.encoders.Hex;
-
-import java.util.Enumeration;
-import java.io.IOException;
-
-public class ASN1Dump
-{
-    private static final String  TAB = "    ";
-    private static final int SAMPLE_SIZE = 32;
-
-    /**
-     * dump a DER object as a formatted string with indentation
-     *
-     * @param obj the DERObject to be dumped out.
-     */
-    static String _dumpAsString(
-        String      indent,
-        boolean     verbose,
-        DERObject   obj)
-    {
-        String nl = System.getProperty("line.separator");
-        if (obj instanceof ASN1Sequence)
-        {
-            StringBuffer    buf = new StringBuffer();
-            Enumeration     e = ((ASN1Sequence)obj).getObjects();
-            String          tab = indent + TAB;
-
-            buf.append(indent);
-            if (obj instanceof BERConstructedSequence)
-            {
-                buf.append("BER ConstructedSequence");
-            }
-            else if (obj instanceof DERConstructedSequence)
-            {
-                buf.append("DER ConstructedSequence");
-            }
-            else if (obj instanceof BERSequence)
-            {
-                buf.append("BER Sequence");
-            }
-            else if (obj instanceof DERSequence)
-            {
-                buf.append("DER Sequence");
-            }
-            else
-            {
-                buf.append("Sequence");
-            }
-
-            buf.append(nl);
-
-            while (e.hasMoreElements())
-            {
-                Object  o = e.nextElement();
-
-                if (o == null || o.equals(new DERNull()))
-                {
-                    buf.append(tab);
-                    buf.append("NULL");
-                    buf.append(nl);
-                }
-                else if (o instanceof DERObject)
-                {
-                    buf.append(_dumpAsString(tab, verbose, (DERObject)o));
-                }
-                else
-                {
-                    buf.append(_dumpAsString(tab, verbose, ((DEREncodable)o).getDERObject()));
-                }
-            }
-            return buf.toString();
-        }
-        else if (obj instanceof DERTaggedObject)
-        {
-            StringBuffer    buf = new StringBuffer();
-            String          tab = indent + TAB;
-
-            buf.append(indent);
-            if (obj instanceof BERTaggedObject)
-            {
-                buf.append("BER Tagged [");
-            }
-            else
-            {
-                buf.append("Tagged [");
-            }
-
-            DERTaggedObject o = (DERTaggedObject)obj;
-
-            buf.append(Integer.toString(o.getTagNo()));
-            buf.append(']');
-
-            if (!o.isExplicit())
-            {
-                buf.append(" IMPLICIT ");
-            }
-
-            buf.append(nl);
-
-            if (o.isEmpty())
-            {
-                buf.append(tab);
-                buf.append("EMPTY");
-                buf.append(nl);
-            }
-            else
-            {
-                buf.append(_dumpAsString(tab, verbose, o.getObject()));
-            }
-
-            return buf.toString();
-        }
-        else if (obj instanceof DERConstructedSet)
-        {
-            StringBuffer    buf = new StringBuffer();
-            Enumeration     e = ((ASN1Set)obj).getObjects();
-            String          tab = indent + TAB;
-
-            buf.append(indent);
-            buf.append("ConstructedSet");
-            buf.append(nl);
-
-            while (e.hasMoreElements())
-            {
-                Object  o = e.nextElement();
-
-                if (o == null)
-                {
-                    buf.append(tab);
-                    buf.append("NULL");
-                    buf.append(nl);
-                }
-                else if (o instanceof DERObject)
-                {
-                    buf.append(_dumpAsString(tab, verbose, (DERObject)o));
-                }
-                else
-                {
-                    buf.append(_dumpAsString(tab, verbose, ((DEREncodable)o).getDERObject()));
-                }
-            }
-            return buf.toString();
-        }
-        else if (obj instanceof BERSet)
-        {
-            StringBuffer    buf = new StringBuffer();
-            Enumeration     e = ((ASN1Set)obj).getObjects();
-            String          tab = indent + TAB;
-
-            buf.append(indent);
-            buf.append("BER Set");
-            buf.append(nl);
-
-            while (e.hasMoreElements())
-            {
-                Object  o = e.nextElement();
-
-                if (o == null)
-                {
-                    buf.append(tab);
-                    buf.append("NULL");
-                    buf.append(nl);
-                }
-                else if (o instanceof DERObject)
-                {
-                    buf.append(_dumpAsString(tab, verbose, (DERObject)o));
-                }
-                else
-                {
-                    buf.append(_dumpAsString(tab, verbose, ((DEREncodable)o).getDERObject()));
-                }
-            }
-            return buf.toString();
-        }
-        else if (obj instanceof DERSet)
-        {
-            StringBuffer    buf = new StringBuffer();
-            Enumeration     e = ((ASN1Set)obj).getObjects();
-            String          tab = indent + TAB;
-
-            buf.append(indent);
-            buf.append("DER Set");
-            buf.append(nl);
-
-            while (e.hasMoreElements())
-            {
-                Object  o = e.nextElement();
-
-                if (o == null)
-                {
-                    buf.append(tab);
-                    buf.append("NULL");
-                    buf.append(nl);
-                }
-                else if (o instanceof DERObject)
-                {
-                    buf.append(_dumpAsString(tab, verbose, (DERObject)o));
-                }
-                else
-                {
-                    buf.append(_dumpAsString(tab, verbose, ((DEREncodable)o).getDERObject()));
-                }
-            }
-            return buf.toString();
-        }
-        else if (obj instanceof DERObjectIdentifier)
-        {
-            return indent + "ObjectIdentifier(" + ((DERObjectIdentifier)obj).getId() + ")" + nl;
-        }
-        else if (obj instanceof DERBoolean)
-        {
-            return indent + "Boolean(" + ((DERBoolean)obj).isTrue() + ")" + nl;
-        }
-        else if (obj instanceof DERInteger)
-        {
-            return indent + "Integer(" + ((DERInteger)obj).getValue() + ")" + nl;
-        }
-        else if (obj instanceof BERConstructedOctetString)
-        {
-            ASN1OctetString oct = (ASN1OctetString)obj;
-            if (verbose)
-            {
-                return indent + "BER Constructed Octet String" + "[" + oct.getOctets().length + "] " + dumpBinaryDataAsString(indent, oct.getOctets()) + nl;
-            }
-            return indent + "BER Constructed Octet String" + "[" + oct.getOctets().length + "] " + nl;
-        }
-        else if (obj instanceof DEROctetString)
-        {
-            ASN1OctetString oct = (ASN1OctetString)obj;
-            if (verbose)
-            {
-                return indent + "DER Octet String" + "[" + oct.getOctets().length + "] " + dumpBinaryDataAsString(indent, oct.getOctets()) + nl;
-            }
-            return indent + "DER Octet String" + "[" + oct.getOctets().length + "] " + nl;
-        }
-        else if (obj instanceof DERBitString)
-        {
-            DERBitString bt = (DERBitString)obj;
-            if (verbose)
-            {
-                return indent + "DER Bit String" + "[" + bt.getBytes().length + ", " + bt.getPadBits() + "] "  + dumpBinaryDataAsString(indent, bt.getBytes()) + nl;
-            }
-            return indent + "DER Bit String" + "[" + bt.getBytes().length + ", " + bt.getPadBits() + "] " + nl;
-        }
-        else if (obj instanceof DERIA5String)
-        {
-            return indent + "IA5String(" + ((DERIA5String)obj).getString() + ") " + nl;
-        }
-        else if (obj instanceof DERUTF8String)
-        {
-            return indent + "UTF8String(" + ((DERUTF8String)obj).getString() + ") " + nl;
-        }
-        else if (obj instanceof DERPrintableString)
-        {
-            return indent + "PrintableString(" + ((DERPrintableString)obj).getString() + ") " + nl;
-        }
-        else if (obj instanceof DERVisibleString)
-        {
-            return indent + "VisibleString(" + ((DERVisibleString)obj).getString() + ") " + nl;
-        }
-        else if (obj instanceof DERBMPString)
-        {
-            return indent + "BMPString(" + ((DERBMPString)obj).getString() + ") " + nl;
-        }
-        else if (obj instanceof DERT61String)
-        {
-            return indent + "T61String(" + ((DERT61String)obj).getString() + ") " + nl;
-        }
-        else if (obj instanceof DERUTCTime)
-        {
-            return indent + "UTCTime(" + ((DERUTCTime)obj).getTime() + ") " + nl;
-        }
-        else if (obj instanceof DERGeneralizedTime)
-        {
-            return indent + "GeneralizedTime(" + ((DERGeneralizedTime)obj).getTime() + ") " + nl;
-        }
-        else if (obj instanceof DERUnknownTag)
-        {
-            return indent + "Unknown " + Integer.toString(((DERUnknownTag)obj).getTag(), 16) + " " + new String(Hex.encode(((DERUnknownTag)obj).getData())) + nl;
-        }
-        else if (obj instanceof BERApplicationSpecific)
-        {
-            return outputApplicationSpecific("BER", indent, verbose, obj, nl);
-        }
-        else if (obj instanceof DERApplicationSpecific)
-        {
-            return outputApplicationSpecific("DER", indent, verbose, obj, nl);
-        }
-        else
-        {
-            return indent + obj.toString() + nl;
-        }
-    }
-
-    private static String outputApplicationSpecific(String type, String indent, boolean verbose, DERObject obj, String nl)
-    {
-        DERApplicationSpecific app = (DERApplicationSpecific)obj;
-        StringBuffer buf = new StringBuffer();
-
-        if (app.isConstructed())
-        {
-            try
-            {
-                ASN1Sequence s = ASN1Sequence.getInstance(app.getObject(DERTags.SEQUENCE));
-                buf.append(indent + type + " ApplicationSpecific[" + app.getApplicationTag() + "]" + nl);
-                for (Enumeration e = s.getObjects(); e.hasMoreElements();)
-                {
-                    buf.append(_dumpAsString(indent + TAB, verbose, (DERObject)e.nextElement()));
-                }
-            }
-            catch (IOException e)
-            {
-                buf.append(e);
-            }
-            return buf.toString();
-        }
-
-        return indent + type + " ApplicationSpecific[" + app.getApplicationTag() + "] (" + new String(Hex.encode(app.getContents())) + ")" + nl;
-    }
-
-    /**
-     * dump out a DER object as a formatted string, in non-verbose mode.
-     *
-     * @param obj the DERObject to be dumped out.
-     * @return  the resulting string.
-     */
-    public static String dumpAsString(
-        Object   obj)
-    {
-        return dumpAsString(obj, false);
-    }
-
-    /**
-     * Dump out the object as a string.
-     *
-     * @param obj  the object to be dumped
-     * @param verbose  if true, dump out the contents of octet and bit strings.
-     * @return  the resulting string.
-     */
-    public static String dumpAsString(
-        Object   obj,
-        boolean  verbose)
-    {
-        if (obj instanceof DERObject)
-        {
-            return _dumpAsString("", verbose, (DERObject)obj);
-        }
-        else if (obj instanceof DEREncodable)
-        {
-            return _dumpAsString("", verbose, ((DEREncodable)obj).getDERObject());
-        }
-
-        return "unknown object type " + obj.toString();
-    }
-
-    private static String dumpBinaryDataAsString(String indent, byte[] bytes)
-    {
-        String nl = System.getProperty("line.separator");
-        StringBuffer buf = new StringBuffer();
-
-        indent += TAB;
-        
-        buf.append(nl);
-        for (int i = 0; i < bytes.length; i += SAMPLE_SIZE)
-        {
-            if (bytes.length - i > SAMPLE_SIZE)
-            {
-                buf.append(indent);
-                buf.append(new String(Hex.encode(bytes, i, SAMPLE_SIZE)));
-                buf.append(TAB);
-                buf.append(calculateAscString(bytes, i, SAMPLE_SIZE));
-                buf.append(nl);
-            }
-            else
-            {
-                buf.append(indent);
-                buf.append(new String(Hex.encode(bytes, i, bytes.length - i)));
-                for (int j = bytes.length - i; j != SAMPLE_SIZE; j++)
-                {
-                    buf.append("  ");
-                }
-                buf.append(TAB);
-                buf.append(calculateAscString(bytes, i, bytes.length - i));
-                buf.append(nl);
-            }
-        }
-        
-        return buf.toString();
-    }
-
-    private static String calculateAscString(byte[] bytes, int off, int len)
-    {
-        StringBuffer buf = new StringBuffer();
-
-        for (int i = off; i != off + len; i++)
-        {
-            if (bytes[i] >= ' ' && bytes[i] <= '~')
-            {
-                buf.append((char)bytes[i]);
-            }
-        }
-
-        return buf.toString();
-    }
-}
diff --git a/src/java/KP2ASoftkeyboard_AS/.idea/gradle.xml b/src/java/KP2ASoftkeyboard_AS/.idea/gradle.xml
index 3efaea6d..92c29613 100644
--- a/src/java/KP2ASoftkeyboard_AS/.idea/gradle.xml
+++ b/src/java/KP2ASoftkeyboard_AS/.idea/gradle.xml
@@ -3,6 +3,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <compositeConfiguration>
+          <compositeBuild compositeDefinitionSource="SCRIPT" />
+        </compositeConfiguration>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleHome" value="C:\Program Files\Android\Android Studio1\gradle\gradle-2.10" />
@@ -14,6 +17,7 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
+        <option name="testRunner" value="PLATFORM" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/src/java/KP2ASoftkeyboard_AS/.idea/misc.xml b/src/java/KP2ASoftkeyboard_AS/.idea/misc.xml
index 7b6b661f..e05fe485 100644
--- a/src/java/KP2ASoftkeyboard_AS/.idea/misc.xml
+++ b/src/java/KP2ASoftkeyboard_AS/.idea/misc.xml
@@ -5,21 +5,36 @@
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
     <option name="myNullables">
       <value>
-        <list size="4">
+        <list size="12">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+          <item index="4" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
+          <item index="6" class="java.lang.String" itemvalue="android.annotation.Nullable" />
+          <item index="7" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
+          <item index="10" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
+          <item index="11" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
         </list>
       </value>
     </option>
     <option name="myNotNulls">
       <value>
-        <list size="4">
+        <list size="11">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
+          <item index="5" class="java.lang.String" itemvalue="android.annotation.NonNull" />
+          <item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
+          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
+          <item index="10" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />
         </list>
       </value>
     </option>
diff --git a/src/java/KP2ASoftkeyboard_AS/KP2ASoftkeyboard_AS.iml b/src/java/KP2ASoftkeyboard_AS/KP2ASoftkeyboard_AS.iml
index bb266a70..9c57a09d 100644
--- a/src/java/KP2ASoftkeyboard_AS/KP2ASoftkeyboard_AS.iml
+++ b/src/java/KP2ASoftkeyboard_AS/KP2ASoftkeyboard_AS.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="KP2ASoftkeyboard_AS" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="KP2ASoftkeyboard_AS" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
diff --git a/src/java/KP2ASoftkeyboard_AS/app/build.gradle b/src/java/KP2ASoftkeyboard_AS/app/build.gradle
index e843d600..124e7ac5 100644
--- a/src/java/KP2ASoftkeyboard_AS/app/build.gradle
+++ b/src/java/KP2ASoftkeyboard_AS/app/build.gradle
@@ -5,7 +5,6 @@ android {
 
     defaultConfig {
         minSdkVersion 18
-        targetSdkVersion 23
     }
 
     buildTypes {
@@ -14,6 +13,11 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
+    externalNativeBuild {
+        ndkBuild {
+            path 'src/main/jni/Android.mk'
+        }
+    }
 }
 
 dependencies {
diff --git a/src/java/KP2ASoftkeyboard_AS/app/src/main/AndroidManifest.xml b/src/java/KP2ASoftkeyboard_AS/app/src/main/AndroidManifest.xml
index e956bbbd..dc35604c 100644
--- a/src/java/KP2ASoftkeyboard_AS/app/src/main/AndroidManifest.xml
+++ b/src/java/KP2ASoftkeyboard_AS/app/src/main/AndroidManifest.xml
@@ -2,7 +2,7 @@
         package="keepass2android.softkeyboard">
 
     <uses-permission android:name="android.permission.VIBRATE"/>
-    <uses-sdk android:targetSdkVersion="14" android:minSdkVersion="14"/>
+    <uses-sdk android:targetSdkVersion="14"/>
 
     <application
             android:killAfterRestore="false">
diff --git a/src/java/KP2ASoftkeyboard_AS/app/src/main/java/keepass2android/softkeyboard/BinaryDictionary.java b/src/java/KP2ASoftkeyboard_AS/app/src/main/java/keepass2android/softkeyboard/BinaryDictionary.java
index c4598c5b..73854193 100644
--- a/src/java/KP2ASoftkeyboard_AS/app/src/main/java/keepass2android/softkeyboard/BinaryDictionary.java
+++ b/src/java/KP2ASoftkeyboard_AS/app/src/main/java/keepass2android/softkeyboard/BinaryDictionary.java
@@ -48,7 +48,7 @@ public class BinaryDictionary extends Dictionary {
     private static final boolean ENABLE_MISSED_CHARACTERS = true;
 
     private int mDicTypeId;
-    private int mNativeDict;
+    private long mNativeDict;
     private int mDictLength;
     private int[] mInputCodes = new int[MAX_WORD_LENGTH * MAX_ALTERNATIVES];
     private char[] mOutputChars = new char[MAX_WORD_LENGTH * MAX_WORDS];
@@ -85,6 +85,7 @@ public class BinaryDictionary extends Dictionary {
      * @param streams the resource streams containing the raw binary dictionary
      */
     public BinaryDictionary(Context context, InputStream[] streams, int dicTypeId) {
+
         if (streams != null && streams.length > 0) {
             loadDictionary(context, streams);
         }
@@ -107,22 +108,29 @@ public class BinaryDictionary extends Dictionary {
                 mNativeDictDirectBuffer.put(byteBuffer);
             }
             mDictLength = byteBuffer.capacity();
+
+
             mNativeDict = openNative(mNativeDictDirectBuffer,
-                    TYPED_LETTER_MULTIPLIER, FULL_WORD_FREQ_MULTIPLIER);
+                    TYPED_LETTER_MULTIPLIER, FULL_WORD_FREQ_MULTIPLIER, mDictLength);
         }
         mDicTypeId = dicTypeId;
     }
 
     private native int openNative(ByteBuffer bb, int typedLetterMultiplier,
-            int fullWordMultiplier);
-    private native void closeNative(int dict);
-    private native boolean isValidWordNative(int nativeData, char[] word, int wordLength);
-    private native int getSuggestionsNative(int dict, int[] inputCodes, int codesSize, 
+                                  int fullWordMultiplier, int size);
+
+
+
+
+
+    private native void closeNative(long dict);
+    private native boolean isValidWordNative(long dict, char[] word, int wordLength);
+    private native int getSuggestionsNative(long dict, int[] inputCodes, int codesSize,
             char[] outputChars, int[] frequencies, int maxWordLength, int maxWords,
             int maxAlternatives, int skipPos, int[] nextLettersFrequencies, int nextLettersSize);
-    private native int getBigramsNative(int dict, char[] prevWord, int prevWordLength,
-            int[] inputCodes, int inputCodesLength, char[] outputChars, int[] frequencies,
-            int maxWordLength, int maxBigrams, int maxAlternatives);
+    private native int getBigramsNative(long dict, char[] prevWord, int prevWordLength,
+                                        int[] inputCodes, int inputCodesLength, char[] outputChars, int[] frequencies,
+                                        int maxWordLength, int maxBigrams, int maxAlternatives);
 
     private final void loadDictionary(Context context, int[] resId) {
         InputStream[] is = null;
@@ -163,11 +171,12 @@ public class BinaryDictionary extends Dictionary {
 	        for (int i = 0; i < is.length; i++) {
 	             got += Channels.newChannel(is[i]).read(mNativeDictDirectBuffer);
 	        }
+
 	        if (got != total) {
 	            Log.e(TAG, "Read " + got + " bytes, expected " + total);
 	        } else {
 	            mNativeDict = openNative(mNativeDictDirectBuffer,
-	                    TYPED_LETTER_MULTIPLIER, FULL_WORD_FREQ_MULTIPLIER);
+	                    TYPED_LETTER_MULTIPLIER, FULL_WORD_FREQ_MULTIPLIER, total);
 	            mDictLength = total;
 	        }	
 	 
@@ -286,6 +295,7 @@ public class BinaryDictionary extends Dictionary {
 
     @Override
     public synchronized void close() {
+
         if (mNativeDict != 0) {
             closeNative(mNativeDict);
             mNativeDict = 0;
diff --git a/src/java/KP2ASoftkeyboard_AS/app/src/main/jni/Android.mk b/src/java/KP2ASoftkeyboard_AS/app/src/main/jni/Android.mk
new file mode 100644
index 00000000..985e0575
--- /dev/null
+++ b/src/java/KP2ASoftkeyboard_AS/app/src/main/jni/Android.mk
@@ -0,0 +1,13 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := jni_latinime
+LOCAL_LDFLAGS := -Wl,--build-id
+LOCAL_SRC_FILES := \
+	source/keepass2android_softkeyboard_BinaryDictionary.cpp \
+	source/char_utils.cpp \
+	source/dictionary.cpp \
+
+LOCAL_C_INCLUDES += $(LOCAL_PATH)//include/
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/src/java/KP2ASoftkeyboard_AS/app/src/main/jni/include/basechars.h b/src/java/KP2ASoftkeyboard_AS/app/src/main/jni/include/basechars.h
new file mode 100644
index 00000000..5a440660
--- /dev/null
+++ b/src/java/KP2ASoftkeyboard_AS/app/src/main/jni/include/basechars.h
@@ -0,0 +1,172 @@
+/**
+ * Table mapping most combined Latin, Greek, and Cyrillic characters
+ * to their base characters.  If c is in range, BASE_CHARS[c] == c
+ * if c is not a combined character, or the base character if it
+ * is combined.
+ */
+static unsigned short BASE_CHARS[] = {
+    0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,
+    0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f,
+    0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017,
+    0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f,
+    0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027,
+    0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f,
+    0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037,
+    0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f,
+    0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047,
+    0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f,
+    0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057,
+    0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f,
+    0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067,
+    0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f,
+    0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077,
+    0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f,
+    0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
+    0x0088, 0x0089, 0x008a, 0x008b, 0x008c, 0x008d, 0x008e, 0x008f,
+    0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
+    0x0098, 0x0099, 0x009a, 0x009b, 0x009c, 0x009d, 0x009e, 0x009f,
+    0x0020, 0x00a1, 0x00a2, 0x00a3, 0x00a4, 0x00a5, 0x00a6, 0x00a7,
+    0x0020, 0x00a9, 0x0061, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x0020,
+    0x00b0, 0x00b1, 0x0032, 0x0033, 0x0020, 0x03bc, 0x00b6, 0x00b7,
+    0x0020, 0x0031, 0x006f, 0x00bb, 0x0031, 0x0031, 0x0033, 0x00bf,
+    0x0041, 0x0041, 0x0041, 0x0041, 0x0041, 0x0041, 0x00c6, 0x0043,
+    0x0045, 0x0045, 0x0045, 0x0045, 0x0049, 0x0049, 0x0049, 0x0049,
+    0x00d0, 0x004e, 0x004f, 0x004f, 0x004f, 0x004f, 0x004f, 0x00d7,
+    0x004f, 0x0055, 0x0055, 0x0055, 0x0055, 0x0059, 0x00de, 0x0073, // Manually changed d8 to 4f
+                                                                    // Manually changed df to 73
+    0x0061, 0x0061, 0x0061, 0x0061, 0x0061, 0x0061, 0x00e6, 0x0063,
+    0x0065, 0x0065, 0x0065, 0x0065, 0x0069, 0x0069, 0x0069, 0x0069,
+    0x00f0, 0x006e, 0x006f, 0x006f, 0x006f, 0x006f, 0x006f, 0x00f7,
+    0x006f, 0x0075, 0x0075, 0x0075, 0x0075, 0x0079, 0x00fe, 0x0079, // Manually changed f8 to 6f
+    0x0041, 0x0061, 0x0041, 0x0061, 0x0041, 0x0061, 0x0043, 0x0063,
+    0x0043, 0x0063, 0x0043, 0x0063, 0x0043, 0x0063, 0x0044, 0x0064,
+    0x0110, 0x0111, 0x0045, 0x0065, 0x0045, 0x0065, 0x0045, 0x0065,
+    0x0045, 0x0065, 0x0045, 0x0065, 0x0047, 0x0067, 0x0047, 0x0067,
+    0x0047, 0x0067, 0x0047, 0x0067, 0x0048, 0x0068, 0x0126, 0x0127,
+    0x0049, 0x0069, 0x0049, 0x0069, 0x0049, 0x0069, 0x0049, 0x0069,
+    0x0049, 0x0131, 0x0049, 0x0069, 0x004a, 0x006a, 0x004b, 0x006b,
+    0x0138, 0x004c, 0x006c, 0x004c, 0x006c, 0x004c, 0x006c, 0x004c,
+    0x006c, 0x0141, 0x0142, 0x004e, 0x006e, 0x004e, 0x006e, 0x004e,
+    0x006e, 0x02bc, 0x014a, 0x014b, 0x004f, 0x006f, 0x004f, 0x006f,
+    0x004f, 0x006f, 0x0152, 0x0153, 0x0052, 0x0072, 0x0052, 0x0072,
+    0x0052, 0x0072, 0x0053, 0x0073, 0x0053, 0x0073, 0x0053, 0x0073,
+    0x0053, 0x0073, 0x0054, 0x0074, 0x0054, 0x0074, 0x0166, 0x0167,
+    0x0055, 0x0075, 0x0055, 0x0075, 0x0055, 0x0075, 0x0055, 0x0075,
+    0x0055, 0x0075, 0x0055, 0x0075, 0x0057, 0x0077, 0x0059, 0x0079,
+    0x0059, 0x005a, 0x007a, 0x005a, 0x007a, 0x005a, 0x007a, 0x0073,
+    0x0180, 0x0181, 0x0182, 0x0183, 0x0184, 0x0185, 0x0186, 0x0187,
+    0x0188, 0x0189, 0x018a, 0x018b, 0x018c, 0x018d, 0x018e, 0x018f,
+    0x0190, 0x0191, 0x0192, 0x0193, 0x0194, 0x0195, 0x0196, 0x0197,
+    0x0198, 0x0199, 0x019a, 0x019b, 0x019c, 0x019d, 0x019e, 0x019f,
+    0x004f, 0x006f, 0x01a2, 0x01a3, 0x01a4, 0x01a5, 0x01a6, 0x01a7,
+    0x01a8, 0x01a9, 0x01aa, 0x01ab, 0x01ac, 0x01ad, 0x01ae, 0x0055,
+    0x0075, 0x01b1, 0x01b2, 0x01b3, 0x01b4, 0x01b5, 0x01b6, 0x01b7,
+    0x01b8, 0x01b9, 0x01ba, 0x01bb, 0x01bc, 0x01bd, 0x01be, 0x01bf,
+    0x01c0, 0x01c1, 0x01c2, 0x01c3, 0x0044, 0x0044, 0x0064, 0x004c,
+    0x004c, 0x006c, 0x004e, 0x004e, 0x006e, 0x0041, 0x0061, 0x0049,
+    0x0069, 0x004f, 0x006f, 0x0055, 0x0075, 0x00dc, 0x00fc, 0x00dc,
+    0x00fc, 0x00dc, 0x00fc, 0x00dc, 0x00fc, 0x01dd, 0x00c4, 0x00e4,
+    0x0226, 0x0227, 0x00c6, 0x00e6, 0x01e4, 0x01e5, 0x0047, 0x0067,
+    0x004b, 0x006b, 0x004f, 0x006f, 0x01ea, 0x01eb, 0x01b7, 0x0292,
+    0x006a, 0x0044, 0x0044, 0x0064, 0x0047, 0x0067, 0x01f6, 0x01f7,
+    0x004e, 0x006e, 0x00c5, 0x00e5, 0x00c6, 0x00e6, 0x00d8, 0x00f8,
+    0x0041, 0x0061, 0x0041, 0x0061, 0x0045, 0x0065, 0x0045, 0x0065,
+    0x0049, 0x0069, 0x0049, 0x0069, 0x004f, 0x006f, 0x004f, 0x006f,
+    0x0052, 0x0072, 0x0052, 0x0072, 0x0055, 0x0075, 0x0055, 0x0075,
+    0x0053, 0x0073, 0x0054, 0x0074, 0x021c, 0x021d, 0x0048, 0x0068,
+    0x0220, 0x0221, 0x0222, 0x0223, 0x0224, 0x0225, 0x0041, 0x0061,
+    0x0045, 0x0065, 0x00d6, 0x00f6, 0x00d5, 0x00f5, 0x004f, 0x006f,
+    0x022e, 0x022f, 0x0059, 0x0079, 0x0234, 0x0235, 0x0236, 0x0237,
+    0x0238, 0x0239, 0x023a, 0x023b, 0x023c, 0x023d, 0x023e, 0x023f,
+    0x0240, 0x0241, 0x0242, 0x0243, 0x0244, 0x0245, 0x0246, 0x0247,
+    0x0248, 0x0249, 0x024a, 0x024b, 0x024c, 0x024d, 0x024e, 0x024f,
+    0x0250, 0x0251, 0x0252, 0x0253, 0x0254, 0x0255, 0x0256, 0x0257,
+    0x0258, 0x0259, 0x025a, 0x025b, 0x025c, 0x025d, 0x025e, 0x025f,
+    0x0260, 0x0261, 0x0262, 0x0263, 0x0264, 0x0265, 0x0266, 0x0267,
+    0x0268, 0x0269, 0x026a, 0x026b, 0x026c, 0x026d, 0x026e, 0x026f,
+    0x0270, 0x0271, 0x0272, 0x0273, 0x0274, 0x0275, 0x0276, 0x0277,
+    0x0278, 0x0279, 0x027a, 0x027b, 0x027c, 0x027d, 0x027e, 0x027f,
+    0x0280, 0x0281, 0x0282, 0x0283, 0x0284, 0x0285, 0x0286, 0x0287,
+    0x0288, 0x0289, 0x028a, 0x028b, 0x028c, 0x028d, 0x028e, 0x028f,
+    0x0290, 0x0291, 0x0292, 0x0293, 0x0294, 0x0295, 0x0296, 0x0297,
+    0x0298, 0x0299, 0x029a, 0x029b, 0x029c, 0x029d, 0x029e, 0x029f,
+    0x02a0, 0x02a1, 0x02a2, 0x02a3, 0x02a4, 0x02a5, 0x02a6, 0x02a7,
+    0x02a8, 0x02a9, 0x02aa, 0x02ab, 0x02ac, 0x02ad, 0x02ae, 0x02af,
+    0x0068, 0x0266, 0x006a, 0x0072, 0x0279, 0x027b, 0x0281, 0x0077,
+    0x0079, 0x02b9, 0x02ba, 0x02bb, 0x02bc, 0x02bd, 0x02be, 0x02bf,
+    0x02c0, 0x02c1, 0x02c2, 0x02c3, 0x02c4, 0x02c5, 0x02c6, 0x02c7,
+    0x02c8, 0x02c9, 0x02ca, 0x02cb, 0x02cc, 0x02cd, 0x02ce, 0x02cf,
+    0x02d0, 0x02d1, 0x02d2, 0x02d3, 0x02d4, 0x02d5, 0x02d6, 0x02d7,
+    0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x02de, 0x02df,
+    0x0263, 0x006c, 0x0073, 0x0078, 0x0295, 0x02e5, 0x02e6, 0x02e7,
+    0x02e8, 0x02e9, 0x02ea, 0x02eb, 0x02ec, 0x02ed, 0x02ee, 0x02ef,
+    0x02f0, 0x02f1, 0x02f2, 0x02f3, 0x02f4, 0x02f5, 0x02f6, 0x02f7,
+    0x02f8, 0x02f9, 0x02fa, 0x02fb, 0x02fc, 0x02fd, 0x02fe, 0x02ff,
+    0x0300, 0x0301, 0x0302, 0x0303, 0x0304, 0x0305, 0x0306, 0x0307,
+    0x0308, 0x0309, 0x030a, 0x030b, 0x030c, 0x030d, 0x030e, 0x030f,
+    0x0310, 0x0311, 0x0312, 0x0313, 0x0314, 0x0315, 0x0316, 0x0317,
+    0x0318, 0x0319, 0x031a, 0x031b, 0x031c, 0x031d, 0x031e, 0x031f,
+    0x0320, 0x0321, 0x0322, 0x0323, 0x0324, 0x0325, 0x0326, 0x0327,
+    0x0328, 0x0329, 0x032a, 0x032b, 0x032c, 0x032d, 0x032e, 0x032f,
+    0x0330, 0x0331, 0x0332, 0x0333, 0x0334, 0x0335, 0x0336, 0x0337,
+    0x0338, 0x0339, 0x033a, 0x033b, 0x033c, 0x033d, 0x033e, 0x033f,
+    0x0300, 0x0301, 0x0342, 0x0313, 0x0308, 0x0345, 0x0346, 0x0347,
+    0x0348, 0x0349, 0x034a, 0x034b, 0x034c, 0x034d, 0x034e, 0x034f,
+    0x0350, 0x0351, 0x0352, 0x0353, 0x0354, 0x0355, 0x0356, 0x0357,
+    0x0358, 0x0359, 0x035a, 0x035b, 0x035c, 0x035d, 0x035e, 0x035f,
+    0x0360, 0x0361, 0x0362, 0x0363, 0x0364, 0x0365, 0x0366, 0x0367,
+    0x0368, 0x0369, 0x036a, 0x036b, 0x036c, 0x036d, 0x036e, 0x036f,
+    0x0370, 0x0371, 0x0372, 0x0373, 0x02b9, 0x0375, 0x0376, 0x0377,
+    0x0378, 0x0379, 0x0020, 0x037b, 0x037c, 0x037d, 0x003b, 0x037f,
+    0x0380, 0x0381, 0x0382, 0x0383, 0x0020, 0x00a8, 0x0391, 0x00b7,
+    0x0395, 0x0397, 0x0399, 0x038b, 0x039f, 0x038d, 0x03a5, 0x03a9,
+    0x03ca, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397,
+    0x0398, 0x0399, 0x039a, 0x039b, 0x039c, 0x039d, 0x039e, 0x039f,
+    0x03a0, 0x03a1, 0x03a2, 0x03a3, 0x03a4, 0x03a5, 0x03a6, 0x03a7,
+    0x03a8, 0x03a9, 0x0399, 0x03a5, 0x03b1, 0x03b5, 0x03b7, 0x03b9,
+    0x03cb, 0x03b1, 0x03b2, 0x03b3, 0x03b4, 0x03b5, 0x03b6, 0x03b7,
+    0x03b8, 0x03b9, 0x03ba, 0x03bb, 0x03bc, 0x03bd, 0x03be, 0x03bf,
+    0x03c0, 0x03c1, 0x03c2, 0x03c3, 0x03c4, 0x03c5, 0x03c6, 0x03c7,
+    0x03c8, 0x03c9, 0x03b9, 0x03c5, 0x03bf, 0x03c5, 0x03c9, 0x03cf,
+    0x03b2, 0x03b8, 0x03a5, 0x03d2, 0x03d2, 0x03c6, 0x03c0, 0x03d7,
+    0x03d8, 0x03d9, 0x03da, 0x03db, 0x03dc, 0x03dd, 0x03de, 0x03df,
+    0x03e0, 0x03e1, 0x03e2, 0x03e3, 0x03e4, 0x03e5, 0x03e6, 0x03e7,
+    0x03e8, 0x03e9, 0x03ea, 0x03eb, 0x03ec, 0x03ed, 0x03ee, 0x03ef,
+    0x03ba, 0x03c1, 0x03c2, 0x03f3, 0x0398, 0x03b5, 0x03f6, 0x03f7,
+    0x03f8, 0x03a3, 0x03fa, 0x03fb, 0x03fc, 0x03fd, 0x03fe, 0x03ff,
+    0x0415, 0x0415, 0x0402, 0x0413, 0x0404, 0x0405, 0x0406, 0x0406,
+    0x0408, 0x0409, 0x040a, 0x040b, 0x041a, 0x0418, 0x0423, 0x040f,
+    0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417,
+    0x0418, 0x0418, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e, 0x041f,
+    0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427,
+    0x0428, 0x0429, 0x042a, 0x042b, 0x042c, 0x042d, 0x042e, 0x042f,
+    0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437,
+    0x0438, 0x0438, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e, 0x043f,
+    0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447,
+    0x0448, 0x0449, 0x044a, 0x044b, 0x044c, 0x044d, 0x044e, 0x044f,
+    0x0435, 0x0435, 0x0452, 0x0433, 0x0454, 0x0455, 0x0456, 0x0456,
+    0x0458, 0x0459, 0x045a, 0x045b, 0x043a, 0x0438, 0x0443, 0x045f,
+    0x0460, 0x0461, 0x0462, 0x0463, 0x0464, 0x0465, 0x0466, 0x0467,
+    0x0468, 0x0469, 0x046a, 0x046b, 0x046c, 0x046d, 0x046e, 0x046f,
+    0x0470, 0x0471, 0x0472, 0x0473, 0x0474, 0x0475, 0x0474, 0x0475,
+    0x0478, 0x0479, 0x047a, 0x047b, 0x047c, 0x047d, 0x047e, 0x047f,
+    0x0480, 0x0481, 0x0482, 0x0483, 0x0484, 0x0485, 0x0486, 0x0487,
+    0x0488, 0x0489, 0x048a, 0x048b, 0x048c, 0x048d, 0x048e, 0x048f,
+    0x0490, 0x0491, 0x0492, 0x0493, 0x0494, 0x0495, 0x0496, 0x0497,
+    0x0498, 0x0499, 0x049a, 0x049b, 0x049c, 0x049d, 0x049e, 0x049f,
+    0x04a0, 0x04a1, 0x04a2, 0x04a3, 0x04a4, 0x04a5, 0x04a6, 0x04a7,
+    0x04a8, 0x04a9, 0x04aa, 0x04ab, 0x04ac, 0x04ad, 0x04ae, 0x04af,
+    0x04b0, 0x04b1, 0x04b2, 0x04b3, 0x04b4, 0x04b5, 0x04b6, 0x04b7,
+    0x04b8, 0x04b9, 0x04ba, 0x04bb, 0x04bc, 0x04bd, 0x04be, 0x04bf,
+    0x04c0, 0x0416, 0x0436, 0x04c3, 0x04c4, 0x04c5, 0x04c6, 0x04c7,
+    0x04c8, 0x04c9, 0x04ca, 0x04cb, 0x04cc, 0x04cd, 0x04ce, 0x04cf,
+    0x0410, 0x0430, 0x0410, 0x0430, 0x04d4, 0x04d5, 0x0415, 0x0435,
+    0x04d8, 0x04d9, 0x04d8, 0x04d9, 0x0416, 0x0436, 0x0417, 0x0437,
+    0x04e0, 0x04e1, 0x0418, 0x0438, 0x0418, 0x0438, 0x041e, 0x043e,
+    0x04e8, 0x04e9, 0x04e8, 0x04e9, 0x042d, 0x044d, 0x0423, 0x0443,
+    0x0423, 0x0443, 0x0423, 0x0443, 0x0427, 0x0447, 0x04f6, 0x04f7,
+    0x042b, 0x044b, 0x04fa, 0x04fb, 0x04fc, 0x04fd, 0x04fe, 0x04ff,
+};
+
+// generated with:
+// cat UnicodeData.txt | perl -e 'while (<>) { @foo = split(/;/); $foo[5] =~ s/<.*> //; $base[hex($foo[0])] = hex($foo[5]);} for ($i = 0; $i < 0x500; $i += 8) { for ($j = $i; $j < $i + 8; $j++) { printf("0x%04x, ", $base[$j] ? $base[$j] : $j)}; print "\n"; }'
diff --git a/src/java/KP2ASoftkeyboard_AS/app/src/main/jni/include/char_utils.h b/src/java/KP2ASoftkeyboard_AS/app/src/main/jni/include/char_utils.h
new file mode 100644
index 00000000..921ecb4a
--- /dev/null
+++ b/src/java/KP2ASoftkeyboard_AS/app/src/main/jni/include/char_utils.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef LATINIME_CHAR_UTILS_H
+#define LATINIME_CHAR_UTILS_H
+
+namespace latinime {
+
+unsigned short latin_tolower(unsigned short c);
+
+}; // namespace latinime
+
+#endif // LATINIME_CHAR_UTILS_H
diff --git a/src/java/KP2ASoftkeyboard_AS/app/src/main/jni/include/dictionary.h b/src/java/KP2ASoftkeyboard_AS/app/src/main/jni/include/dictionary.h
new file mode 100644
index 00000000..69af565c
--- /dev/null
+++ b/src/java/KP2ASoftkeyboard_AS/app/src/main/jni/include/dictionary.h
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef LATINIME_DICTIONARY_H
+#define LATINIME_DICTIONARY_H
+
+namespace latinime {
+
+// 22-bit address = ~4MB dictionary size limit, which on average would be about 200k-300k words
+#define ADDRESS_MASK 0x3FFFFF
+
+// The bit that decides if an address follows in the next 22 bits
+#define FLAG_ADDRESS_MASK 0x40
+// The bit that decides if this is a terminal node for a word. The node could still have children,
+// if the word has other endings.
+#define FLAG_TERMINAL_MASK 0x80
+
+#define FLAG_BIGRAM_READ 0x80
+#define FLAG_BIGRAM_CHILDEXIST 0x40
+#define FLAG_BIGRAM_CONTINUED 0x80
+#define FLAG_BIGRAM_FREQ 0x7F
+
+class Dictionary {
+public:
+    Dictionary(void *dict, int typedLetterMultipler, int fullWordMultiplier, int dictSize);
+    int getSuggestions(int *codes, int codesSize, unsigned short *outWords, int *frequencies,
+            int maxWordLength, int maxWords, int maxAlternatives, int skipPos,
+            int *nextLetters, int nextLettersSize);
+    int getBigrams(unsigned short *word, int length, int *codes, int codesSize,
+            unsigned short *outWords, int *frequencies, int maxWordLength, int maxBigrams,
+            int maxAlternatives);
+    bool isValidWord(unsigned short *word, int length);
+    void setAsset(void *asset) { mAsset = asset; }
+    void *getAsset() { return mAsset; }
+    ~Dictionary();
+
+private:
+
+    void getVersionNumber();
+    bool checkIfDictVersionIsLatest();
+    int getAddress(int *pos);
+    int getBigramAddress(int *pos, bool advance);
+    int getFreq(int *pos);
+    int getBigramFreq(int *pos);
+    void searchForTerminalNode(int address, int frequency);
+
+    bool getFirstBitOfByte(int *pos) { return (mDict[*pos] & 0x80) > 0; }
+    bool getSecondBitOfByte(int *pos) { return (mDict[*pos] & 0x40) > 0; }
+    bool getTerminal(int *pos) { return (mDict[*pos] & FLAG_TERMINAL_MASK) > 0; }
+    int getCount(int *pos) { return mDict[(*pos)++] & 0xFF; }
+    unsigned short getChar(int *pos);
+    int wideStrLen(unsigned short *str);
+
+    bool sameAsTyped(unsigned short *word, int length);
+    bool checkFirstCharacter(unsigned short *word);
+    bool addWord(unsigned short *word, int length, int frequency);
+    bool addWordBigram(unsigned short *word, int length, int frequency);
+    unsigned short toLowerCase(unsigned short c);
+    void getWordsRec(int pos, int depth, int maxDepth, bool completion, int frequency,
+            int inputIndex, int diffs);
+    int isValidWordRec(int pos, unsigned short *word, int offset, int length);
+    void registerNextLetter(unsigned short c);
+
+    unsigned char *mDict;
+    void *mAsset;
+
+    int *mFrequencies;
+    int *mBigramFreq;
+    int mMaxWords;
+    int mMaxBigrams;
+    int mMaxWordLength;
+    unsigned short *mOutputChars;
+    unsigned short *mBigramChars;
+    int *mInputCodes;
+    int mInputLength;
+    int mMaxAlternatives;
+    unsigned short mWord[128];
+    int mSkipPos;
+    int mMaxEditDistance;
+
+    int mFullWordMultiplier;
+    int mTypedLetterMultiplier;
+    int mDictSize;
+    int *mNextLettersFrequencies;
+    int mNextLettersSize;
+    int mVersion;
+    int mBigram;
+};
+
+// ----------------------------------------------------------------------------
+
+}; // namespace latinime
+
+#endif // LATINIME_DICTIONARY_H
diff --git a/src/java/KP2ASoftkeyboard_AS/app/src/main/jni/source/char_utils.cpp b/src/java/KP2ASoftkeyboard_AS/app/src/main/jni/source/char_utils.cpp
new file mode 100644
index 00000000..a31a0632
--- /dev/null
+++ b/src/java/KP2ASoftkeyboard_AS/app/src/main/jni/source/char_utils.cpp
@@ -0,0 +1,899 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdlib.h>
+
+namespace latinime {
+
+struct LatinCapitalSmallPair {
+  unsigned short capital;
+  unsigned short small;
+};
+
+// Generated from http://unicode.org/Public/UNIDATA/UnicodeData.txt
+//
+// 1. Run the following code.  Bascially taken from
+//    Dictionary::toLowerCase(unsigned short c) in dictionary.cpp.
+//    Then, get the list of chars where cc != ccc.
+//
+//    unsigned short c, cc, ccc, ccc2;
+//    for (c = 0; c < 0xFFFF ; c++) {
+//        if (c < sizeof(BASE_CHARS) / sizeof(BASE_CHARS[0])) {
+//            cc = BASE_CHARS[c];
+//        } else {
+//            cc = c;
+//        }
+//
+//        // tolower
+//        int isBase = 0;
+//        if (cc >='A' && cc <= 'Z') {
+//            ccc = (cc | 0x20);
+//            ccc2 = ccc;
+//            isBase = 1;
+//        } else if (cc > 0x7F) {
+//            ccc = u_tolower(cc);
+//            ccc2 = latin_tolower(cc);
+//        } else {
+//            ccc = cc;
+//            ccc2 = ccc;
+//        }
+//        if (!isBase && cc != ccc) {
+//            wprintf(L" 0x%04X => 0x%04X => 0x%04X  %lc => %lc => %lc \n",
+//                    c, cc, ccc, c, cc, ccc);
+//            //assert(ccc == ccc2);
+//        }
+//    }
+//
+//    Initially, started with an empty latin_tolower() as below.
+//
+//    unsigned short latin_tolower(unsigned short c) {
+//        return c;
+//    }
+//
+//
+// 2. Process the list obtained by 1 by the following perl script and apply
+//    'sort -u' as well.  Get the SORTED_CHAR_MAP[].
+//    Note that '$1' in the perl script is 'cc' in the above C code.
+//
+//    while(<>) {
+//        / 0x\w* => 0x(\w*) =/;
+//        open(HDL, "grep -iw ^" . $1 . " UnicodeData.txt | ");
+//        $line = <HDL>;
+//        chomp $line;
+//        @cols = split(/;/, $line);
+//        print "    { 0x$1, 0x$cols[13] },  // $cols[1]\n";
+//    }
+//
+//
+// 3. Update the latin_tolower() function above with SORTED_CHAR_MAP.  Enable
+//    the assert(ccc == ccc2) above and confirm the function exits successfully.
+//
+static const struct LatinCapitalSmallPair SORTED_CHAR_MAP[] = {
+    { 0x00C4, 0x00E4 },  // LATIN CAPITAL LETTER A WITH DIAERESIS
+    { 0x00C5, 0x00E5 },  // LATIN CAPITAL LETTER A WITH RING ABOVE
+    { 0x00C6, 0x00E6 },  // LATIN CAPITAL LETTER AE
+    { 0x00D0, 0x00F0 },  // LATIN CAPITAL LETTER ETH
+    { 0x00D5, 0x00F5 },  // LATIN CAPITAL LETTER O WITH TILDE
+    { 0x00D6, 0x00F6 },  // LATIN CAPITAL LETTER O WITH DIAERESIS
+    { 0x00D8, 0x00F8 },  // LATIN CAPITAL LETTER O WITH STROKE
+    { 0x00DC, 0x00FC },  // LATIN CAPITAL LETTER U WITH DIAERESIS
+    { 0x00DE, 0x00FE },  // LATIN CAPITAL LETTER THORN
+    { 0x0110, 0x0111 },  // LATIN CAPITAL LETTER D WITH STROKE
+    { 0x0126, 0x0127 },  // LATIN CAPITAL LETTER H WITH STROKE
+    { 0x0141, 0x0142 },  // LATIN CAPITAL LETTER L WITH STROKE
+    { 0x014A, 0x014B },  // LATIN CAPITAL LETTER ENG
+    { 0x0152, 0x0153 },  // LATIN CAPITAL LIGATURE OE
+    { 0x0166, 0x0167 },  // LATIN CAPITAL LETTER T WITH STROKE
+    { 0x0181, 0x0253 },  // LATIN CAPITAL LETTER B WITH HOOK
+    { 0x0182, 0x0183 },  // LATIN CAPITAL LETTER B WITH TOPBAR
+    { 0x0184, 0x0185 },  // LATIN CAPITAL LETTER TONE SIX
+    { 0x0186, 0x0254 },  // LATIN CAPITAL LETTER OPEN O
+    { 0x0187, 0x0188 },  // LATIN CAPITAL LETTER C WITH HOOK
+    { 0x0189, 0x0256 },  // LATIN CAPITAL LETTER AFRICAN D
+    { 0x018A, 0x0257 },  // LATIN CAPITAL LETTER D WITH HOOK
+    { 0x018B, 0x018C },  // LATIN CAPITAL LETTER D WITH TOPBAR
+    { 0x018E, 0x01DD },  // LATIN CAPITAL LETTER REVERSED E
+    { 0x018F, 0x0259 },  // LATIN CAPITAL LETTER SCHWA
+    { 0x0190, 0x025B },  // LATIN CAPITAL LETTER OPEN E
+    { 0x0191, 0x0192 },  // LATIN CAPITAL LETTER F WITH HOOK
+    { 0x0193, 0x0260 },  // LATIN CAPITAL LETTER G WITH HOOK
+    { 0x0194, 0x0263 },  // LATIN CAPITAL LETTER GAMMA
+    { 0x0196, 0x0269 },  // LATIN CAPITAL LETTER IOTA
+    { 0x0197, 0x0268 },  // LATIN CAPITAL LETTER I WITH STROKE
+    { 0x0198, 0x0199 },  // LATIN CAPITAL LETTER K WITH HOOK
+    { 0x019C, 0x026F },  // LATIN CAPITAL LETTER TURNED M
+    { 0x019D, 0x0272 },  // LATIN CAPITAL LETTER N WITH LEFT HOOK
+    { 0x019F, 0x0275 },  // LATIN CAPITAL LETTER O WITH MIDDLE TILDE
+    { 0x01A2, 0x01A3 },  // LATIN CAPITAL LETTER OI
+    { 0x01A4, 0x01A5 },  // LATIN CAPITAL LETTER P WITH HOOK
+    { 0x01A6, 0x0280 },  // LATIN LETTER YR
+    { 0x01A7, 0x01A8 },  // LATIN CAPITAL LETTER TONE TWO
+    { 0x01A9, 0x0283 },  // LATIN CAPITAL LETTER ESH
+    { 0x01AC, 0x01AD },  // LATIN CAPITAL LETTER T WITH HOOK
+    { 0x01AE, 0x0288 },  // LATIN CAPITAL LETTER T WITH RETROFLEX HOOK
+    { 0x01B1, 0x028A },  // LATIN CAPITAL LETTER UPSILON
+    { 0x01B2, 0x028B },  // LATIN CAPITAL LETTER V WITH HOOK
+    { 0x01B3, 0x01B4 },  // LATIN CAPITAL LETTER Y WITH HOOK
+    { 0x01B5, 0x01B6 },  // LATIN CAPITAL LETTER Z WITH STROKE
+    { 0x01B7, 0x0292 },  // LATIN CAPITAL LETTER EZH
+    { 0x01B8, 0x01B9 },  // LATIN CAPITAL LETTER EZH REVERSED
+    { 0x01BC, 0x01BD },  // LATIN CAPITAL LETTER TONE FIVE
+    { 0x01E4, 0x01E5 },  // LATIN CAPITAL LETTER G WITH STROKE
+    { 0x01EA, 0x01EB },  // LATIN CAPITAL LETTER O WITH OGONEK
+    { 0x01F6, 0x0195 },  // LATIN CAPITAL LETTER HWAIR
+    { 0x01F7, 0x01BF },  // LATIN CAPITAL LETTER WYNN
+    { 0x021C, 0x021D },  // LATIN CAPITAL LETTER YOGH
+    { 0x0220, 0x019E },  // LATIN CAPITAL LETTER N WITH LONG RIGHT LEG
+    { 0x0222, 0x0223 },  // LATIN CAPITAL LETTER OU
+    { 0x0224, 0x0225 },  // LATIN CAPITAL LETTER Z WITH HOOK
+    { 0x0226, 0x0227 },  // LATIN CAPITAL LETTER A WITH DOT ABOVE
+    { 0x022E, 0x022F },  // LATIN CAPITAL LETTER O WITH DOT ABOVE
+    { 0x023A, 0x2C65 },  // LATIN CAPITAL LETTER A WITH STROKE
+    { 0x023B, 0x023C },  // LATIN CAPITAL LETTER C WITH STROKE
+    { 0x023D, 0x019A },  // LATIN CAPITAL LETTER L WITH BAR
+    { 0x023E, 0x2C66 },  // LATIN CAPITAL LETTER T WITH DIAGONAL STROKE
+    { 0x0241, 0x0242 },  // LATIN CAPITAL LETTER GLOTTAL STOP
+    { 0x0243, 0x0180 },  // LATIN CAPITAL LETTER B WITH STROKE
+    { 0x0244, 0x0289 },  // LATIN CAPITAL LETTER U BAR
+    { 0x0245, 0x028C },  // LATIN CAPITAL LETTER TURNED V
+    { 0x0246, 0x0247 },  // LATIN CAPITAL LETTER E WITH STROKE
+    { 0x0248, 0x0249 },  // LATIN CAPITAL LETTER J WITH STROKE
+    { 0x024A, 0x024B },  // LATIN CAPITAL LETTER SMALL Q WITH HOOK TAIL
+    { 0x024C, 0x024D },  // LATIN CAPITAL LETTER R WITH STROKE
+    { 0x024E, 0x024F },  // LATIN CAPITAL LETTER Y WITH STROKE
+    { 0x0370, 0x0371 },  // GREEK CAPITAL LETTER HETA
+    { 0x0372, 0x0373 },  // GREEK CAPITAL LETTER ARCHAIC SAMPI
+    { 0x0376, 0x0377 },  // GREEK CAPITAL LETTER PAMPHYLIAN DIGAMMA
+    { 0x0391, 0x03B1 },  // GREEK CAPITAL LETTER ALPHA
+    { 0x0392, 0x03B2 },  // GREEK CAPITAL LETTER BETA
+    { 0x0393, 0x03B3 },  // GREEK CAPITAL LETTER GAMMA
+    { 0x0394, 0x03B4 },  // GREEK CAPITAL LETTER DELTA
+    { 0x0395, 0x03B5 },  // GREEK CAPITAL LETTER EPSILON
+    { 0x0396, 0x03B6 },  // GREEK CAPITAL LETTER ZETA
+    { 0x0397, 0x03B7 },  // GREEK CAPITAL LETTER ETA
+    { 0x0398, 0x03B8 },  // GREEK CAPITAL LETTER THETA
+    { 0x0399, 0x03B9 },  // GREEK CAPITAL LETTER IOTA
+    { 0x039A, 0x03BA },  // GREEK CAPITAL LETTER KAPPA
+    { 0x039B, 0x03BB },  // GREEK CAPITAL LETTER LAMDA
+    { 0x039C, 0x03BC },  // GREEK CAPITAL LETTER MU
+    { 0x039D, 0x03BD },  // GREEK CAPITAL LETTER NU
+    { 0x039E, 0x03BE },  // GREEK CAPITAL LETTER XI
+    { 0x039F, 0x03BF },  // GREEK CAPITAL LETTER OMICRON
+    { 0x03A0, 0x03C0 },  // GREEK CAPITAL LETTER PI
+    { 0x03A1, 0x03C1 },  // GREEK CAPITAL LETTER RHO
+    { 0x03A3, 0x03C3 },  // GREEK CAPITAL LETTER SIGMA
+    { 0x03A4, 0x03C4 },  // GREEK CAPITAL LETTER TAU
+    { 0x03A5, 0x03C5 },  // GREEK CAPITAL LETTER UPSILON
+    { 0x03A6, 0x03C6 },  // GREEK CAPITAL LETTER PHI
+    { 0x03A7, 0x03C7 },  // GREEK CAPITAL LETTER CHI
+    { 0x03A8, 0x03C8 },  // GREEK CAPITAL LETTER PSI
+    { 0x03A9, 0x03C9 },  // GREEK CAPITAL LETTER OMEGA
+    { 0x03CF, 0x03D7 },  // GREEK CAPITAL KAI SYMBOL
+    { 0x03D8, 0x03D9 },  // GREEK LETTER ARCHAIC KOPPA
+    { 0x03DA, 0x03DB },  // GREEK LETTER STIGMA
+    { 0x03DC, 0x03DD },  // GREEK LETTER DIGAMMA
+    { 0x03DE, 0x03DF },  // GREEK LETTER KOPPA
+    { 0x03E0, 0x03E1 },  // GREEK LETTER SAMPI
+    { 0x03E2, 0x03E3 },  // COPTIC CAPITAL LETTER SHEI
+    { 0x03E4, 0x03E5 },  // COPTIC CAPITAL LETTER FEI
+    { 0x03E6, 0x03E7 },  // COPTIC CAPITAL LETTER KHEI
+    { 0x03E8, 0x03E9 },  // COPTIC CAPITAL LETTER HORI
+    { 0x03EA, 0x03EB },  // COPTIC CAPITAL LETTER GANGIA
+    { 0x03EC, 0x03ED },  // COPTIC CAPITAL LETTER SHIMA
+    { 0x03EE, 0x03EF },  // COPTIC CAPITAL LETTER DEI
+    { 0x03F7, 0x03F8 },  // GREEK CAPITAL LETTER SHO
+    { 0x03FA, 0x03FB },  // GREEK CAPITAL LETTER SAN
+    { 0x03FD, 0x037B },  // GREEK CAPITAL REVERSED LUNATE SIGMA SYMBOL
+    { 0x03FE, 0x037C },  // GREEK CAPITAL DOTTED LUNATE SIGMA SYMBOL
+    { 0x03FF, 0x037D },  // GREEK CAPITAL REVERSED DOTTED LUNATE SIGMA SYMBOL
+    { 0x0402, 0x0452 },  // CYRILLIC CAPITAL LETTER DJE
+    { 0x0404, 0x0454 },  // CYRILLIC CAPITAL LETTER UKRAINIAN IE
+    { 0x0405, 0x0455 },  // CYRILLIC CAPITAL LETTER DZE
+    { 0x0406, 0x0456 },  // CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
+    { 0x0408, 0x0458 },  // CYRILLIC CAPITAL LETTER JE
+    { 0x0409, 0x0459 },  // CYRILLIC CAPITAL LETTER LJE
+    { 0x040A, 0x045A },  // CYRILLIC CAPITAL LETTER NJE
+    { 0x040B, 0x045B },  // CYRILLIC CAPITAL LETTER TSHE
+    { 0x040F, 0x045F },  // CYRILLIC CAPITAL LETTER DZHE
+    { 0x0410, 0x0430 },  // CYRILLIC CAPITAL LETTER A
+    { 0x0411, 0x0431 },  // CYRILLIC CAPITAL LETTER BE
+    { 0x0412, 0x0432 },  // CYRILLIC CAPITAL LETTER VE
+    { 0x0413, 0x0433 },  // CYRILLIC CAPITAL LETTER GHE
+    { 0x0414, 0x0434 },  // CYRILLIC CAPITAL LETTER DE
+    { 0x0415, 0x0435 },  // CYRILLIC CAPITAL LETTER IE
+    { 0x0416, 0x0436 },  // CYRILLIC CAPITAL LETTER ZHE
+    { 0x0417, 0x0437 },  // CYRILLIC CAPITAL LETTER ZE
+    { 0x0418, 0x0438 },  // CYRILLIC CAPITAL LETTER I
+    { 0x041A, 0x043A },  // CYRILLIC CAPITAL LETTER KA
+    { 0x041B, 0x043B },  // CYRILLIC CAPITAL LETTER EL
+    { 0x041C, 0x043C },  // CYRILLIC CAPITAL LETTER EM
+    { 0x041D, 0x043D },  // CYRILLIC CAPITAL LETTER EN
+    { 0x041E, 0x043E },  // CYRILLIC CAPITAL LETTER O
+    { 0x041F, 0x043F },  // CYRILLIC CAPITAL LETTER PE
+    { 0x0420, 0x0440 },  // CYRILLIC CAPITAL LETTER ER
+    { 0x0421, 0x0441 },  // CYRILLIC CAPITAL LETTER ES
+    { 0x0422, 0x0442 },  // CYRILLIC CAPITAL LETTER TE
+    { 0x0423, 0x0443 },  // CYRILLIC CAPITAL LETTER U
+    { 0x0424, 0x0444 },  // CYRILLIC CAPITAL LETTER EF
+    { 0x0425, 0x0445 },  // CYRILLIC CAPITAL LETTER HA
+    { 0x0426, 0x0446 },  // CYRILLIC CAPITAL LETTER TSE
+    { 0x0427, 0x0447 },  // CYRILLIC CAPITAL LETTER CHE
+    { 0x0428, 0x0448 },  // CYRILLIC CAPITAL LETTER SHA
+    { 0x0429, 0x0449 },  // CYRILLIC CAPITAL LETTER SHCHA
+    { 0x042A, 0x044A },  // CYRILLIC CAPITAL LETTER HARD SIGN
+    { 0x042B, 0x044B },  // CYRILLIC CAPITAL LETTER YERU
+    { 0x042C, 0x044C },  // CYRILLIC CAPITAL LETTER SOFT SIGN
+    { 0x042D, 0x044D },  // CYRILLIC CAPITAL LETTER E
+    { 0x042E, 0x044E },  // CYRILLIC CAPITAL LETTER YU
+    { 0x042F, 0x044F },  // CYRILLIC CAPITAL LETTER YA
+    { 0x0460, 0x0461 },  // CYRILLIC CAPITAL LETTER OMEGA
+    { 0x0462, 0x0463 },  // CYRILLIC CAPITAL LETTER YAT
+    { 0x0464, 0x0465 },  // CYRILLIC CAPITAL LETTER IOTIFIED E
+    { 0x0466, 0x0467 },  // CYRILLIC CAPITAL LETTER LITTLE YUS
+    { 0x0468, 0x0469 },  // CYRILLIC CAPITAL LETTER IOTIFIED LITTLE YUS
+    { 0x046A, 0x046B },  // CYRILLIC CAPITAL LETTER BIG YUS
+    { 0x046C, 0x046D },  // CYRILLIC CAPITAL LETTER IOTIFIED BIG YUS
+    { 0x046E, 0x046F },  // CYRILLIC CAPITAL LETTER KSI
+    { 0x0470, 0x0471 },  // CYRILLIC CAPITAL LETTER PSI
+    { 0x0472, 0x0473 },  // CYRILLIC CAPITAL LETTER FITA
+    { 0x0474, 0x0475 },  // CYRILLIC CAPITAL LETTER IZHITSA
+    { 0x0478, 0x0479 },  // CYRILLIC CAPITAL LETTER UK
+    { 0x047A, 0x047B },  // CYRILLIC CAPITAL LETTER ROUND OMEGA
+    { 0x047C, 0x047D },  // CYRILLIC CAPITAL LETTER OMEGA WITH TITLO
+    { 0x047E, 0x047F },  // CYRILLIC CAPITAL LETTER OT
+    { 0x0480, 0x0481 },  // CYRILLIC CAPITAL LETTER KOPPA
+    { 0x048A, 0x048B },  // CYRILLIC CAPITAL LETTER SHORT I WITH TAIL
+    { 0x048C, 0x048D },  // CYRILLIC CAPITAL LETTER SEMISOFT SIGN
+    { 0x048E, 0x048F },  // CYRILLIC CAPITAL LETTER ER WITH TICK
+    { 0x0490, 0x0491 },  // CYRILLIC CAPITAL LETTER GHE WITH UPTURN
+    { 0x0492, 0x0493 },  // CYRILLIC CAPITAL LETTER GHE WITH STROKE
+    { 0x0494, 0x0495 },  // CYRILLIC CAPITAL LETTER GHE WITH MIDDLE HOOK
+    { 0x0496, 0x0497 },  // CYRILLIC CAPITAL LETTER ZHE WITH DESCENDER
+    { 0x0498, 0x0499 },  // CYRILLIC CAPITAL LETTER ZE WITH DESCENDER
+    { 0x049A, 0x049B },  // CYRILLIC CAPITAL LETTER KA WITH DESCENDER
+    { 0x049C, 0x049D },  // CYRILLIC CAPITAL LETTER KA WITH VERTICAL STROKE
+    { 0x049E, 0x049F },  // CYRILLIC CAPITAL LETTER KA WITH STROKE
+    { 0x04A0, 0x04A1 },  // CYRILLIC CAPITAL LETTER BASHKIR KA
+    { 0x04A2, 0x04A3 },  // CYRILLIC CAPITAL LETTER EN WITH DESCENDER
+    { 0x04A4, 0x04A5 },  // CYRILLIC CAPITAL LIGATURE EN GHE
+    { 0x04A6, 0x04A7 },  // CYRILLIC CAPITAL LETTER PE WITH MIDDLE HOOK
+    { 0x04A8, 0x04A9 },  // CYRILLIC CAPITAL LETTER ABKHASIAN HA
+    { 0x04AA, 0x04AB },  // CYRILLIC CAPITAL LETTER ES WITH DESCENDER
+    { 0x04AC, 0x04AD },  // CYRILLIC CAPITAL LETTER TE WITH DESCENDER
+    { 0x04AE, 0x04AF },  // CYRILLIC CAPITAL LETTER STRAIGHT U
+    { 0x04B0, 0x04B1 },  // CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE
+    { 0x04B2, 0x04B3 },  // CYRILLIC CAPITAL LETTER HA WITH DESCENDER
+    { 0x04B4, 0x04B5 },  // CYRILLIC CAPITAL LIGATURE TE TSE
+    { 0x04B6, 0x04B7 },  // CYRILLIC CAPITAL LETTER CHE WITH DESCENDER
+    { 0x04B8, 0x04B9 },  // CYRILLIC CAPITAL LETTER CHE WITH VERTICAL STROKE
+    { 0x04BA, 0x04BB },  // CYRILLIC CAPITAL LETTER SHHA
+    { 0x04BC, 0x04BD },  // CYRILLIC CAPITAL LETTER ABKHASIAN CHE
+    { 0x04BE, 0x04BF },  // CYRILLIC CAPITAL LETTER ABKHASIAN CHE WITH DESCENDER
+    { 0x04C0, 0x04CF },  // CYRILLIC LETTER PALOCHKA
+    { 0x04C3, 0x04C4 },  // CYRILLIC CAPITAL LETTER KA WITH HOOK
+    { 0x04C5, 0x04C6 },  // CYRILLIC CAPITAL LETTER EL WITH TAIL
+    { 0x04C7, 0x04C8 },  // CYRILLIC CAPITAL LETTER EN WITH HOOK
+    { 0x04C9, 0x04CA },  // CYRILLIC CAPITAL LETTER EN WITH TAIL
+    { 0x04CB, 0x04CC },  // CYRILLIC CAPITAL LETTER KHAKASSIAN CHE
+    { 0x04CD, 0x04CE },  // CYRILLIC CAPITAL LETTER EM WITH TAIL
+    { 0x04D4, 0x04D5 },  // CYRILLIC CAPITAL LIGATURE A IE
+    { 0x04D8, 0x04D9 },  // CYRILLIC CAPITAL LETTER SCHWA
+    { 0x04E0, 0x04E1 },  // CYRILLIC CAPITAL LETTER ABKHASIAN DZE
+    { 0x04E8, 0x04E9 },  // CYRILLIC CAPITAL LETTER BARRED O
+    { 0x04F6, 0x04F7 },  // CYRILLIC CAPITAL LETTER GHE WITH DESCENDER
+    { 0x04FA, 0x04FB },  // CYRILLIC CAPITAL LETTER GHE WITH STROKE AND HOOK
+    { 0x04FC, 0x04FD },  // CYRILLIC CAPITAL LETTER HA WITH HOOK
+    { 0x04FE, 0x04FF },  // CYRILLIC CAPITAL LETTER HA WITH STROKE
+    { 0x0500, 0x0501 },  // CYRILLIC CAPITAL LETTER KOMI DE
+    { 0x0502, 0x0503 },  // CYRILLIC CAPITAL LETTER KOMI DJE
+    { 0x0504, 0x0505 },  // CYRILLIC CAPITAL LETTER KOMI ZJE
+    { 0x0506, 0x0507 },  // CYRILLIC CAPITAL LETTER KOMI DZJE
+    { 0x0508, 0x0509 },  // CYRILLIC CAPITAL LETTER KOMI LJE
+    { 0x050A, 0x050B },  // CYRILLIC CAPITAL LETTER KOMI NJE
+    { 0x050C, 0x050D },  // CYRILLIC CAPITAL LETTER KOMI SJE
+    { 0x050E, 0x050F },  // CYRILLIC CAPITAL LETTER KOMI TJE
+    { 0x0510, 0x0511 },  // CYRILLIC CAPITAL LETTER REVERSED ZE
+    { 0x0512, 0x0513 },  // CYRILLIC CAPITAL LETTER EL WITH HOOK
+    { 0x0514, 0x0515 },  // CYRILLIC CAPITAL LETTER LHA
+    { 0x0516, 0x0517 },  // CYRILLIC CAPITAL LETTER RHA
+    { 0x0518, 0x0519 },  // CYRILLIC CAPITAL LETTER YAE
+    { 0x051A, 0x051B },  // CYRILLIC CAPITAL LETTER QA
+    { 0x051C, 0x051D },  // CYRILLIC CAPITAL LETTER WE
+    { 0x051E, 0x051F },  // CYRILLIC CAPITAL LETTER ALEUT KA
+    { 0x0520, 0x0521 },  // CYRILLIC CAPITAL LETTER EL WITH MIDDLE HOOK
+    { 0x0522, 0x0523 },  // CYRILLIC CAPITAL LETTER EN WITH MIDDLE HOOK
+    { 0x0524, 0x0525 },  // CYRILLIC CAPITAL LETTER PE WITH DESCENDER
+    { 0x0531, 0x0561 },  // ARMENIAN CAPITAL LETTER AYB
+    { 0x0532, 0x0562 },  // ARMENIAN CAPITAL LETTER BEN
+    { 0x0533, 0x0563 },  // ARMENIAN CAPITAL LETTER GIM
+    { 0x0534, 0x0564 },  // ARMENIAN CAPITAL LETTER DA
+    { 0x0535, 0x0565 },  // ARMENIAN CAPITAL LETTER ECH
+    { 0x0536, 0x0566 },  // ARMENIAN CAPITAL LETTER ZA
+    { 0x0537, 0x0567 },  // ARMENIAN CAPITAL LETTER EH
+    { 0x0538, 0x0568 },  // ARMENIAN CAPITAL LETTER ET
+    { 0x0539, 0x0569 },  // ARMENIAN CAPITAL LETTER TO
+    { 0x053A, 0x056A },  // ARMENIAN CAPITAL LETTER ZHE
+    { 0x053B, 0x056B },  // ARMENIAN CAPITAL LETTER INI
+    { 0x053C, 0x056C },  // ARMENIAN CAPITAL LETTER LIWN
+    { 0x053D, 0x056D },  // ARMENIAN CAPITAL LETTER XEH
+    { 0x053E, 0x056E },  // ARMENIAN CAPITAL LETTER CA
+    { 0x053F, 0x056F },  // ARMENIAN CAPITAL LETTER KEN
+    { 0x0540, 0x0570 },  // ARMENIAN CAPITAL LETTER HO
+    { 0x0541, 0x0571 },  // ARMENIAN CAPITAL LETTER JA
+    { 0x0542, 0x0572 },  // ARMENIAN CAPITAL LETTER GHAD
+    { 0x0543, 0x0573 },  // ARMENIAN CAPITAL LETTER CHEH
+    { 0x0544, 0x0574 },  // ARMENIAN CAPITAL LETTER MEN
+    { 0x0545, 0x0575 },  // ARMENIAN CAPITAL LETTER YI
+    { 0x0546, 0x0576 },  // ARMENIAN CAPITAL LETTER NOW
+    { 0x0547, 0x0577 },  // ARMENIAN CAPITAL LETTER SHA
+    { 0x0548, 0x0578 },  // ARMENIAN CAPITAL LETTER VO
+    { 0x0549, 0x0579 },  // ARMENIAN CAPITAL LETTER CHA
+    { 0x054A, 0x057A },  // ARMENIAN CAPITAL LETTER PEH
+    { 0x054B, 0x057B },  // ARMENIAN CAPITAL LETTER JHEH
+    { 0x054C, 0x057C },  // ARMENIAN CAPITAL LETTER RA
+    { 0x054D, 0x057D },  // ARMENIAN CAPITAL LETTER SEH
+    { 0x054E, 0x057E },  // ARMENIAN CAPITAL LETTER VEW
+    { 0x054F, 0x057F },  // ARMENIAN CAPITAL LETTER TIWN
+    { 0x0550, 0x0580 },  // ARMENIAN CAPITAL LETTER REH
+    { 0x0551, 0x0581 },  // ARMENIAN CAPITAL LETTER CO
+    { 0x0552, 0x0582 },  // ARMENIAN CAPITAL LETTER YIWN
+    { 0x0553, 0x0583 },  // ARMENIAN CAPITAL LETTER PIWR
+    { 0x0554, 0x0584 },  // ARMENIAN CAPITAL LETTER KEH
+    { 0x0555, 0x0585 },  // ARMENIAN CAPITAL LETTER OH
+    { 0x0556, 0x0586 },  // ARMENIAN CAPITAL LETTER FEH
+    { 0x10A0, 0x2D00 },  // GEORGIAN CAPITAL LETTER AN
+    { 0x10A1, 0x2D01 },  // GEORGIAN CAPITAL LETTER BAN
+    { 0x10A2, 0x2D02 },  // GEORGIAN CAPITAL LETTER GAN
+    { 0x10A3, 0x2D03 },  // GEORGIAN CAPITAL LETTER DON
+    { 0x10A4, 0x2D04 },  // GEORGIAN CAPITAL LETTER EN
+    { 0x10A5, 0x2D05 },  // GEORGIAN CAPITAL LETTER VIN
+    { 0x10A6, 0x2D06 },  // GEORGIAN CAPITAL LETTER ZEN
+    { 0x10A7, 0x2D07 },  // GEORGIAN CAPITAL LETTER TAN
+    { 0x10A8, 0x2D08 },  // GEORGIAN CAPITAL LETTER IN
+    { 0x10A9, 0x2D09 },  // GEORGIAN CAPITAL LETTER KAN
+    { 0x10AA, 0x2D0A },  // GEORGIAN CAPITAL LETTER LAS
+    { 0x10AB, 0x2D0B },  // GEORGIAN CAPITAL LETTER MAN
+    { 0x10AC, 0x2D0C },  // GEORGIAN CAPITAL LETTER NAR
+    { 0x10AD, 0x2D0D },  // GEORGIAN CAPITAL LETTER ON
+    { 0x10AE, 0x2D0E },  // GEORGIAN CAPITAL LETTER PAR
+    { 0x10AF, 0x2D0F },  // GEORGIAN CAPITAL LETTER ZHAR
+    { 0x10B0, 0x2D10 },  // GEORGIAN CAPITAL LETTER RAE
+    { 0x10B1, 0x2D11 },  // GEORGIAN CAPITAL LETTER SAN
+    { 0x10B2, 0x2D12 },  // GEORGIAN CAPITAL LETTER TAR
+    { 0x10B3, 0x2D13 },  // GEORGIAN CAPITAL LETTER UN
+    { 0x10B4, 0x2D14 },  // GEORGIAN CAPITAL LETTER PHAR
+    { 0x10B5, 0x2D15 },  // GEORGIAN CAPITAL LETTER KHAR
+    { 0x10B6, 0x2D16 },  // GEORGIAN CAPITAL LETTER GHAN
+    { 0x10B7, 0x2D17 },  // GEORGIAN CAPITAL LETTER QAR
+    { 0x10B8, 0x2D18 },  // GEORGIAN CAPITAL LETTER SHIN
+    { 0x10B9, 0x2D19 },  // GEORGIAN CAPITAL LETTER CHIN
+    { 0x10BA, 0x2D1A },  // GEORGIAN CAPITAL LETTER CAN
+    { 0x10BB, 0x2D1B },  // GEORGIAN CAPITAL LETTER JIL
+    { 0x10BC, 0x2D1C },  // GEORGIAN CAPITAL LETTER CIL
+    { 0x10BD, 0x2D1D },  // GEORGIAN CAPITAL LETTER CHAR
+    { 0x10BE, 0x2D1E },  // GEORGIAN CAPITAL LETTER XAN
+    { 0x10BF, 0x2D1F },  // GEORGIAN CAPITAL LETTER JHAN
+    { 0x10C0, 0x2D20 },  // GEORGIAN CAPITAL LETTER HAE
+    { 0x10C1, 0x2D21 },  // GEORGIAN CAPITAL LETTER HE
+    { 0x10C2, 0x2D22 },  // GEORGIAN CAPITAL LETTER HIE
+    { 0x10C3, 0x2D23 },  // GEORGIAN CAPITAL LETTER WE
+    { 0x10C4, 0x2D24 },  // GEORGIAN CAPITAL LETTER HAR
+    { 0x10C5, 0x2D25 },  // GEORGIAN CAPITAL LETTER HOE
+    { 0x1E00, 0x1E01 },  // LATIN CAPITAL LETTER A WITH RING BELOW
+    { 0x1E02, 0x1E03 },  // LATIN CAPITAL LETTER B WITH DOT ABOVE
+    { 0x1E04, 0x1E05 },  // LATIN CAPITAL LETTER B WITH DOT BELOW
+    { 0x1E06, 0x1E07 },  // LATIN CAPITAL LETTER B WITH LINE BELOW
+    { 0x1E08, 0x1E09 },  // LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
+    { 0x1E0A, 0x1E0B },  // LATIN CAPITAL LETTER D WITH DOT ABOVE
+    { 0x1E0C, 0x1E0D },  // LATIN CAPITAL LETTER D WITH DOT BELOW
+    { 0x1E0E, 0x1E0F },  // LATIN CAPITAL LETTER D WITH LINE BELOW
+    { 0x1E10, 0x1E11 },  // LATIN CAPITAL LETTER D WITH CEDILLA
+    { 0x1E12, 0x1E13 },  // LATIN CAPITAL LETTER D WITH CIRCUMFLEX BELOW
+    { 0x1E14, 0x1E15 },  // LATIN CAPITAL LETTER E WITH MACRON AND GRAVE
+    { 0x1E16, 0x1E17 },  // LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
+    { 0x1E18, 0x1E19 },  // LATIN CAPITAL LETTER E WITH CIRCUMFLEX BELOW
+    { 0x1E1A, 0x1E1B },  // LATIN CAPITAL LETTER E WITH TILDE BELOW
+    { 0x1E1C, 0x1E1D },  // LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
+    { 0x1E1E, 0x1E1F },  // LATIN CAPITAL LETTER F WITH DOT ABOVE
+    { 0x1E20, 0x1E21 },  // LATIN CAPITAL LETTER G WITH MACRON
+    { 0x1E22, 0x1E23 },  // LATIN CAPITAL LETTER H WITH DOT ABOVE
+    { 0x1E24, 0x1E25 },  // LATIN CAPITAL LETTER H WITH DOT BELOW
+    { 0x1E26, 0x1E27 },  // LATIN CAPITAL LETTER H WITH DIAERESIS
+    { 0x1E28, 0x1E29 },  // LATIN CAPITAL LETTER H WITH CEDILLA
+    { 0x1E2A, 0x1E2B },  // LATIN CAPITAL LETTER H WITH BREVE BELOW
+    { 0x1E2C, 0x1E2D },  // LATIN CAPITAL LETTER I WITH TILDE BELOW
+    { 0x1E2E, 0x1E2F },  // LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE
+    { 0x1E30, 0x1E31 },  // LATIN CAPITAL LETTER K WITH ACUTE
+    { 0x1E32, 0x1E33 },  // LATIN CAPITAL LETTER K WITH DOT BELOW
+    { 0x1E34, 0x1E35 },  // LATIN CAPITAL LETTER K WITH LINE BELOW
+    { 0x1E36, 0x1E37 },  // LATIN CAPITAL LETTER L WITH DOT BELOW
+    { 0x1E38, 0x1E39 },  // LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON
+    { 0x1E3A, 0x1E3B },  // LATIN CAPITAL LETTER L WITH LINE BELOW
+    { 0x1E3C, 0x1E3D },  // LATIN CAPITAL LETTER L WITH CIRCUMFLEX BELOW
+    { 0x1E3E, 0x1E3F },  // LATIN CAPITAL LETTER M WITH ACUTE
+    { 0x1E40, 0x1E41 },  // LATIN CAPITAL LETTER M WITH DOT ABOVE
+    { 0x1E42, 0x1E43 },  // LATIN CAPITAL LETTER M WITH DOT BELOW
+    { 0x1E44, 0x1E45 },  // LATIN CAPITAL LETTER N WITH DOT ABOVE
+    { 0x1E46, 0x1E47 },  // LATIN CAPITAL LETTER N WITH DOT BELOW
+    { 0x1E48, 0x1E49 },  // LATIN CAPITAL LETTER N WITH LINE BELOW
+    { 0x1E4A, 0x1E4B },  // LATIN CAPITAL LETTER N WITH CIRCUMFLEX BELOW
+    { 0x1E4C, 0x1E4D },  // LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
+    { 0x1E4E, 0x1E4F },  // LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS
+    { 0x1E50, 0x1E51 },  // LATIN CAPITAL LETTER O WITH MACRON AND GRAVE
+    { 0x1E52, 0x1E53 },  // LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
+    { 0x1E54, 0x1E55 },  // LATIN CAPITAL LETTER P WITH ACUTE
+    { 0x1E56, 0x1E57 },  // LATIN CAPITAL LETTER P WITH DOT ABOVE
+    { 0x1E58, 0x1E59 },  // LATIN CAPITAL LETTER R WITH DOT ABOVE
+    { 0x1E5A, 0x1E5B },  // LATIN CAPITAL LETTER R WITH DOT BELOW
+    { 0x1E5C, 0x1E5D },  // LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON
+    { 0x1E5E, 0x1E5F },  // LATIN CAPITAL LETTER R WITH LINE BELOW
+    { 0x1E60, 0x1E61 },  // LATIN CAPITAL LETTER S WITH DOT ABOVE
+    { 0x1E62, 0x1E63 },  // LATIN CAPITAL LETTER S WITH DOT BELOW
+    { 0x1E64, 0x1E65 },  // LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE
+    { 0x1E66, 0x1E67 },  // LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE
+    { 0x1E68, 0x1E69 },  // LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE
+    { 0x1E6A, 0x1E6B },  // LATIN CAPITAL LETTER T WITH DOT ABOVE
+    { 0x1E6C, 0x1E6D },  // LATIN CAPITAL LETTER T WITH DOT BELOW
+    { 0x1E6E, 0x1E6F },  // LATIN CAPITAL LETTER T WITH LINE BELOW
+    { 0x1E70, 0x1E71 },  // LATIN CAPITAL LETTER T WITH CIRCUMFLEX BELOW
+    { 0x1E72, 0x1E73 },  // LATIN CAPITAL LETTER U WITH DIAERESIS BELOW
+    { 0x1E74, 0x1E75 },  // LATIN CAPITAL LETTER U WITH TILDE BELOW
+    { 0x1E76, 0x1E77 },  // LATIN CAPITAL LETTER U WITH CIRCUMFLEX BELOW
+    { 0x1E78, 0x1E79 },  // LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
+    { 0x1E7A, 0x1E7B },  // LATIN CAPITAL LETTER U WITH MACRON AND DIAERESIS
+    { 0x1E7C, 0x1E7D },  // LATIN CAPITAL LETTER V WITH TILDE
+    { 0x1E7E, 0x1E7F },  // LATIN CAPITAL LETTER V WITH DOT BELOW
+    { 0x1E80, 0x1E81 },  // LATIN CAPITAL LETTER W WITH GRAVE
+    { 0x1E82, 0x1E83 },  // LATIN CAPITAL LETTER W WITH ACUTE
+    { 0x1E84, 0x1E85 },  // LATIN CAPITAL LETTER W WITH DIAERESIS
+    { 0x1E86, 0x1E87 },  // LATIN CAPITAL LETTER W WITH DOT ABOVE
+    { 0x1E88, 0x1E89 },  // LATIN CAPITAL LETTER W WITH DOT BELOW
+    { 0x1E8A, 0x1E8B },  // LATIN CAPITAL LETTER X WITH DOT ABOVE
+    { 0x1E8C, 0x1E8D },  // LATIN CAPITAL LETTER X WITH DIAERESIS
+    { 0x1E8E, 0x1E8F },  // LATIN CAPITAL LETTER Y WITH DOT ABOVE
+    { 0x1E90, 0x1E91 },  // LATIN CAPITAL LETTER Z WITH CIRCUMFLEX
+    { 0x1E92, 0x1E93 },  // LATIN CAPITAL LETTER Z WITH DOT BELOW
+    { 0x1E94, 0x1E95 },  // LATIN CAPITAL LETTER Z WITH LINE BELOW
+    { 0x1E9E, 0x00DF },  // LATIN CAPITAL LETTER SHARP S
+    { 0x1EA0, 0x1EA1 },  // LATIN CAPITAL LETTER A WITH DOT BELOW
+    { 0x1EA2, 0x1EA3 },  // LATIN CAPITAL LETTER A WITH HOOK ABOVE
+    { 0x1EA4, 0x1EA5 },  // LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
+    { 0x1EA6, 0x1EA7 },  // LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
+    { 0x1EA8, 0x1EA9 },  // LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
+    { 0x1EAA, 0x1EAB },  // LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
+    { 0x1EAC, 0x1EAD },  // LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
+    { 0x1EAE, 0x1EAF },  // LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
+    { 0x1EB0, 0x1EB1 },  // LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
+    { 0x1EB2, 0x1EB3 },  // LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
+    { 0x1EB4, 0x1EB5 },  // LATIN CAPITAL LETTER A WITH BREVE AND TILDE
+    { 0x1EB6, 0x1EB7 },  // LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
+    { 0x1EB8, 0x1EB9 },  // LATIN CAPITAL LETTER E WITH DOT BELOW
+    { 0x1EBA, 0x1EBB },  // LATIN CAPITAL LETTER E WITH HOOK ABOVE
+    { 0x1EBC, 0x1EBD },  // LATIN CAPITAL LETTER E WITH TILDE
+    { 0x1EBE, 0x1EBF },  // LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
+    { 0x1EC0, 0x1EC1 },  // LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
+    { 0x1EC2, 0x1EC3 },  // LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
+    { 0x1EC4, 0x1EC5 },  // LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
+    { 0x1EC6, 0x1EC7 },  // LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
+    { 0x1EC8, 0x1EC9 },  // LATIN CAPITAL LETTER I WITH HOOK ABOVE
+    { 0x1ECA, 0x1ECB },  // LATIN CAPITAL LETTER I WITH DOT BELOW
+    { 0x1ECC, 0x1ECD },  // LATIN CAPITAL LETTER O WITH DOT BELOW
+    { 0x1ECE, 0x1ECF },  // LATIN CAPITAL LETTER O WITH HOOK ABOVE
+    { 0x1ED0, 0x1ED1 },  // LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
+    { 0x1ED2, 0x1ED3 },  // LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
+    { 0x1ED4, 0x1ED5 },  // LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
+    { 0x1ED6, 0x1ED7 },  // LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
+    { 0x1ED8, 0x1ED9 },  // LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
+    { 0x1EDA, 0x1EDB },  // LATIN CAPITAL LETTER O WITH HORN AND ACUTE
+    { 0x1EDC, 0x1EDD },  // LATIN CAPITAL LETTER O WITH HORN AND GRAVE
+    { 0x1EDE, 0x1EDF },  // LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
+    { 0x1EE0, 0x1EE1 },  // LATIN CAPITAL LETTER O WITH HORN AND TILDE
+    { 0x1EE2, 0x1EE3 },  // LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
+    { 0x1EE4, 0x1EE5 },  // LATIN CAPITAL LETTER U WITH DOT BELOW
+    { 0x1EE6, 0x1EE7 },  // LATIN CAPITAL LETTER U WITH HOOK ABOVE
+    { 0x1EE8, 0x1EE9 },  // LATIN CAPITAL LETTER U WITH HORN AND ACUTE
+    { 0x1EEA, 0x1EEB },  // LATIN CAPITAL LETTER U WITH HORN AND GRAVE
+    { 0x1EEC, 0x1EED },  // LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
+    { 0x1EEE, 0x1EEF },  // LATIN CAPITAL LETTER U WITH HORN AND TILDE
+    { 0x1EF0, 0x1EF1 },  // LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
+    { 0x1EF2, 0x1EF3 },  // LATIN CAPITAL LETTER Y WITH GRAVE
+    { 0x1EF4, 0x1EF5 },  // LATIN CAPITAL LETTER Y WITH DOT BELOW
+    { 0x1EF6, 0x1EF7 },  // LATIN CAPITAL LETTER Y WITH HOOK ABOVE
+    { 0x1EF8, 0x1EF9 },  // LATIN CAPITAL LETTER Y WITH TILDE
+    { 0x1EFA, 0x1EFB },  // LATIN CAPITAL LETTER MIDDLE-WELSH LL
+    { 0x1EFC, 0x1EFD },  // LATIN CAPITAL LETTER MIDDLE-WELSH V
+    { 0x1EFE, 0x1EFF },  // LATIN CAPITAL LETTER Y WITH LOOP
+    { 0x1F08, 0x1F00 },  // GREEK CAPITAL LETTER ALPHA WITH PSILI
+    { 0x1F09, 0x1F01 },  // GREEK CAPITAL LETTER ALPHA WITH DASIA
+    { 0x1F0A, 0x1F02 },  // GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
+    { 0x1F0B, 0x1F03 },  // GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
+    { 0x1F0C, 0x1F04 },  // GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
+    { 0x1F0D, 0x1F05 },  // GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
+    { 0x1F0E, 0x1F06 },  // GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
+    { 0x1F0F, 0x1F07 },  // GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
+    { 0x1F18, 0x1F10 },  // GREEK CAPITAL LETTER EPSILON WITH PSILI
+    { 0x1F19, 0x1F11 },  // GREEK CAPITAL LETTER EPSILON WITH DASIA
+    { 0x1F1A, 0x1F12 },  // GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
+    { 0x1F1B, 0x1F13 },  // GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
+    { 0x1F1C, 0x1F14 },  // GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
+    { 0x1F1D, 0x1F15 },  // GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
+    { 0x1F28, 0x1F20 },  // GREEK CAPITAL LETTER ETA WITH PSILI
+    { 0x1F29, 0x1F21 },  // GREEK CAPITAL LETTER ETA WITH DASIA
+    { 0x1F2A, 0x1F22 },  // GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
+    { 0x1F2B, 0x1F23 },  // GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
+    { 0x1F2C, 0x1F24 },  // GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
+    { 0x1F2D, 0x1F25 },  // GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
+    { 0x1F2E, 0x1F26 },  // GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
+    { 0x1F2F, 0x1F27 },  // GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
+    { 0x1F38, 0x1F30 },  // GREEK CAPITAL LETTER IOTA WITH PSILI
+    { 0x1F39, 0x1F31 },  // GREEK CAPITAL LETTER IOTA WITH DASIA
+    { 0x1F3A, 0x1F32 },  // GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
+    { 0x1F3B, 0x1F33 },  // GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
+    { 0x1F3C, 0x1F34 },  // GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
+    { 0x1F3D, 0x1F35 },  // GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
+    { 0x1F3E, 0x1F36 },  // GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
+    { 0x1F3F, 0x1F37 },  // GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
+    { 0x1F48, 0x1F40 },  // GREEK CAPITAL LETTER OMICRON WITH PSILI
+    { 0x1F49, 0x1F41 },  // GREEK CAPITAL LETTER OMICRON WITH DASIA
+    { 0x1F4A, 0x1F42 },  // GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
+    { 0x1F4B, 0x1F43 },  // GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
+    { 0x1F4C, 0x1F44 },  // GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
+    { 0x1F4D, 0x1F45 },  // GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
+    { 0x1F59, 0x1F51 },  // GREEK CAPITAL LETTER UPSILON WITH DASIA
+    { 0x1F5B, 0x1F53 },  // GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
+    { 0x1F5D, 0x1F55 },  // GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
+    { 0x1F5F, 0x1F57 },  // GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
+    { 0x1F68, 0x1F60 },  // GREEK CAPITAL LETTER OMEGA WITH PSILI
+    { 0x1F69, 0x1F61 },  // GREEK CAPITAL LETTER OMEGA WITH DASIA
+    { 0x1F6A, 0x1F62 },  // GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
+    { 0x1F6B, 0x1F63 },  // GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
+    { 0x1F6C, 0x1F64 },  // GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
+    { 0x1F6D, 0x1F65 },  // GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
+    { 0x1F6E, 0x1F66 },  // GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
+    { 0x1F6F, 0x1F67 },  // GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
+    { 0x1F88, 0x1F80 },  // GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI
+    { 0x1F89, 0x1F81 },  // GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI
+    { 0x1F8A, 0x1F82 },  // GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+    { 0x1F8B, 0x1F83 },  // GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+    { 0x1F8C, 0x1F84 },  // GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+    { 0x1F8D, 0x1F85 },  // GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+    { 0x1F8E, 0x1F86 },  // GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+    { 0x1F8F, 0x1F87 },  // GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+    { 0x1F98, 0x1F90 },  // GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI
+    { 0x1F99, 0x1F91 },  // GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI
+    { 0x1F9A, 0x1F92 },  // GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+    { 0x1F9B, 0x1F93 },  // GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+    { 0x1F9C, 0x1F94 },  // GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+    { 0x1F9D, 0x1F95 },  // GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+    { 0x1F9E, 0x1F96 },  // GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+    { 0x1F9F, 0x1F97 },  // GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+    { 0x1FA8, 0x1FA0 },  // GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI
+    { 0x1FA9, 0x1FA1 },  // GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI
+    { 0x1FAA, 0x1FA2 },  // GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+    { 0x1FAB, 0x1FA3 },  // GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+    { 0x1FAC, 0x1FA4 },  // GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+    { 0x1FAD, 0x1FA5 },  // GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+    { 0x1FAE, 0x1FA6 },  // GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+    { 0x1FAF, 0x1FA7 },  // GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+    { 0x1FB8, 0x1FB0 },  // GREEK CAPITAL LETTER ALPHA WITH VRACHY
+    { 0x1FB9, 0x1FB1 },  // GREEK CAPITAL LETTER ALPHA WITH MACRON
+    { 0x1FBA, 0x1F70 },  // GREEK CAPITAL LETTER ALPHA WITH VARIA
+    { 0x1FBB, 0x1F71 },  // GREEK CAPITAL LETTER ALPHA WITH OXIA
+    { 0x1FBC, 0x1FB3 },  // GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI
+    { 0x1FC8, 0x1F72 },  // GREEK CAPITAL LETTER EPSILON WITH VARIA
+    { 0x1FC9, 0x1F73 },  // GREEK CAPITAL LETTER EPSILON WITH OXIA
+    { 0x1FCA, 0x1F74 },  // GREEK CAPITAL LETTER ETA WITH VARIA
+    { 0x1FCB, 0x1F75 },  // GREEK CAPITAL LETTER ETA WITH OXIA
+    { 0x1FCC, 0x1FC3 },  // GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI
+    { 0x1FD8, 0x1FD0 },  // GREEK CAPITAL LETTER IOTA WITH VRACHY
+    { 0x1FD9, 0x1FD1 },  // GREEK CAPITAL LETTER IOTA WITH MACRON
+    { 0x1FDA, 0x1F76 },  // GREEK CAPITAL LETTER IOTA WITH VARIA
+    { 0x1FDB, 0x1F77 },  // GREEK CAPITAL LETTER IOTA WITH OXIA
+    { 0x1FE8, 0x1FE0 },  // GREEK CAPITAL LETTER UPSILON WITH VRACHY
+    { 0x1FE9, 0x1FE1 },  // GREEK CAPITAL LETTER UPSILON WITH MACRON
+    { 0x1FEA, 0x1F7A },  // GREEK CAPITAL LETTER UPSILON WITH VARIA
+    { 0x1FEB, 0x1F7B },  // GREEK CAPITAL LETTER UPSILON WITH OXIA
+    { 0x1FEC, 0x1FE5 },  // GREEK CAPITAL LETTER RHO WITH DASIA
+    { 0x1FF8, 0x1F78 },  // GREEK CAPITAL LETTER OMICRON WITH VARIA
+    { 0x1FF9, 0x1F79 },  // GREEK CAPITAL LETTER OMICRON WITH OXIA
+    { 0x1FFA, 0x1F7C },  // GREEK CAPITAL LETTER OMEGA WITH VARIA
+    { 0x1FFB, 0x1F7D },  // GREEK CAPITAL LETTER OMEGA WITH OXIA
+    { 0x1FFC, 0x1FF3 },  // GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI
+    { 0x2126, 0x03C9 },  // OHM SIGN
+    { 0x212A, 0x006B },  // KELVIN SIGN
+    { 0x212B, 0x00E5 },  // ANGSTROM SIGN
+    { 0x2132, 0x214E },  // TURNED CAPITAL F
+    { 0x2160, 0x2170 },  // ROMAN NUMERAL ONE
+    { 0x2161, 0x2171 },  // ROMAN NUMERAL TWO
+    { 0x2162, 0x2172 },  // ROMAN NUMERAL THREE
+    { 0x2163, 0x2173 },  // ROMAN NUMERAL FOUR
+    { 0x2164, 0x2174 },  // ROMAN NUMERAL FIVE
+    { 0x2165, 0x2175 },  // ROMAN NUMERAL SIX
+    { 0x2166, 0x2176 },  // ROMAN NUMERAL SEVEN
+    { 0x2167, 0x2177 },  // ROMAN NUMERAL EIGHT
+    { 0x2168, 0x2178 },  // ROMAN NUMERAL NINE
+    { 0x2169, 0x2179 },  // ROMAN NUMERAL TEN
+    { 0x216A, 0x217A },  // ROMAN NUMERAL ELEVEN
+    { 0x216B, 0x217B },  // ROMAN NUMERAL TWELVE
+    { 0x216C, 0x217C },  // ROMAN NUMERAL FIFTY
+    { 0x216D, 0x217D },  // ROMAN NUMERAL ONE HUNDRED
+    { 0x216E, 0x217E },  // ROMAN NUMERAL FIVE HUNDRED
+    { 0x216F, 0x217F },  // ROMAN NUMERAL ONE THOUSAND
+    { 0x2183, 0x2184 },  // ROMAN NUMERAL REVERSED ONE HUNDRED
+    { 0x24B6, 0x24D0 },  // CIRCLED LATIN CAPITAL LETTER A
+    { 0x24B7, 0x24D1 },  // CIRCLED LATIN CAPITAL LETTER B
+    { 0x24B8, 0x24D2 },  // CIRCLED LATIN CAPITAL LETTER C
+    { 0x24B9, 0x24D3 },  // CIRCLED LATIN CAPITAL LETTER D
+    { 0x24BA, 0x24D4 },  // CIRCLED LATIN CAPITAL LETTER E
+    { 0x24BB, 0x24D5 },  // CIRCLED LATIN CAPITAL LETTER F
+    { 0x24BC, 0x24D6 },  // CIRCLED LATIN CAPITAL LETTER G
+    { 0x24BD, 0x24D7 },  // CIRCLED LATIN CAPITAL LETTER H
+    { 0x24BE, 0x24D8 },  // CIRCLED LATIN CAPITAL LETTER I
+    { 0x24BF, 0x24D9 },  // CIRCLED LATIN CAPITAL LETTER J
+    { 0x24C0, 0x24DA },  // CIRCLED LATIN CAPITAL LETTER K
+    { 0x24C1, 0x24DB },  // CIRCLED LATIN CAPITAL LETTER L
+    { 0x24C2, 0x24DC },  // CIRCLED LATIN CAPITAL LETTER M
+    { 0x24C3, 0x24DD },  // CIRCLED LATIN CAPITAL LETTER N
+    { 0x24C4, 0x24DE },  // CIRCLED LATIN CAPITAL LETTER O
+    { 0x24C5, 0x24DF },  // CIRCLED LATIN CAPITAL LETTER P
+    { 0x24C6, 0x24E0 },  // CIRCLED LATIN CAPITAL LETTER Q
+    { 0x24C7, 0x24E1 },  // CIRCLED LATIN CAPITAL LETTER R
+    { 0x24C8, 0x24E2 },  // CIRCLED LATIN CAPITAL LETTER S
+    { 0x24C9, 0x24E3 },  // CIRCLED LATIN CAPITAL LETTER T
+    { 0x24CA, 0x24E4 },  // CIRCLED LATIN CAPITAL LETTER U
+    { 0x24CB, 0x24E5 },  // CIRCLED LATIN CAPITAL LETTER V
+    { 0x24CC, 0x24E6 },  // CIRCLED LATIN CAPITAL LETTER W
+    { 0x24CD, 0x24E7 },  // CIRCLED LATIN CAPITAL LETTER X
+    { 0x24CE, 0x24E8 },  // CIRCLED LATIN CAPITAL LETTER Y
+    { 0x24CF, 0x24E9 },  // CIRCLED LATIN CAPITAL LETTER Z
+    { 0x2C00, 0x2C30 },  // GLAGOLITIC CAPITAL LETTER AZU
+    { 0x2C01, 0x2C31 },  // GLAGOLITIC CAPITAL LETTER BUKY
+    { 0x2C02, 0x2C32 },  // GLAGOLITIC CAPITAL LETTER VEDE
+    { 0x2C03, 0x2C33 },  // GLAGOLITIC CAPITAL LETTER GLAGOLI
+    { 0x2C04, 0x2C34 },  // GLAGOLITIC CAPITAL LETTER DOBRO
+    { 0x2C05, 0x2C35 },  // GLAGOLITIC CAPITAL LETTER YESTU
+    { 0x2C06, 0x2C36 },  // GLAGOLITIC CAPITAL LETTER ZHIVETE
+    { 0x2C07, 0x2C37 },  // GLAGOLITIC CAPITAL LETTER DZELO
+    { 0x2C08, 0x2C38 },  // GLAGOLITIC CAPITAL LETTER ZEMLJA
+    { 0x2C09, 0x2C39 },  // GLAGOLITIC CAPITAL LETTER IZHE
+    { 0x2C0A, 0x2C3A },  // GLAGOLITIC CAPITAL LETTER INITIAL IZHE
+    { 0x2C0B, 0x2C3B },  // GLAGOLITIC CAPITAL LETTER I
+    { 0x2C0C, 0x2C3C },  // GLAGOLITIC CAPITAL LETTER DJERVI
+    { 0x2C0D, 0x2C3D },  // GLAGOLITIC CAPITAL LETTER KAKO
+    { 0x2C0E, 0x2C3E },  // GLAGOLITIC CAPITAL LETTER LJUDIJE
+    { 0x2C0F, 0x2C3F },  // GLAGOLITIC CAPITAL LETTER MYSLITE
+    { 0x2C10, 0x2C40 },  // GLAGOLITIC CAPITAL LETTER NASHI
+    { 0x2C11, 0x2C41 },  // GLAGOLITIC CAPITAL LETTER ONU
+    { 0x2C12, 0x2C42 },  // GLAGOLITIC CAPITAL LETTER POKOJI
+    { 0x2C13, 0x2C43 },  // GLAGOLITIC CAPITAL LETTER RITSI
+    { 0x2C14, 0x2C44 },  // GLAGOLITIC CAPITAL LETTER SLOVO
+    { 0x2C15, 0x2C45 },  // GLAGOLITIC CAPITAL LETTER TVRIDO
+    { 0x2C16, 0x2C46 },  // GLAGOLITIC CAPITAL LETTER UKU
+    { 0x2C17, 0x2C47 },  // GLAGOLITIC CAPITAL LETTER FRITU
+    { 0x2C18, 0x2C48 },  // GLAGOLITIC CAPITAL LETTER HERU
+    { 0x2C19, 0x2C49 },  // GLAGOLITIC CAPITAL LETTER OTU
+    { 0x2C1A, 0x2C4A },  // GLAGOLITIC CAPITAL LETTER PE
+    { 0x2C1B, 0x2C4B },  // GLAGOLITIC CAPITAL LETTER SHTA
+    { 0x2C1C, 0x2C4C },  // GLAGOLITIC CAPITAL LETTER TSI
+    { 0x2C1D, 0x2C4D },  // GLAGOLITIC CAPITAL LETTER CHRIVI
+    { 0x2C1E, 0x2C4E },  // GLAGOLITIC CAPITAL LETTER SHA
+    { 0x2C1F, 0x2C4F },  // GLAGOLITIC CAPITAL LETTER YERU
+    { 0x2C20, 0x2C50 },  // GLAGOLITIC CAPITAL LETTER YERI
+    { 0x2C21, 0x2C51 },  // GLAGOLITIC CAPITAL LETTER YATI
+    { 0x2C22, 0x2C52 },  // GLAGOLITIC CAPITAL LETTER SPIDERY HA
+    { 0x2C23, 0x2C53 },  // GLAGOLITIC CAPITAL LETTER YU
+    { 0x2C24, 0x2C54 },  // GLAGOLITIC CAPITAL LETTER SMALL YUS
+    { 0x2C25, 0x2C55 },  // GLAGOLITIC CAPITAL LETTER SMALL YUS WITH TAIL
+    { 0x2C26, 0x2C56 },  // GLAGOLITIC CAPITAL LETTER YO
+    { 0x2C27, 0x2C57 },  // GLAGOLITIC CAPITAL LETTER IOTATED SMALL YUS
+    { 0x2C28, 0x2C58 },  // GLAGOLITIC CAPITAL LETTER BIG YUS
+    { 0x2C29, 0x2C59 },  // GLAGOLITIC CAPITAL LETTER IOTATED BIG YUS
+    { 0x2C2A, 0x2C5A },  // GLAGOLITIC CAPITAL LETTER FITA
+    { 0x2C2B, 0x2C5B },  // GLAGOLITIC CAPITAL LETTER IZHITSA
+    { 0x2C2C, 0x2C5C },  // GLAGOLITIC CAPITAL LETTER SHTAPIC
+    { 0x2C2D, 0x2C5D },  // GLAGOLITIC CAPITAL LETTER TROKUTASTI A
+    { 0x2C2E, 0x2C5E },  // GLAGOLITIC CAPITAL LETTER LATINATE MYSLITE
+    { 0x2C60, 0x2C61 },  // LATIN CAPITAL LETTER L WITH DOUBLE BAR
+    { 0x2C62, 0x026B },  // LATIN CAPITAL LETTER L WITH MIDDLE TILDE
+    { 0x2C63, 0x1D7D },  // LATIN CAPITAL LETTER P WITH STROKE
+    { 0x2C64, 0x027D },  // LATIN CAPITAL LETTER R WITH TAIL
+    { 0x2C67, 0x2C68 },  // LATIN CAPITAL LETTER H WITH DESCENDER
+    { 0x2C69, 0x2C6A },  // LATIN CAPITAL LETTER K WITH DESCENDER
+    { 0x2C6B, 0x2C6C },  // LATIN CAPITAL LETTER Z WITH DESCENDER
+    { 0x2C6D, 0x0251 },  // LATIN CAPITAL LETTER ALPHA
+    { 0x2C6E, 0x0271 },  // LATIN CAPITAL LETTER M WITH HOOK
+    { 0x2C6F, 0x0250 },  // LATIN CAPITAL LETTER TURNED A
+    { 0x2C70, 0x0252 },  // LATIN CAPITAL LETTER TURNED ALPHA
+    { 0x2C72, 0x2C73 },  // LATIN CAPITAL LETTER W WITH HOOK
+    { 0x2C75, 0x2C76 },  // LATIN CAPITAL LETTER HALF H
+    { 0x2C7E, 0x023F },  // LATIN CAPITAL LETTER S WITH SWASH TAIL
+    { 0x2C7F, 0x0240 },  // LATIN CAPITAL LETTER Z WITH SWASH TAIL
+    { 0x2C80, 0x2C81 },  // COPTIC CAPITAL LETTER ALFA
+    { 0x2C82, 0x2C83 },  // COPTIC CAPITAL LETTER VIDA
+    { 0x2C84, 0x2C85 },  // COPTIC CAPITAL LETTER GAMMA
+    { 0x2C86, 0x2C87 },  // COPTIC CAPITAL LETTER DALDA
+    { 0x2C88, 0x2C89 },  // COPTIC CAPITAL LETTER EIE
+    { 0x2C8A, 0x2C8B },  // COPTIC CAPITAL LETTER SOU
+    { 0x2C8C, 0x2C8D },  // COPTIC CAPITAL LETTER ZATA
+    { 0x2C8E, 0x2C8F },  // COPTIC CAPITAL LETTER HATE
+    { 0x2C90, 0x2C91 },  // COPTIC CAPITAL LETTER THETHE
+    { 0x2C92, 0x2C93 },  // COPTIC CAPITAL LETTER IAUDA
+    { 0x2C94, 0x2C95 },  // COPTIC CAPITAL LETTER KAPA
+    { 0x2C96, 0x2C97 },  // COPTIC CAPITAL LETTER LAULA
+    { 0x2C98, 0x2C99 },  // COPTIC CAPITAL LETTER MI
+    { 0x2C9A, 0x2C9B },  // COPTIC CAPITAL LETTER NI
+    { 0x2C9C, 0x2C9D },  // COPTIC CAPITAL LETTER KSI
+    { 0x2C9E, 0x2C9F },  // COPTIC CAPITAL LETTER O
+    { 0x2CA0, 0x2CA1 },  // COPTIC CAPITAL LETTER PI
+    { 0x2CA2, 0x2CA3 },  // COPTIC CAPITAL LETTER RO
+    { 0x2CA4, 0x2CA5 },  // COPTIC CAPITAL LETTER SIMA
+    { 0x2CA6, 0x2CA7 },  // COPTIC CAPITAL LETTER TAU
+    { 0x2CA8, 0x2CA9 },  // COPTIC CAPITAL LETTER UA
+    { 0x2CAA, 0x2CAB },  // COPTIC CAPITAL LETTER FI
+    { 0x2CAC, 0x2CAD },  // COPTIC CAPITAL LETTER KHI
+    { 0x2CAE, 0x2CAF },  // COPTIC CAPITAL LETTER PSI
+    { 0x2CB0, 0x2CB1 },  // COPTIC CAPITAL LETTER OOU
+    { 0x2CB2, 0x2CB3 },  // COPTIC CAPITAL LETTER DIALECT-P ALEF
+    { 0x2CB4, 0x2CB5 },  // COPTIC CAPITAL LETTER OLD COPTIC AIN
+    { 0x2CB6, 0x2CB7 },  // COPTIC CAPITAL LETTER CRYPTOGRAMMIC EIE
+    { 0x2CB8, 0x2CB9 },  // COPTIC CAPITAL LETTER DIALECT-P KAPA
+    { 0x2CBA, 0x2CBB },  // COPTIC CAPITAL LETTER DIALECT-P NI
+    { 0x2CBC, 0x2CBD },  // COPTIC CAPITAL LETTER CRYPTOGRAMMIC NI
+    { 0x2CBE, 0x2CBF },  // COPTIC CAPITAL LETTER OLD COPTIC OOU
+    { 0x2CC0, 0x2CC1 },  // COPTIC CAPITAL LETTER SAMPI
+    { 0x2CC2, 0x2CC3 },  // COPTIC CAPITAL LETTER CROSSED SHEI
+    { 0x2CC4, 0x2CC5 },  // COPTIC CAPITAL LETTER OLD COPTIC SHEI
+    { 0x2CC6, 0x2CC7 },  // COPTIC CAPITAL LETTER OLD COPTIC ESH
+    { 0x2CC8, 0x2CC9 },  // COPTIC CAPITAL LETTER AKHMIMIC KHEI
+    { 0x2CCA, 0x2CCB },  // COPTIC CAPITAL LETTER DIALECT-P HORI
+    { 0x2CCC, 0x2CCD },  // COPTIC CAPITAL LETTER OLD COPTIC HORI
+    { 0x2CCE, 0x2CCF },  // COPTIC CAPITAL LETTER OLD COPTIC HA
+    { 0x2CD0, 0x2CD1 },  // COPTIC CAPITAL LETTER L-SHAPED HA
+    { 0x2CD2, 0x2CD3 },  // COPTIC CAPITAL LETTER OLD COPTIC HEI
+    { 0x2CD4, 0x2CD5 },  // COPTIC CAPITAL LETTER OLD COPTIC HAT
+    { 0x2CD6, 0x2CD7 },  // COPTIC CAPITAL LETTER OLD COPTIC GANGIA
+    { 0x2CD8, 0x2CD9 },  // COPTIC CAPITAL LETTER OLD COPTIC DJA
+    { 0x2CDA, 0x2CDB },  // COPTIC CAPITAL LETTER OLD COPTIC SHIMA
+    { 0x2CDC, 0x2CDD },  // COPTIC CAPITAL LETTER OLD NUBIAN SHIMA
+    { 0x2CDE, 0x2CDF },  // COPTIC CAPITAL LETTER OLD NUBIAN NGI
+    { 0x2CE0, 0x2CE1 },  // COPTIC CAPITAL LETTER OLD NUBIAN NYI
+    { 0x2CE2, 0x2CE3 },  // COPTIC CAPITAL LETTER OLD NUBIAN WAU
+    { 0x2CEB, 0x2CEC },  // COPTIC CAPITAL LETTER CRYPTOGRAMMIC SHEI
+    { 0x2CED, 0x2CEE },  // COPTIC CAPITAL LETTER CRYPTOGRAMMIC GANGIA
+    { 0xA640, 0xA641 },  // CYRILLIC CAPITAL LETTER ZEMLYA
+    { 0xA642, 0xA643 },  // CYRILLIC CAPITAL LETTER DZELO
+    { 0xA644, 0xA645 },  // CYRILLIC CAPITAL LETTER REVERSED DZE
+    { 0xA646, 0xA647 },  // CYRILLIC CAPITAL LETTER IOTA
+    { 0xA648, 0xA649 },  // CYRILLIC CAPITAL LETTER DJERV
+    { 0xA64A, 0xA64B },  // CYRILLIC CAPITAL LETTER MONOGRAPH UK
+    { 0xA64C, 0xA64D },  // CYRILLIC CAPITAL LETTER BROAD OMEGA
+    { 0xA64E, 0xA64F },  // CYRILLIC CAPITAL LETTER NEUTRAL YER
+    { 0xA650, 0xA651 },  // CYRILLIC CAPITAL LETTER YERU WITH BACK YER
+    { 0xA652, 0xA653 },  // CYRILLIC CAPITAL LETTER IOTIFIED YAT
+    { 0xA654, 0xA655 },  // CYRILLIC CAPITAL LETTER REVERSED YU
+    { 0xA656, 0xA657 },  // CYRILLIC CAPITAL LETTER IOTIFIED A
+    { 0xA658, 0xA659 },  // CYRILLIC CAPITAL LETTER CLOSED LITTLE YUS
+    { 0xA65A, 0xA65B },  // CYRILLIC CAPITAL LETTER BLENDED YUS
+    { 0xA65C, 0xA65D },  // CYRILLIC CAPITAL LETTER IOTIFIED CLOSED LITTLE YUS
+    { 0xA65E, 0xA65F },  // CYRILLIC CAPITAL LETTER YN
+    { 0xA662, 0xA663 },  // CYRILLIC CAPITAL LETTER SOFT DE
+    { 0xA664, 0xA665 },  // CYRILLIC CAPITAL LETTER SOFT EL
+    { 0xA666, 0xA667 },  // CYRILLIC CAPITAL LETTER SOFT EM
+    { 0xA668, 0xA669 },  // CYRILLIC CAPITAL LETTER MONOCULAR O
+    { 0xA66A, 0xA66B },  // CYRILLIC CAPITAL LETTER BINOCULAR O
+    { 0xA66C, 0xA66D },  // CYRILLIC CAPITAL LETTER DOUBLE MONOCULAR O
+    { 0xA680, 0xA681 },  // CYRILLIC CAPITAL LETTER DWE
+    { 0xA682, 0xA683 },  // CYRILLIC CAPITAL LETTER DZWE
+    { 0xA684, 0xA685 },  // CYRILLIC CAPITAL LETTER ZHWE
+    { 0xA686, 0xA687 },  // CYRILLIC CAPITAL LETTER CCHE
+    { 0xA688, 0xA689 },  // CYRILLIC CAPITAL LETTER DZZE
+    { 0xA68A, 0xA68B },  // CYRILLIC CAPITAL LETTER TE WITH MIDDLE HOOK
+    { 0xA68C, 0xA68D },  // CYRILLIC CAPITAL LETTER TWE
+    { 0xA68E, 0xA68F },  // CYRILLIC CAPITAL LETTER TSWE
+    { 0xA690, 0xA691 },  // CYRILLIC CAPITAL LETTER TSSE
+    { 0xA692, 0xA693 },  // CYRILLIC CAPITAL LETTER TCHE
+    { 0xA694, 0xA695 },  // CYRILLIC CAPITAL LETTER HWE
+    { 0xA696, 0xA697 },  // CYRILLIC CAPITAL LETTER SHWE
+    { 0xA722, 0xA723 },  // LATIN CAPITAL LETTER EGYPTOLOGICAL ALEF
+    { 0xA724, 0xA725 },  // LATIN CAPITAL LETTER EGYPTOLOGICAL AIN
+    { 0xA726, 0xA727 },  // LATIN CAPITAL LETTER HENG
+    { 0xA728, 0xA729 },  // LATIN CAPITAL LETTER TZ
+    { 0xA72A, 0xA72B },  // LATIN CAPITAL LETTER TRESILLO
+    { 0xA72C, 0xA72D },  // LATIN CAPITAL LETTER CUATRILLO
+    { 0xA72E, 0xA72F },  // LATIN CAPITAL LETTER CUATRILLO WITH COMMA
+    { 0xA732, 0xA733 },  // LATIN CAPITAL LETTER AA
+    { 0xA734, 0xA735 },  // LATIN CAPITAL LETTER AO
+    { 0xA736, 0xA737 },  // LATIN CAPITAL LETTER AU
+    { 0xA738, 0xA739 },  // LATIN CAPITAL LETTER AV
+    { 0xA73A, 0xA73B },  // LATIN CAPITAL LETTER AV WITH HORIZONTAL BAR
+    { 0xA73C, 0xA73D },  // LATIN CAPITAL LETTER AY
+    { 0xA73E, 0xA73F },  // LATIN CAPITAL LETTER REVERSED C WITH DOT
+    { 0xA740, 0xA741 },  // LATIN CAPITAL LETTER K WITH STROKE
+    { 0xA742, 0xA743 },  // LATIN CAPITAL LETTER K WITH DIAGONAL STROKE
+    { 0xA744, 0xA745 },  // LATIN CAPITAL LETTER K WITH STROKE AND DIAGONAL STROKE
+    { 0xA746, 0xA747 },  // LATIN CAPITAL LETTER BROKEN L
+    { 0xA748, 0xA749 },  // LATIN CAPITAL LETTER L WITH HIGH STROKE
+    { 0xA74A, 0xA74B },  // LATIN CAPITAL LETTER O WITH LONG STROKE OVERLAY
+    { 0xA74C, 0xA74D },  // LATIN CAPITAL LETTER O WITH LOOP
+    { 0xA74E, 0xA74F },  // LATIN CAPITAL LETTER OO
+    { 0xA750, 0xA751 },  // LATIN CAPITAL LETTER P WITH STROKE THROUGH DESCENDER
+    { 0xA752, 0xA753 },  // LATIN CAPITAL LETTER P WITH FLOURISH
+    { 0xA754, 0xA755 },  // LATIN CAPITAL LETTER P WITH SQUIRREL TAIL
+    { 0xA756, 0xA757 },  // LATIN CAPITAL LETTER Q WITH STROKE THROUGH DESCENDER
+    { 0xA758, 0xA759 },  // LATIN CAPITAL LETTER Q WITH DIAGONAL STROKE
+    { 0xA75A, 0xA75B },  // LATIN CAPITAL LETTER R ROTUNDA
+    { 0xA75C, 0xA75D },  // LATIN CAPITAL LETTER RUM ROTUNDA
+    { 0xA75E, 0xA75F },  // LATIN CAPITAL LETTER V WITH DIAGONAL STROKE
+    { 0xA760, 0xA761 },  // LATIN CAPITAL LETTER VY
+    { 0xA762, 0xA763 },  // LATIN CAPITAL LETTER VISIGOTHIC Z
+    { 0xA764, 0xA765 },  // LATIN CAPITAL LETTER THORN WITH STROKE
+    { 0xA766, 0xA767 },  // LATIN CAPITAL LETTER THORN WITH STROKE THROUGH DESCENDER
+    { 0xA768, 0xA769 },  // LATIN CAPITAL LETTER VEND
+    { 0xA76A, 0xA76B },  // LATIN CAPITAL LETTER ET
+    { 0xA76C, 0xA76D },  // LATIN CAPITAL LETTER IS
+    { 0xA76E, 0xA76F },  // LATIN CAPITAL LETTER CON
+    { 0xA779, 0xA77A },  // LATIN CAPITAL LETTER INSULAR D
+    { 0xA77B, 0xA77C },  // LATIN CAPITAL LETTER INSULAR F
+    { 0xA77D, 0x1D79 },  // LATIN CAPITAL LETTER INSULAR G
+    { 0xA77E, 0xA77F },  // LATIN CAPITAL LETTER TURNED INSULAR G
+    { 0xA780, 0xA781 },  // LATIN CAPITAL LETTER TURNED L
+    { 0xA782, 0xA783 },  // LATIN CAPITAL LETTER INSULAR R
+    { 0xA784, 0xA785 },  // LATIN CAPITAL LETTER INSULAR S
+    { 0xA786, 0xA787 },  // LATIN CAPITAL LETTER INSULAR T
+    { 0xA78B, 0xA78C },  // LATIN CAPITAL LETTER SALTILLO
+    { 0xFF21, 0xFF41 },  // FULLWIDTH LATIN CAPITAL LETTER A
+    { 0xFF22, 0xFF42 },  // FULLWIDTH LATIN CAPITAL LETTER B
+    { 0xFF23, 0xFF43 },  // FULLWIDTH LATIN CAPITAL LETTER C
+    { 0xFF24, 0xFF44 },  // FULLWIDTH LATIN CAPITAL LETTER D
+    { 0xFF25, 0xFF45 },  // FULLWIDTH LATIN CAPITAL LETTER E
+    { 0xFF26, 0xFF46 },  // FULLWIDTH LATIN CAPITAL LETTER F
+    { 0xFF27, 0xFF47 },  // FULLWIDTH LATIN CAPITAL LETTER G
+    { 0xFF28, 0xFF48 },  // FULLWIDTH LATIN CAPITAL LETTER H
+    { 0xFF29, 0xFF49 },  // FULLWIDTH LATIN CAPITAL LETTER I
+    { 0xFF2A, 0xFF4A },  // FULLWIDTH LATIN CAPITAL LETTER J
+    { 0xFF2B, 0xFF4B },  // FULLWIDTH LATIN CAPITAL LETTER K
+    { 0xFF2C, 0xFF4C },  // FULLWIDTH LATIN CAPITAL LETTER L
+    { 0xFF2D, 0xFF4D },  // FULLWIDTH LATIN CAPITAL LETTER M
+    { 0xFF2E, 0xFF4E },  // FULLWIDTH LATIN CAPITAL LETTER N
+    { 0xFF2F, 0xFF4F },  // FULLWIDTH LATIN CAPITAL LETTER O
+    { 0xFF30, 0xFF50 },  // FULLWIDTH LATIN CAPITAL LETTER P
+    { 0xFF31, 0xFF51 },  // FULLWIDTH LATIN CAPITAL LETTER Q
+    { 0xFF32, 0xFF52 },  // FULLWIDTH LATIN CAPITAL LETTER R
+    { 0xFF33, 0xFF53 },  // FULLWIDTH LATIN CAPITAL LETTER S
+    { 0xFF34, 0xFF54 },  // FULLWIDTH LATIN CAPITAL LETTER T
+    { 0xFF35, 0xFF55 },  // FULLWIDTH LATIN CAPITAL LETTER U
+    { 0xFF36, 0xFF56 },  // FULLWIDTH LATIN CAPITAL LETTER V
+    { 0xFF37, 0xFF57 },  // FULLWIDTH LATIN CAPITAL LETTER W
+    { 0xFF38, 0xFF58 },  // FULLWIDTH LATIN CAPITAL LETTER X
+    { 0xFF39, 0xFF59 },  // FULLWIDTH LATIN CAPITAL LETTER Y
+    { 0xFF3A, 0xFF5A }   // FULLWIDTH LATIN CAPITAL LETTER Z
+};
+
+static int compare_pair_capital(const void *a, const void *b) {
+    return (int)(*(unsigned short *)a)
+            - (int)((struct LatinCapitalSmallPair*)b)->capital;
+}
+
+unsigned short latin_tolower(unsigned short c) {
+    struct LatinCapitalSmallPair *p =
+            (struct LatinCapitalSmallPair *)bsearch(&c, SORTED_CHAR_MAP,
+                    sizeof(SORTED_CHAR_MAP) / sizeof(SORTED_CHAR_MAP[0]),
+                    sizeof(SORTED_CHAR_MAP[0]),
+                    compare_pair_capital);
+    return p ? p->small : c;
+}
+
+} // namespace latinime
diff --git a/src/java/KP2ASoftkeyboard_AS/app/src/main/jni/source/dictionary.cpp b/src/java/KP2ASoftkeyboard_AS/app/src/main/jni/source/dictionary.cpp
new file mode 100644
index 00000000..9b8512e7
--- /dev/null
+++ b/src/java/KP2ASoftkeyboard_AS/app/src/main/jni/source/dictionary.cpp
@@ -0,0 +1,604 @@
+/*
+**
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+
+#include <stdio.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <string.h>
+//#define LOG_TAG "dictionary.cpp"
+//#include <cutils/log.h>
+#define LOGI
+
+#include "dictionary.h"
+#include "basechars.h"
+#include "char_utils.h"
+
+#define DEBUG_DICT 0
+#define DICTIONARY_VERSION_MIN 200
+#define DICTIONARY_HEADER_SIZE 2
+#define NOT_VALID_WORD -99
+
+namespace latinime {
+
+Dictionary::Dictionary(void *dict, int typedLetterMultiplier, int fullWordMultiplier, int size)
+{
+    mDict = (unsigned char*) dict;
+    mTypedLetterMultiplier = typedLetterMultiplier;
+    mFullWordMultiplier = fullWordMultiplier;
+    mDictSize = size;
+    getVersionNumber();
+}
+
+Dictionary::~Dictionary()
+{
+}
+
+int Dictionary::getSuggestions(int *codes, int codesSize, unsigned short *outWords, int *frequencies,
+        int maxWordLength, int maxWords, int maxAlternatives, int skipPos,
+        int *nextLetters, int nextLettersSize)
+{
+    int suggWords;
+    mFrequencies = frequencies;
+    mOutputChars = outWords;
+    mInputCodes = codes;
+    mInputLength = codesSize;
+    mMaxAlternatives = maxAlternatives;
+    mMaxWordLength = maxWordLength;
+    mMaxWords = maxWords;
+    mSkipPos = skipPos;
+    mMaxEditDistance = mInputLength < 5 ? 2 : mInputLength / 2;
+    mNextLettersFrequencies = nextLetters;
+    mNextLettersSize = nextLettersSize;
+
+    if (checkIfDictVersionIsLatest()) {
+        getWordsRec(DICTIONARY_HEADER_SIZE, 0, mInputLength * 3, false, 1, 0, 0);
+    } else {
+        getWordsRec(0, 0, mInputLength * 3, false, 1, 0, 0);
+    }
+
+    // Get the word count
+    suggWords = 0;
+    while (suggWords < mMaxWords && mFrequencies[suggWords] > 0) suggWords++;
+    if (DEBUG_DICT) LOGI("Returning %d words", suggWords);
+
+    if (DEBUG_DICT) {
+        LOGI("Next letters: ");
+        for (int k = 0; k < nextLettersSize; k++) {
+            if (mNextLettersFrequencies[k] > 0) {
+                LOGI("%c = %d,", k, mNextLettersFrequencies[k]);
+            }
+        }
+        LOGI("\n");
+    }
+    return suggWords;
+}
+
+void
+Dictionary::registerNextLetter(unsigned short c)
+{
+    if (c < mNextLettersSize) {
+        mNextLettersFrequencies[c]++;
+    }
+}
+
+void
+Dictionary::getVersionNumber()
+{
+    mVersion = (mDict[0] & 0xFF);
+    mBigram = (mDict[1] & 0xFF);
+    LOGI("IN NATIVE SUGGEST Version: %d Bigram : %d \n", mVersion, mBigram);
+}
+
+// Checks whether it has the latest dictionary or the old dictionary
+bool
+Dictionary::checkIfDictVersionIsLatest()
+{
+    return (mVersion >= DICTIONARY_VERSION_MIN) && (mBigram == 1 || mBigram == 0);
+}
+
+unsigned short
+Dictionary::getChar(int *pos)
+{
+    if (*pos < 0 || *pos >= mDictSize) return 0;
+    unsigned short ch = (unsigned short) (mDict[(*pos)++] & 0xFF);
+    // If the code is 255, then actual 16 bit code follows (in big endian)
+    if (ch == 0xFF) {
+        ch = ((mDict[*pos] & 0xFF) << 8) | (mDict[*pos + 1] & 0xFF);
+        (*pos) += 2;
+    }
+    return ch;
+}
+
+int
+Dictionary::getAddress(int *pos)
+{
+    if (*pos < 0 || *pos >= mDictSize) return 0;
+    int address = 0;
+    if ((mDict[*pos] & FLAG_ADDRESS_MASK) == 0) {
+        *pos += 1;
+    } else {
+        address += (mDict[*pos] & (ADDRESS_MASK >> 16)) << 16;
+        address += (mDict[*pos + 1] & 0xFF) << 8;
+        address += (mDict[*pos + 2] & 0xFF);
+        *pos += 3;
+    }
+    if (address < 0 || address >= mDictSize) return 0;
+    return address;
+}
+
+int
+Dictionary::getFreq(int *pos)
+{
+    if (*pos < 0 || *pos >= mDictSize) return 0;
+    int freq = mDict[(*pos)++] & 0xFF;
+
+    if (checkIfDictVersionIsLatest()) {
+        // skipping bigram
+        int bigramExist = (mDict[*pos] & FLAG_BIGRAM_READ);
+        if (bigramExist > 0) {
+            int nextBigramExist = 1;
+            while (nextBigramExist > 0) {
+                (*pos) += 3;
+                nextBigramExist = (mDict[(*pos)++] & FLAG_BIGRAM_CONTINUED);
+            }
+        } else {
+            (*pos)++;
+        }
+    }
+
+    return freq;
+}
+
+int
+Dictionary::wideStrLen(unsigned short *str)
+{
+    if (!str) return 0;
+    unsigned short *end = str;
+    while (*end)
+        end++;
+    return end - str;
+}
+
+bool
+Dictionary::addWord(unsigned short *word, int length, int frequency)
+{
+    word[length] = 0;
+    if (DEBUG_DICT) {
+        char s[length + 1];
+        for (int i = 0; i <= length; i++) s[i] = word[i];
+        LOGI("Found word = %s, freq = %d : \n", s, frequency);
+    }
+
+    // Find the right insertion point
+    int insertAt = 0;
+    while (insertAt < mMaxWords) {
+        if (frequency > mFrequencies[insertAt]
+                 || (mFrequencies[insertAt] == frequency
+                     && length < wideStrLen(mOutputChars + insertAt * mMaxWordLength))) {
+            break;
+        }
+        insertAt++;
+    }
+    if (insertAt < mMaxWords) {
+        memmove((char*) mFrequencies + (insertAt + 1) * sizeof(mFrequencies[0]),
+               (char*) mFrequencies + insertAt * sizeof(mFrequencies[0]),
+               (mMaxWords - insertAt - 1) * sizeof(mFrequencies[0]));
+        mFrequencies[insertAt] = frequency;
+        memmove((char*) mOutputChars + (insertAt + 1) * mMaxWordLength * sizeof(short),
+               (char*) mOutputChars + (insertAt    ) * mMaxWordLength * sizeof(short),
+               (mMaxWords - insertAt - 1) * sizeof(short) * mMaxWordLength);
+        unsigned short *dest = mOutputChars + (insertAt    ) * mMaxWordLength;
+        while (length--) {
+            *dest++ = *word++;
+        }
+        *dest = 0; // NULL terminate
+        if (DEBUG_DICT) LOGI("Added word at %d\n", insertAt);
+        return true;
+    }
+    return false;
+}
+
+bool
+Dictionary::addWordBigram(unsigned short *word, int length, int frequency)
+{
+    word[length] = 0;
+    if (DEBUG_DICT) {
+        char s[length + 1];
+        for (int i = 0; i <= length; i++) s[i] = word[i];
+        LOGI("Bigram: Found word = %s, freq = %d : \n", s, frequency);
+    }
+
+    // Find the right insertion point
+    int insertAt = 0;
+    while (insertAt < mMaxBigrams) {
+        if (frequency > mBigramFreq[insertAt]
+                 || (mBigramFreq[insertAt] == frequency
+                     && length < wideStrLen(mBigramChars + insertAt * mMaxWordLength))) {
+            break;
+        }
+        insertAt++;
+    }
+    LOGI("Bigram: InsertAt -> %d maxBigrams: %d\n", insertAt, mMaxBigrams);
+    if (insertAt < mMaxBigrams) {
+        memmove((char*) mBigramFreq + (insertAt + 1) * sizeof(mBigramFreq[0]),
+               (char*) mBigramFreq + insertAt * sizeof(mBigramFreq[0]),
+               (mMaxBigrams - insertAt - 1) * sizeof(mBigramFreq[0]));
+        mBigramFreq[insertAt] = frequency;
+        memmove((char*) mBigramChars + (insertAt + 1) * mMaxWordLength * sizeof(short),
+               (char*) mBigramChars + (insertAt    ) * mMaxWordLength * sizeof(short),
+               (mMaxBigrams - insertAt - 1) * sizeof(short) * mMaxWordLength);
+        unsigned short *dest = mBigramChars + (insertAt    ) * mMaxWordLength;
+        while (length--) {
+            *dest++ = *word++;
+        }
+        *dest = 0; // NULL terminate
+        if (DEBUG_DICT) LOGI("Bigram: Added word at %d\n", insertAt);
+        return true;
+    }
+    return false;
+}
+
+unsigned short
+Dictionary::toLowerCase(unsigned short c) {
+    if (c < sizeof(BASE_CHARS) / sizeof(BASE_CHARS[0])) {
+        c = BASE_CHARS[c];
+    }
+    if (c >='A' && c <= 'Z') {
+        c |= 32;
+    } else if (c > 127) {
+        c = latin_tolower(c);
+    }
+    return c;
+}
+
+bool
+Dictionary::sameAsTyped(unsigned short *word, int length)
+{
+    if (length != mInputLength) {
+        return false;
+    }
+    int *inputCodes = mInputCodes;
+    while (length--) {
+        if ((unsigned int) *inputCodes != (unsigned int) *word) {
+            return false;
+        }
+        inputCodes += mMaxAlternatives;
+        word++;
+    }
+    return true;
+}
+
+static char QUOTE = '\'';
+
+void
+Dictionary::getWordsRec(int pos, int depth, int maxDepth, bool completion, int snr, int inputIndex,
+                        int diffs)
+{
+    // Optimization: Prune out words that are too long compared to how much was typed.
+    if (depth > maxDepth) {
+        return;
+    }
+    if (diffs > mMaxEditDistance) {
+        return;
+    }
+    int count = getCount(&pos);
+    int *currentChars = NULL;
+    if (mInputLength <= inputIndex) {
+        completion = true;
+    } else {
+        currentChars = mInputCodes + (inputIndex * mMaxAlternatives);
+    }
+
+    for (int i = 0; i < count; i++) {
+        // -- at char
+        unsigned short c = getChar(&pos);
+        // -- at flag/add
+        unsigned short lowerC = toLowerCase(c);
+        bool terminal = getTerminal(&pos);
+        int childrenAddress = getAddress(&pos);
+        // -- after address or flag
+        int freq = 1;
+        if (terminal) freq = getFreq(&pos);
+        // -- after add or freq
+
+        // If we are only doing completions, no need to look at the typed characters.
+        if (completion) {
+            mWord[depth] = c;
+            if (terminal) {
+                addWord(mWord, depth + 1, freq * snr);
+                if (depth >= mInputLength && mSkipPos < 0) {
+                    registerNextLetter(mWord[mInputLength]);
+                }
+            }
+            if (childrenAddress != 0) {
+                getWordsRec(childrenAddress, depth + 1, maxDepth,
+                            completion, snr, inputIndex, diffs);
+            }
+        } else if ((c == QUOTE && currentChars[0] != QUOTE) || mSkipPos == depth) {
+            // Skip the ' or other letter and continue deeper
+            mWord[depth] = c;
+            if (childrenAddress != 0) {
+                getWordsRec(childrenAddress, depth + 1, maxDepth, false, snr, inputIndex, diffs);
+            }
+        } else {
+            int j = 0;
+            while (currentChars[j] > 0) {
+                if (currentChars[j] == lowerC || currentChars[j] == c) {
+                    int addedWeight = j == 0 ? mTypedLetterMultiplier : 1;
+                    mWord[depth] = c;
+                    if (mInputLength == inputIndex + 1) {
+                        if (terminal) {
+                            if (//INCLUDE_TYPED_WORD_IF_VALID ||
+                                !sameAsTyped(mWord, depth + 1)) {
+                                int finalFreq = freq * snr * addedWeight;
+                                if (mSkipPos < 0) finalFreq *= mFullWordMultiplier;
+                                addWord(mWord, depth + 1, finalFreq);
+                            }
+                        }
+                        if (childrenAddress != 0) {
+                            getWordsRec(childrenAddress, depth + 1,
+                                    maxDepth, true, snr * addedWeight, inputIndex + 1,
+                                    diffs + (j > 0));
+                        }
+                    } else if (childrenAddress != 0) {
+                        getWordsRec(childrenAddress, depth + 1, maxDepth,
+                                false, snr * addedWeight, inputIndex + 1, diffs + (j > 0));
+                    }
+                }
+                j++;
+                if (mSkipPos >= 0) break;
+            }
+        }
+    }
+}
+
+int
+Dictionary::getBigramAddress(int *pos, bool advance)
+{
+    if (*pos < 0 || *pos >= mDictSize) return 0;
+    int address = 0;
+
+    address += (mDict[*pos] & 0x3F) << 16;
+    address += (mDict[*pos + 1] & 0xFF) << 8;
+    address += (mDict[*pos + 2] & 0xFF);
+
+    if (advance) {
+        *pos += 3;
+    }
+
+    if (address < 0 || address >= mDictSize) return 0;
+    return address;
+}
+
+int
+Dictionary::getBigramFreq(int *pos)
+{
+    if (*pos < 0 || *pos >= mDictSize) return 0;
+    int freq = mDict[(*pos)++] & FLAG_BIGRAM_FREQ;
+
+    return freq;
+}
+
+
+int
+Dictionary::getBigrams(unsigned short *prevWord, int prevWordLength, int *codes, int codesSize,
+        unsigned short *bigramChars, int *bigramFreq, int maxWordLength, int maxBigrams,
+        int maxAlternatives)
+{
+    mBigramFreq = bigramFreq;
+    mBigramChars = bigramChars;
+    mInputCodes = codes;
+    mInputLength = codesSize;
+    mMaxWordLength = maxWordLength;
+    mMaxBigrams = maxBigrams;
+    mMaxAlternatives = maxAlternatives;
+
+    if (mBigram == 1 && checkIfDictVersionIsLatest()) {
+        int pos = isValidWordRec(DICTIONARY_HEADER_SIZE, prevWord, 0, prevWordLength);
+        LOGI("Pos -> %d\n", pos);
+        if (pos < 0) {
+            return 0;
+        }
+
+        int bigramCount = 0;
+        int bigramExist = (mDict[pos] & FLAG_BIGRAM_READ);
+        if (bigramExist > 0) {
+            int nextBigramExist = 1;
+            while (nextBigramExist > 0 && bigramCount < maxBigrams) {
+                int bigramAddress = getBigramAddress(&pos, true);
+                int frequency = (FLAG_BIGRAM_FREQ & mDict[pos]);
+                // search for all bigrams and store them
+                searchForTerminalNode(bigramAddress, frequency);
+                nextBigramExist = (mDict[pos++] & FLAG_BIGRAM_CONTINUED);
+                bigramCount++;
+            }
+        }
+
+        return bigramCount;
+    }
+    return 0;
+}
+
+void
+Dictionary::searchForTerminalNode(int addressLookingFor, int frequency)
+{
+    // track word with such address and store it in an array
+    unsigned short word[mMaxWordLength];
+
+    int pos;
+    int followDownBranchAddress = DICTIONARY_HEADER_SIZE;
+    bool found = false;
+    char followingChar = ' ';
+    int depth = -1;
+
+    while(!found) {
+        bool followDownAddressSearchStop = false;
+        bool firstAddress = true;
+        bool haveToSearchAll = true;
+
+        if (depth >= 0) {
+            word[depth] = (unsigned short) followingChar;
+        }
+        pos = followDownBranchAddress; // pos start at count
+        int count = mDict[pos] & 0xFF;
+        LOGI("count - %d\n",count);
+        pos++;
+        for (int i = 0; i < count; i++) {
+            // pos at data
+            pos++;
+            // pos now at flag
+            if (!getFirstBitOfByte(&pos)) { // non-terminal
+                if (!followDownAddressSearchStop) {
+                    int addr = getBigramAddress(&pos, false);
+                    if (addr > addressLookingFor) {
+                        followDownAddressSearchStop = true;
+                        if (firstAddress) {
+                            firstAddress = false;
+                            haveToSearchAll = true;
+                        } else if (!haveToSearchAll) {
+                            break;
+                        }
+                    } else {
+                        followDownBranchAddress = addr;
+                        followingChar = (char)(0xFF & mDict[pos-1]);
+                        if (firstAddress) {
+                            firstAddress = false;
+                            haveToSearchAll = false;
+                        }
+                    }
+                }
+                pos += 3;
+            } else if (getFirstBitOfByte(&pos)) { // terminal
+                if (addressLookingFor == (pos-1)) { // found !!
+                    depth++;
+                    word[depth] = (0xFF & mDict[pos-1]);
+                    found = true;
+                    break;
+                }
+                if (getSecondBitOfByte(&pos)) { // address + freq (4 byte)
+                    if (!followDownAddressSearchStop) {
+                        int addr = getBigramAddress(&pos, false);
+                        if (addr > addressLookingFor) {
+                            followDownAddressSearchStop = true;
+                            if (firstAddress) {
+                                firstAddress = false;
+                                haveToSearchAll = true;
+                            } else if (!haveToSearchAll) {
+                                break;
+                            }
+                        } else {
+                            followDownBranchAddress = addr;
+                            followingChar = (char)(0xFF & mDict[pos-1]);
+                            if (firstAddress) {
+                                firstAddress = false;
+                                haveToSearchAll = true;
+                            }
+                        }
+                    }
+                    pos += 4;
+                } else { // freq only (2 byte)
+                    pos += 2;
+                }
+
+                // skipping bigram
+                int bigramExist = (mDict[pos] & FLAG_BIGRAM_READ);
+                if (bigramExist > 0) {
+                    int nextBigramExist = 1;
+                    while (nextBigramExist > 0) {
+                        pos += 3;
+                        nextBigramExist = (mDict[pos++] & FLAG_BIGRAM_CONTINUED);
+                    }
+                } else {
+                    pos++;
+                }
+            }
+        }
+        depth++;
+        if (followDownBranchAddress == 0) {
+            LOGI("ERROR!!! Cannot find bigram!!");
+            break;
+        }
+    }
+    if (checkFirstCharacter(word)) {
+        addWordBigram(word, depth, frequency);
+    }
+}
+
+bool
+Dictionary::checkFirstCharacter(unsigned short *word)
+{
+    // Checks whether this word starts with same character or neighboring characters of
+    // what user typed.
+
+    int *inputCodes = mInputCodes;
+    int maxAlt = mMaxAlternatives;
+    while (maxAlt > 0) {
+        if ((unsigned int) *inputCodes == (unsigned int) *word) {
+            return true;
+        }
+        inputCodes++;
+        maxAlt--;
+    }
+    return false;
+}
+
+bool
+Dictionary::isValidWord(unsigned short *word, int length)
+{
+    if (checkIfDictVersionIsLatest()) {
+        return (isValidWordRec(DICTIONARY_HEADER_SIZE, word, 0, length) != NOT_VALID_WORD);
+    } else {
+        return (isValidWordRec(0, word, 0, length) != NOT_VALID_WORD);
+    }
+}
+
+int
+Dictionary::isValidWordRec(int pos, unsigned short *word, int offset, int length) {
+    // returns address of bigram data of that word
+    // return -99 if not found
+
+    int count = getCount(&pos);
+    unsigned short currentChar = (unsigned short) word[offset];
+    for (int j = 0; j < count; j++) {
+        unsigned short c = getChar(&pos);
+        int terminal = getTerminal(&pos);
+        int childPos = getAddress(&pos);
+        if (c == currentChar) {
+            if (offset == length - 1) {
+                if (terminal) {
+                    return (pos+1);
+                }
+            } else {
+                if (childPos != 0) {
+                    int t = isValidWordRec(childPos, word, offset + 1, length);
+                    if (t > 0) {
+                        return t;
+                    }
+                }
+            }
+        }
+        if (terminal) {
+            getFreq(&pos);
+        }
+        // There could be two instances of each alphabet - upper and lower case. So continue
+        // looking ...
+    }
+    return NOT_VALID_WORD;
+}
+
+
+} // namespace latinime
diff --git a/src/java/KP2ASoftkeyboard_AS/app/src/main/jni/source/keepass2android_softkeyboard_BinaryDictionary.cpp b/src/java/KP2ASoftkeyboard_AS/app/src/main/jni/source/keepass2android_softkeyboard_BinaryDictionary.cpp
new file mode 100644
index 00000000..0c391b72
--- /dev/null
+++ b/src/java/KP2ASoftkeyboard_AS/app/src/main/jni/source/keepass2android_softkeyboard_BinaryDictionary.cpp
@@ -0,0 +1,148 @@
+/*
+**
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+
+#include <stdio.h>
+#include <assert.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+#include <jni.h>
+#include "dictionary.h"
+
+// ----------------------------------------------------------------------------
+
+using namespace latinime;
+
+//
+// helper function to throw an exception
+//
+static void throwException(JNIEnv *env, const char* ex, const char* fmt, int data)
+{
+    if (jclass cls = env->FindClass(ex)) {
+        char msg[1000];
+        sprintf(msg, fmt, data);
+        env->ThrowNew(cls, msg);
+        env->DeleteLocalRef(cls);
+    }
+}
+
+extern "C"
+JNIEXPORT jlong JNICALL Java_keepass2android_softkeyboard_BinaryDictionary_openNative
+        (JNIEnv *env, jobject object, jobject dictDirectBuffer,
+         jint typedLetterMultiplier, jint fullWordMultiplier, jint size)
+{
+    void *dict = env->GetDirectBufferAddress(dictDirectBuffer);
+    if (dict == NULL) {
+        fprintf(stderr, "DICT: Dictionary buffer is null\n");
+        return 0;
+    }
+    Dictionary *dictionary = new Dictionary(dict, typedLetterMultiplier, fullWordMultiplier, size);
+    return (jlong) dictionary;
+}
+
+extern "C"
+JNIEXPORT int JNICALL Java_keepass2android_softkeyboard_BinaryDictionary_getSuggestionsNative(
+        JNIEnv *env, jobject object, jlong dict, jintArray inputArray, jint arraySize,
+        jcharArray outputArray, jintArray frequencyArray, jint maxWordLength, jint maxWords,
+        jint maxAlternatives, jint skipPos, jintArray nextLettersArray, jint nextLettersSize)
+{
+    Dictionary *dictionary = (Dictionary*) dict;
+    if (dictionary == NULL) return 0;
+
+    int *frequencies = env->GetIntArrayElements(frequencyArray, NULL);
+    int *inputCodes = env->GetIntArrayElements(inputArray, NULL);
+    jchar *outputChars = env->GetCharArrayElements(outputArray, NULL);
+    int *nextLetters = nextLettersArray != NULL ? env->GetIntArrayElements(nextLettersArray, NULL)
+            : NULL;
+
+    int count = dictionary->getSuggestions(inputCodes, arraySize, (unsigned short*) outputChars,
+            frequencies, maxWordLength, maxWords, maxAlternatives, skipPos, nextLetters,
+            nextLettersSize);
+
+    env->ReleaseIntArrayElements(frequencyArray, frequencies, 0);
+    env->ReleaseIntArrayElements(inputArray, inputCodes, JNI_ABORT);
+    env->ReleaseCharArrayElements(outputArray, outputChars, 0);
+    if (nextLetters) {
+        env->ReleaseIntArrayElements(nextLettersArray, nextLetters, 0);
+    }
+
+    return count;
+}
+
+extern "C"
+JNIEXPORT int JNICALL Java_keepass2android_softkeyboard_BinaryDictionary_getBigramsNative
+        (JNIEnv *env, jobject object, jlong dict, jcharArray prevWordArray, jint prevWordLength,
+         jintArray inputArray, jint inputArraySize, jcharArray outputArray,
+         jintArray frequencyArray, jint maxWordLength, jint maxBigrams, jint maxAlternatives)
+{
+    Dictionary *dictionary = (Dictionary*) dict;
+    if (dictionary == NULL) return 0;
+
+    jchar *prevWord = env->GetCharArrayElements(prevWordArray, NULL);
+    int *inputCodes = env->GetIntArrayElements(inputArray, NULL);
+    jchar *outputChars = env->GetCharArrayElements(outputArray, NULL);
+    int *frequencies = env->GetIntArrayElements(frequencyArray, NULL);
+
+    int count = dictionary->getBigrams((unsigned short*) prevWord, prevWordLength, inputCodes,
+            inputArraySize, (unsigned short*) outputChars, frequencies, maxWordLength, maxBigrams,
+            maxAlternatives);
+
+    env->ReleaseCharArrayElements(prevWordArray, prevWord, JNI_ABORT);
+    env->ReleaseIntArrayElements(inputArray, inputCodes, JNI_ABORT);
+    env->ReleaseCharArrayElements(outputArray, outputChars, 0);
+    env->ReleaseIntArrayElements(frequencyArray, frequencies, 0);
+
+    return count;
+}
+
+
+extern "C"
+JNIEXPORT jboolean JNICALL Java_keepass2android_softkeyboard_isValidWordNative
+        (JNIEnv *env, jobject object, jlong dict, jcharArray wordArray, jint wordLength)
+{
+    Dictionary *dictionary = (Dictionary*) dict;
+    if (dictionary == NULL) return (jboolean) false;
+
+    jchar *word = env->GetCharArrayElements(wordArray, NULL);
+    jboolean result = dictionary->isValidWord((unsigned short*) word, wordLength);
+    env->ReleaseCharArrayElements(wordArray, word, JNI_ABORT);
+
+    return result;
+}
+
+extern "C"
+JNIEXPORT void JNICALL Java_keepass2android_softkeyboard_BinaryDictionary_closeNative
+        (JNIEnv *env, jobject object, jlong dict)
+{
+    Dictionary *dictionary = (Dictionary*) dict;
+    delete (Dictionary*) dict;
+}
+extern "C"
+JNIEXPORT jboolean JNICALL
+Java_keepass2android_softkeyboard_BinaryDictionary_isValidWordNative(JNIEnv *env, jobject thiz,
+                                                                     jlong dict,
+                                                                     jcharArray wordArray,
+                                                                     jint wordLength) {
+    Dictionary *dictionary = (Dictionary*) dict;
+    if (dictionary == NULL) return (jboolean) false;
+
+    jchar *word = env->GetCharArrayElements(wordArray, NULL);
+    jboolean result = dictionary->isValidWord((unsigned short*) word, wordLength);
+    env->ReleaseCharArrayElements(wordArray, word, JNI_ABORT);
+
+    return result;
+}
diff --git a/src/java/KP2ASoftkeyboard_AS/app/src/main/jniLibs/armeabi-v7a/libjni_latinime.so b/src/java/KP2ASoftkeyboard_AS/app/src/main/jniLibs/armeabi-v7a/libjni_latinime.so
deleted file mode 100644
index fce10f89..00000000
Binary files a/src/java/KP2ASoftkeyboard_AS/app/src/main/jniLibs/armeabi-v7a/libjni_latinime.so and /dev/null differ
diff --git a/src/java/KP2ASoftkeyboard_AS/app/src/main/jniLibs/armeabi/libjni_latinime.so b/src/java/KP2ASoftkeyboard_AS/app/src/main/jniLibs/armeabi/libjni_latinime.so
deleted file mode 100644
index 3f97a516..00000000
Binary files a/src/java/KP2ASoftkeyboard_AS/app/src/main/jniLibs/armeabi/libjni_latinime.so and /dev/null differ
diff --git a/src/java/KP2ASoftkeyboard_AS/app/src/main/jniLibs/x86/libjni_latinime.so b/src/java/KP2ASoftkeyboard_AS/app/src/main/jniLibs/x86/libjni_latinime.so
deleted file mode 100644
index 7dc1bbe4..00000000
Binary files a/src/java/KP2ASoftkeyboard_AS/app/src/main/jniLibs/x86/libjni_latinime.so and /dev/null differ
diff --git a/src/java/KP2ASoftkeyboard_AS/build.gradle b/src/java/KP2ASoftkeyboard_AS/build.gradle
index 1c2d0680..927e2ab4 100644
--- a/src/java/KP2ASoftkeyboard_AS/build.gradle
+++ b/src/java/KP2ASoftkeyboard_AS/build.gradle
@@ -2,14 +2,23 @@
 buildscript {
     repositories {
         jcenter()
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.1'
+        classpath "com.android.tools.build:gradle:3.5.0"
     }
 }
 
 allprojects {
     repositories {
+        google()
         jcenter()
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
     }
 }
diff --git a/src/java/KP2ASoftkeyboard_AS/gradle/wrapper/gradle-wrapper.properties b/src/java/KP2ASoftkeyboard_AS/gradle/wrapper/gradle-wrapper.properties
index f8ce26aa..bcad3005 100644
--- a/src/java/KP2ASoftkeyboard_AS/gradle/wrapper/gradle-wrapper.properties
+++ b/src/java/KP2ASoftkeyboard_AS/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Dec 02 16:20:53 CET 2017
+#Wed Aug 21 07:04:05 CEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/src/java/kp2akeytransform/jni/Application.mk b/src/java/kp2akeytransform/jni/Application.mk
index aff927b8..a2087cbd 100644
--- a/src/java/kp2akeytransform/jni/Application.mk
+++ b/src/java/kp2akeytransform/jni/Application.mk
@@ -1,3 +1,3 @@
 APP_MODULES      := aes sha final-key
 APP_OPTIM        := release
-APP_ABI          := armeabi armeabi-v7a x86 mips
+APP_ABI          := all
diff --git a/src/keepass2android/keepass2android.csproj b/src/keepass2android/keepass2android.csproj
index 5cfcb40a..d60bdafe 100644
--- a/src/keepass2android/keepass2android.csproj
+++ b/src/keepass2android/keepass2android.csproj
@@ -40,7 +40,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
     <Debugger>Xamarin</Debugger>
     <DevInstrumentationEnabled>True</DevInstrumentationEnabled>
-    <AndroidSupportedAbis>armeabi-v7a,x86</AndroidSupportedAbis>
+    <AndroidSupportedAbis>armeabi-v7a;x86;x86_64;arm64-v8a</AndroidSupportedAbis>
     <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
     <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <BundleAssemblies>false</BundleAssemblies>
@@ -58,7 +58,7 @@
     <WarningLevel>4</WarningLevel>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
     <ConsolePause>False</ConsolePause>
-    <AndroidSupportedAbis>armeabi-v7a,x86,x86_64</AndroidSupportedAbis>
+    <AndroidSupportedAbis>armeabi-v7a;x86;x86_64;arm64-v8a</AndroidSupportedAbis>
     <CustomCommands>
       <CustomCommands>
         <Command type="BeforeBuild" command="UseManifestNet.bat" />
@@ -1974,4 +1974,4 @@
   <Import Project="..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.Animated.Vector.Drawable.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.Animated.Vector.Drawable.targets')" />
   <Import Project="..\packages\Xamarin.Android.Support.v7.AppCompat.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.v7.AppCompat.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v7.AppCompat.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.v7.AppCompat.targets')" />
   <Import Project="..\packages\Xamarin.Android.Support.Design.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.Design.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Design.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.Design.targets')" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/keepass2android/services/AutofillBase/Kp2aDigitalAssetLinksDataSource.cs b/src/keepass2android/services/AutofillBase/Kp2aDigitalAssetLinksDataSource.cs
index e87791a6..ba663489 100644
--- a/src/keepass2android/services/AutofillBase/Kp2aDigitalAssetLinksDataSource.cs
+++ b/src/keepass2android/services/AutofillBase/Kp2aDigitalAssetLinksDataSource.cs
@@ -37,7 +37,7 @@ namespace keepass2android.services.AutofillBase
             "com.opera.browser","com.opera.browser.beta","com.opera.mini.native",
             "com.brave.browser","com.yandex.browser","com.microsoft.emmx","com.amazon.cloud9",
             "com.sec.android.app.sbrowser","com.sec.android.app.sbrowser.beta","org.codeaurora.swe.browser",
-            "mark.via.gp","org.bromite.bromite", "org.mozilla.fennec_fdroid"
+            "mark.via.gp","org.bromite.bromite", "org.mozilla.fennec_fdroid", "com.vivaldi.browser"
         };
 
         private bool IsTrustedBrowser(string packageName)
diff --git a/src/netftpandroid b/src/netftpandroid
index e2c34d09..23df4cf1 160000
--- a/src/netftpandroid
+++ b/src/netftpandroid
@@ -1 +1 @@
-Subproject commit e2c34d096ab39eef271d0d87f4746658d295b550
+Subproject commit 23df4cf135857eb33f3656567d08ec228d96d4b5