diff --git a/jnalib/.classpath b/.classpath similarity index 100% rename from jnalib/.classpath rename to .classpath diff --git a/jnalib/.project b/.project similarity index 100% rename from jnalib/.project rename to .project diff --git a/jnalib/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from jnalib/.settings/org.eclipse.jdt.core.prefs rename to .settings/org.eclipse.jdt.core.prefs diff --git a/jnalib/.settings/org.eclipse.ltk.core.refactoring.prefs b/.settings/org.eclipse.ltk.core.refactoring.prefs similarity index 100% rename from jnalib/.settings/org.eclipse.ltk.core.refactoring.prefs rename to .settings/org.eclipse.ltk.core.refactoring.prefs diff --git a/jnalib/OTHERS b/OTHERS similarity index 100% rename from jnalib/OTHERS rename to OTHERS diff --git a/jnalib/TODO b/TODO similarity index 100% rename from jnalib/TODO rename to TODO diff --git a/build.xml b/build.xml index 8f01ca02f9..33c8306451 100644 --- a/build.xml +++ b/build.xml @@ -1,22 +1,692 @@ - - - - - - - - - - - - - - - - - - - - + + + Builds and tests JNA + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Java version ${java.version}, compatibility: ${compatibility} + JNA version ${jna.version}, native ${jni.version} + ${java.vm.name} (${java.vm.vendor}, ${java.vm.version}) + java.home=${java.home} + java.library.path=${java.library.path} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + +
+
+ + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Invalidating native code, new checksum is ${md5} + + + + + + + + + + + + + + + + + API for native code has changed. Re-run this build after updating jni.version and jni.md5 in build.xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Saving test results in ${results.junit} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + View test report in file://${reports.junit}/index.html + + + + One or more tests failed + + + + + + + + + + + + + + + + + + + + Reports generated in ${reports.clover} + + + + + + + + + + + + + + + + + + JNA API Documentation +
${header}
+ ${footer} + + + + + + + + + + + + + + + + + + +
+
+ + + + + +
+ + + + + + +
+
+ + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + +
+ diff --git a/jnalib/contrib/README b/contrib/README similarity index 100% rename from jnalib/contrib/README rename to contrib/README diff --git a/jnalib/contrib/alphamaskdemo/.classpath b/contrib/alphamaskdemo/.classpath similarity index 100% rename from jnalib/contrib/alphamaskdemo/.classpath rename to contrib/alphamaskdemo/.classpath diff --git a/jnalib/contrib/alphamaskdemo/.project b/contrib/alphamaskdemo/.project similarity index 100% rename from jnalib/contrib/alphamaskdemo/.project rename to contrib/alphamaskdemo/.project diff --git a/jnalib/contrib/alphamaskdemo/build.xml b/contrib/alphamaskdemo/build.xml similarity index 100% rename from jnalib/contrib/alphamaskdemo/build.xml rename to contrib/alphamaskdemo/build.xml diff --git a/jnalib/contrib/alphamaskdemo/com/sun/jna/contrib/demo/AlphaMaskDemo.java b/contrib/alphamaskdemo/com/sun/jna/contrib/demo/AlphaMaskDemo.java similarity index 100% rename from jnalib/contrib/alphamaskdemo/com/sun/jna/contrib/demo/AlphaMaskDemo.java rename to contrib/alphamaskdemo/com/sun/jna/contrib/demo/AlphaMaskDemo.java diff --git a/jnalib/contrib/alphamaskdemo/com/sun/jna/contrib/demo/AlphaMaskDemo.jnlp b/contrib/alphamaskdemo/com/sun/jna/contrib/demo/AlphaMaskDemo.jnlp similarity index 100% rename from jnalib/contrib/alphamaskdemo/com/sun/jna/contrib/demo/AlphaMaskDemo.jnlp rename to contrib/alphamaskdemo/com/sun/jna/contrib/demo/AlphaMaskDemo.jnlp diff --git a/jnalib/contrib/alphamaskdemo/com/sun/jna/contrib/demo/AlphaMaskDemo2.java b/contrib/alphamaskdemo/com/sun/jna/contrib/demo/AlphaMaskDemo2.java similarity index 100% rename from jnalib/contrib/alphamaskdemo/com/sun/jna/contrib/demo/AlphaMaskDemo2.java rename to contrib/alphamaskdemo/com/sun/jna/contrib/demo/AlphaMaskDemo2.java diff --git a/jnalib/contrib/alphamaskdemo/com/sun/jna/contrib/demo/tardis.png b/contrib/alphamaskdemo/com/sun/jna/contrib/demo/tardis.png similarity index 100% rename from jnalib/contrib/alphamaskdemo/com/sun/jna/contrib/demo/tardis.png rename to contrib/alphamaskdemo/com/sun/jna/contrib/demo/tardis.png diff --git a/jnalib/contrib/balloonmanagerdemo/.classpath b/contrib/balloonmanagerdemo/.classpath similarity index 100% rename from jnalib/contrib/balloonmanagerdemo/.classpath rename to contrib/balloonmanagerdemo/.classpath diff --git a/jnalib/contrib/balloonmanagerdemo/.project b/contrib/balloonmanagerdemo/.project similarity index 100% rename from jnalib/contrib/balloonmanagerdemo/.project rename to contrib/balloonmanagerdemo/.project diff --git a/jnalib/contrib/balloonmanagerdemo/build.xml b/contrib/balloonmanagerdemo/build.xml similarity index 100% rename from jnalib/contrib/balloonmanagerdemo/build.xml rename to contrib/balloonmanagerdemo/build.xml diff --git a/jnalib/contrib/balloonmanagerdemo/com/sun/jna/contrib/demo/BalloonManager.java b/contrib/balloonmanagerdemo/com/sun/jna/contrib/demo/BalloonManager.java similarity index 100% rename from jnalib/contrib/balloonmanagerdemo/com/sun/jna/contrib/demo/BalloonManager.java rename to contrib/balloonmanagerdemo/com/sun/jna/contrib/demo/BalloonManager.java diff --git a/jnalib/contrib/balloonmanagerdemo/com/sun/jna/contrib/demo/BalloonManagerDemo.java b/contrib/balloonmanagerdemo/com/sun/jna/contrib/demo/BalloonManagerDemo.java similarity index 100% rename from jnalib/contrib/balloonmanagerdemo/com/sun/jna/contrib/demo/BalloonManagerDemo.java rename to contrib/balloonmanagerdemo/com/sun/jna/contrib/demo/BalloonManagerDemo.java diff --git a/jnalib/contrib/balloontips/.classpath b/contrib/balloontips/.classpath similarity index 100% rename from jnalib/contrib/balloontips/.classpath rename to contrib/balloontips/.classpath diff --git a/jnalib/contrib/balloontips/.project b/contrib/balloontips/.project similarity index 100% rename from jnalib/contrib/balloontips/.project rename to contrib/balloontips/.project diff --git a/jnalib/contrib/balloontips/README b/contrib/balloontips/README similarity index 100% rename from jnalib/contrib/balloontips/README rename to contrib/balloontips/README diff --git a/jnalib/contrib/balloontips/build.xml b/contrib/balloontips/build.xml similarity index 100% rename from jnalib/contrib/balloontips/build.xml rename to contrib/balloontips/build.xml diff --git a/jnalib/contrib/balloontips/com/sun/jna/contrib/demo/BalloonTipManager.java b/contrib/balloontips/com/sun/jna/contrib/demo/BalloonTipManager.java similarity index 100% rename from jnalib/contrib/balloontips/com/sun/jna/contrib/demo/BalloonTipManager.java rename to contrib/balloontips/com/sun/jna/contrib/demo/BalloonTipManager.java diff --git a/jnalib/contrib/balloontips/com/sun/jna/contrib/demo/FilteredTextField.java b/contrib/balloontips/com/sun/jna/contrib/demo/FilteredTextField.java similarity index 100% rename from jnalib/contrib/balloontips/com/sun/jna/contrib/demo/FilteredTextField.java rename to contrib/balloontips/com/sun/jna/contrib/demo/FilteredTextField.java diff --git a/jnalib/contrib/dnddemo/.classpath b/contrib/dnddemo/.classpath similarity index 100% rename from jnalib/contrib/dnddemo/.classpath rename to contrib/dnddemo/.classpath diff --git a/jnalib/contrib/dnddemo/.project b/contrib/dnddemo/.project similarity index 100% rename from jnalib/contrib/dnddemo/.project rename to contrib/dnddemo/.project diff --git a/jnalib/contrib/dnddemo/build.xml b/contrib/dnddemo/build.xml similarity index 100% rename from jnalib/contrib/dnddemo/build.xml rename to contrib/dnddemo/build.xml diff --git a/jnalib/contrib/dnddemo/com/sun/jna/contrib/demo/GhostedDragImageDemo.java b/contrib/dnddemo/com/sun/jna/contrib/demo/GhostedDragImageDemo.java similarity index 100% rename from jnalib/contrib/dnddemo/com/sun/jna/contrib/demo/GhostedDragImageDemo.java rename to contrib/dnddemo/com/sun/jna/contrib/demo/GhostedDragImageDemo.java diff --git a/jnalib/contrib/dnddemo/com/sun/jna/contrib/demo/toucan.png b/contrib/dnddemo/com/sun/jna/contrib/demo/toucan.png similarity index 100% rename from jnalib/contrib/dnddemo/com/sun/jna/contrib/demo/toucan.png rename to contrib/dnddemo/com/sun/jna/contrib/demo/toucan.png diff --git a/jnalib/contrib/dnddemo/package.html b/contrib/dnddemo/package.html similarity index 100% rename from jnalib/contrib/dnddemo/package.html rename to contrib/dnddemo/package.html diff --git a/jnalib/contrib/ntservice/.classpath b/contrib/ntservice/.classpath similarity index 100% rename from jnalib/contrib/ntservice/.classpath rename to contrib/ntservice/.classpath diff --git a/jnalib/contrib/ntservice/.project b/contrib/ntservice/.project similarity index 100% rename from jnalib/contrib/ntservice/.project rename to contrib/ntservice/.project diff --git a/jnalib/contrib/ntservice/README b/contrib/ntservice/README similarity index 100% rename from jnalib/contrib/ntservice/README rename to contrib/ntservice/README diff --git a/jnalib/contrib/ntservice/build.xml b/contrib/ntservice/build.xml similarity index 100% rename from jnalib/contrib/ntservice/build.xml rename to contrib/ntservice/build.xml diff --git a/jnalib/contrib/ntservice/manifest.mf b/contrib/ntservice/manifest.mf similarity index 100% rename from jnalib/contrib/ntservice/manifest.mf rename to contrib/ntservice/manifest.mf diff --git a/jnalib/contrib/ntservice/nbproject/build-impl.xml b/contrib/ntservice/nbproject/build-impl.xml similarity index 100% rename from jnalib/contrib/ntservice/nbproject/build-impl.xml rename to contrib/ntservice/nbproject/build-impl.xml diff --git a/jnalib/contrib/ntservice/nbproject/genfiles.properties b/contrib/ntservice/nbproject/genfiles.properties similarity index 100% rename from jnalib/contrib/ntservice/nbproject/genfiles.properties rename to contrib/ntservice/nbproject/genfiles.properties diff --git a/jnalib/contrib/ntservice/nbproject/project.properties b/contrib/ntservice/nbproject/project.properties similarity index 100% rename from jnalib/contrib/ntservice/nbproject/project.properties rename to contrib/ntservice/nbproject/project.properties diff --git a/jnalib/contrib/ntservice/nbproject/project.xml b/contrib/ntservice/nbproject/project.xml similarity index 100% rename from jnalib/contrib/ntservice/nbproject/project.xml rename to contrib/ntservice/nbproject/project.xml diff --git a/jnalib/contrib/ntservice/src/jnacontrib/jna/Advapi32.java b/contrib/ntservice/src/jnacontrib/jna/Advapi32.java similarity index 100% rename from jnalib/contrib/ntservice/src/jnacontrib/jna/Advapi32.java rename to contrib/ntservice/src/jnacontrib/jna/Advapi32.java diff --git a/jnalib/contrib/ntservice/src/jnacontrib/jna/WINERROR.java b/contrib/ntservice/src/jnacontrib/jna/WINERROR.java similarity index 100% rename from jnalib/contrib/ntservice/src/jnacontrib/jna/WINERROR.java rename to contrib/ntservice/src/jnacontrib/jna/WINERROR.java diff --git a/jnalib/contrib/ntservice/src/jnacontrib/jna/WINNT.java b/contrib/ntservice/src/jnacontrib/jna/WINNT.java similarity index 100% rename from jnalib/contrib/ntservice/src/jnacontrib/jna/WINNT.java rename to contrib/ntservice/src/jnacontrib/jna/WINNT.java diff --git a/jnalib/contrib/ntservice/src/jnacontrib/jna/WINSVC.java b/contrib/ntservice/src/jnacontrib/jna/WINSVC.java similarity index 100% rename from jnalib/contrib/ntservice/src/jnacontrib/jna/WINSVC.java rename to contrib/ntservice/src/jnacontrib/jna/WINSVC.java diff --git a/jnalib/contrib/ntservice/src/jnacontrib/win32/TestService.java b/contrib/ntservice/src/jnacontrib/win32/TestService.java similarity index 100% rename from jnalib/contrib/ntservice/src/jnacontrib/win32/TestService.java rename to contrib/ntservice/src/jnacontrib/win32/TestService.java diff --git a/jnalib/contrib/ntservice/src/jnacontrib/win32/Win32Service.java b/contrib/ntservice/src/jnacontrib/win32/Win32Service.java similarity index 100% rename from jnalib/contrib/ntservice/src/jnacontrib/win32/Win32Service.java rename to contrib/ntservice/src/jnacontrib/win32/Win32Service.java diff --git a/jnalib/contrib/ntservice/test/placeholder.txt b/contrib/ntservice/test/placeholder.txt similarity index 100% rename from jnalib/contrib/ntservice/test/placeholder.txt rename to contrib/ntservice/test/placeholder.txt diff --git a/jnalib/contrib/platform/.classpath b/contrib/platform/.classpath similarity index 100% rename from jnalib/contrib/platform/.classpath rename to contrib/platform/.classpath diff --git a/jnalib/contrib/platform/.project b/contrib/platform/.project similarity index 100% rename from jnalib/contrib/platform/.project rename to contrib/platform/.project diff --git a/jnalib/contrib/platform/build.xml b/contrib/platform/build.xml similarity index 100% rename from jnalib/contrib/platform/build.xml rename to contrib/platform/build.xml diff --git a/jnalib/contrib/platform/nbproject/build-impl.xml b/contrib/platform/nbproject/build-impl.xml similarity index 100% rename from jnalib/contrib/platform/nbproject/build-impl.xml rename to contrib/platform/nbproject/build-impl.xml diff --git a/jnalib/contrib/platform/nbproject/project.properties b/contrib/platform/nbproject/project.properties similarity index 100% rename from jnalib/contrib/platform/nbproject/project.properties rename to contrib/platform/nbproject/project.properties diff --git a/jnalib/contrib/platform/nbproject/project.xml b/contrib/platform/nbproject/project.xml similarity index 100% rename from jnalib/contrib/platform/nbproject/project.xml rename to contrib/platform/nbproject/project.xml diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/FileMonitor.java b/contrib/platform/src/com/sun/jna/platform/FileMonitor.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/FileMonitor.java rename to contrib/platform/src/com/sun/jna/platform/FileMonitor.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/FileUtils.java b/contrib/platform/src/com/sun/jna/platform/FileUtils.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/FileUtils.java rename to contrib/platform/src/com/sun/jna/platform/FileUtils.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/KeyboardUtils.java b/contrib/platform/src/com/sun/jna/platform/KeyboardUtils.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/KeyboardUtils.java rename to contrib/platform/src/com/sun/jna/platform/KeyboardUtils.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/RasterRangesUtils.java b/contrib/platform/src/com/sun/jna/platform/RasterRangesUtils.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/RasterRangesUtils.java rename to contrib/platform/src/com/sun/jna/platform/RasterRangesUtils.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/WindowUtils.java b/contrib/platform/src/com/sun/jna/platform/WindowUtils.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/WindowUtils.java rename to contrib/platform/src/com/sun/jna/platform/WindowUtils.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/dnd/DragHandler.java b/contrib/platform/src/com/sun/jna/platform/dnd/DragHandler.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/dnd/DragHandler.java rename to contrib/platform/src/com/sun/jna/platform/dnd/DragHandler.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/dnd/DropHandler.java b/contrib/platform/src/com/sun/jna/platform/dnd/DropHandler.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/dnd/DropHandler.java rename to contrib/platform/src/com/sun/jna/platform/dnd/DropHandler.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/dnd/DropTargetPainter.java b/contrib/platform/src/com/sun/jna/platform/dnd/DropTargetPainter.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/dnd/DropTargetPainter.java rename to contrib/platform/src/com/sun/jna/platform/dnd/DropTargetPainter.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/dnd/GhostedDragImage.java b/contrib/platform/src/com/sun/jna/platform/dnd/GhostedDragImage.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/dnd/GhostedDragImage.java rename to contrib/platform/src/com/sun/jna/platform/dnd/GhostedDragImage.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/dnd/package.html b/contrib/platform/src/com/sun/jna/platform/dnd/package.html similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/dnd/package.html rename to contrib/platform/src/com/sun/jna/platform/dnd/package.html diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/mac/MacFileUtils.java b/contrib/platform/src/com/sun/jna/platform/mac/MacFileUtils.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/mac/MacFileUtils.java rename to contrib/platform/src/com/sun/jna/platform/mac/MacFileUtils.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/mac/package.html b/contrib/platform/src/com/sun/jna/platform/mac/package.html similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/mac/package.html rename to contrib/platform/src/com/sun/jna/platform/mac/package.html diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/package.html b/contrib/platform/src/com/sun/jna/platform/package.html similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/package.html rename to contrib/platform/src/com/sun/jna/platform/package.html diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/unix/X11.java b/contrib/platform/src/com/sun/jna/platform/unix/X11.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/unix/X11.java rename to contrib/platform/src/com/sun/jna/platform/unix/X11.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/unix/package.html b/contrib/platform/src/com/sun/jna/platform/unix/package.html similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/unix/package.html rename to contrib/platform/src/com/sun/jna/platform/unix/package.html diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/Advapi32.java b/contrib/platform/src/com/sun/jna/platform/win32/Advapi32.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/Advapi32.java rename to contrib/platform/src/com/sun/jna/platform/win32/Advapi32.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/Advapi32Util.java b/contrib/platform/src/com/sun/jna/platform/win32/Advapi32Util.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/Advapi32Util.java rename to contrib/platform/src/com/sun/jna/platform/win32/Advapi32Util.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/BaseTSD.java b/contrib/platform/src/com/sun/jna/platform/win32/BaseTSD.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/BaseTSD.java rename to contrib/platform/src/com/sun/jna/platform/win32/BaseTSD.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/Crypt32.java b/contrib/platform/src/com/sun/jna/platform/win32/Crypt32.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/Crypt32.java rename to contrib/platform/src/com/sun/jna/platform/win32/Crypt32.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/Crypt32Util.java b/contrib/platform/src/com/sun/jna/platform/win32/Crypt32Util.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/Crypt32Util.java rename to contrib/platform/src/com/sun/jna/platform/win32/Crypt32Util.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/DsGetDC.java b/contrib/platform/src/com/sun/jna/platform/win32/DsGetDC.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/DsGetDC.java rename to contrib/platform/src/com/sun/jna/platform/win32/DsGetDC.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/GDI32.java b/contrib/platform/src/com/sun/jna/platform/win32/GDI32.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/GDI32.java rename to contrib/platform/src/com/sun/jna/platform/win32/GDI32.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/Guid.java b/contrib/platform/src/com/sun/jna/platform/win32/Guid.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/Guid.java rename to contrib/platform/src/com/sun/jna/platform/win32/Guid.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/Kernel32.java b/contrib/platform/src/com/sun/jna/platform/win32/Kernel32.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/Kernel32.java rename to contrib/platform/src/com/sun/jna/platform/win32/Kernel32.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/Kernel32Util.java b/contrib/platform/src/com/sun/jna/platform/win32/Kernel32Util.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/Kernel32Util.java rename to contrib/platform/src/com/sun/jna/platform/win32/Kernel32Util.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/LMAccess.java b/contrib/platform/src/com/sun/jna/platform/win32/LMAccess.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/LMAccess.java rename to contrib/platform/src/com/sun/jna/platform/win32/LMAccess.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/LMCons.java b/contrib/platform/src/com/sun/jna/platform/win32/LMCons.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/LMCons.java rename to contrib/platform/src/com/sun/jna/platform/win32/LMCons.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/LMErr.java b/contrib/platform/src/com/sun/jna/platform/win32/LMErr.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/LMErr.java rename to contrib/platform/src/com/sun/jna/platform/win32/LMErr.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/LMJoin.java b/contrib/platform/src/com/sun/jna/platform/win32/LMJoin.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/LMJoin.java rename to contrib/platform/src/com/sun/jna/platform/win32/LMJoin.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/NTSecApi.java b/contrib/platform/src/com/sun/jna/platform/win32/NTSecApi.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/NTSecApi.java rename to contrib/platform/src/com/sun/jna/platform/win32/NTSecApi.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/NTStatus.java b/contrib/platform/src/com/sun/jna/platform/win32/NTStatus.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/NTStatus.java rename to contrib/platform/src/com/sun/jna/platform/win32/NTStatus.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/Netapi32.java b/contrib/platform/src/com/sun/jna/platform/win32/Netapi32.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/Netapi32.java rename to contrib/platform/src/com/sun/jna/platform/win32/Netapi32.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/Netapi32Util.java b/contrib/platform/src/com/sun/jna/platform/win32/Netapi32Util.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/Netapi32Util.java rename to contrib/platform/src/com/sun/jna/platform/win32/Netapi32Util.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/NtDll.java b/contrib/platform/src/com/sun/jna/platform/win32/NtDll.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/NtDll.java rename to contrib/platform/src/com/sun/jna/platform/win32/NtDll.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/NtDllUtil.java b/contrib/platform/src/com/sun/jna/platform/win32/NtDllUtil.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/NtDllUtil.java rename to contrib/platform/src/com/sun/jna/platform/win32/NtDllUtil.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/ObjBase.java b/contrib/platform/src/com/sun/jna/platform/win32/ObjBase.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/ObjBase.java rename to contrib/platform/src/com/sun/jna/platform/win32/ObjBase.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/Ole32.java b/contrib/platform/src/com/sun/jna/platform/win32/Ole32.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/Ole32.java rename to contrib/platform/src/com/sun/jna/platform/win32/Ole32.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/Ole32Util.java b/contrib/platform/src/com/sun/jna/platform/win32/Ole32Util.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/Ole32Util.java rename to contrib/platform/src/com/sun/jna/platform/win32/Ole32Util.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/Oleaut32.java b/contrib/platform/src/com/sun/jna/platform/win32/Oleaut32.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/Oleaut32.java rename to contrib/platform/src/com/sun/jna/platform/win32/Oleaut32.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/Secur32.java b/contrib/platform/src/com/sun/jna/platform/win32/Secur32.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/Secur32.java rename to contrib/platform/src/com/sun/jna/platform/win32/Secur32.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/Secur32Util.java b/contrib/platform/src/com/sun/jna/platform/win32/Secur32Util.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/Secur32Util.java rename to contrib/platform/src/com/sun/jna/platform/win32/Secur32Util.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/Shell32.java b/contrib/platform/src/com/sun/jna/platform/win32/Shell32.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/Shell32.java rename to contrib/platform/src/com/sun/jna/platform/win32/Shell32.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/Shell32Util.java b/contrib/platform/src/com/sun/jna/platform/win32/Shell32Util.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/Shell32Util.java rename to contrib/platform/src/com/sun/jna/platform/win32/Shell32Util.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/ShellAPI.java b/contrib/platform/src/com/sun/jna/platform/win32/ShellAPI.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/ShellAPI.java rename to contrib/platform/src/com/sun/jna/platform/win32/ShellAPI.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/ShlObj.java b/contrib/platform/src/com/sun/jna/platform/win32/ShlObj.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/ShlObj.java rename to contrib/platform/src/com/sun/jna/platform/win32/ShlObj.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/Sspi.java b/contrib/platform/src/com/sun/jna/platform/win32/Sspi.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/Sspi.java rename to contrib/platform/src/com/sun/jna/platform/win32/Sspi.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/User32.java b/contrib/platform/src/com/sun/jna/platform/win32/User32.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/User32.java rename to contrib/platform/src/com/sun/jna/platform/win32/User32.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/W32Errors.java b/contrib/platform/src/com/sun/jna/platform/win32/W32Errors.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/W32Errors.java rename to contrib/platform/src/com/sun/jna/platform/win32/W32Errors.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/W32FileMonitor.java b/contrib/platform/src/com/sun/jna/platform/win32/W32FileMonitor.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/W32FileMonitor.java rename to contrib/platform/src/com/sun/jna/platform/win32/W32FileMonitor.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/W32FileUtils.java b/contrib/platform/src/com/sun/jna/platform/win32/W32FileUtils.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/W32FileUtils.java rename to contrib/platform/src/com/sun/jna/platform/win32/W32FileUtils.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/W32Service.java b/contrib/platform/src/com/sun/jna/platform/win32/W32Service.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/W32Service.java rename to contrib/platform/src/com/sun/jna/platform/win32/W32Service.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/W32ServiceManager.java b/contrib/platform/src/com/sun/jna/platform/win32/W32ServiceManager.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/W32ServiceManager.java rename to contrib/platform/src/com/sun/jna/platform/win32/W32ServiceManager.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/WTypes.java b/contrib/platform/src/com/sun/jna/platform/win32/WTypes.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/WTypes.java rename to contrib/platform/src/com/sun/jna/platform/win32/WTypes.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/Wdm.java b/contrib/platform/src/com/sun/jna/platform/win32/Wdm.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/Wdm.java rename to contrib/platform/src/com/sun/jna/platform/win32/Wdm.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/Win32Exception.java b/contrib/platform/src/com/sun/jna/platform/win32/Win32Exception.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/Win32Exception.java rename to contrib/platform/src/com/sun/jna/platform/win32/Win32Exception.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/WinBase.java b/contrib/platform/src/com/sun/jna/platform/win32/WinBase.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/WinBase.java rename to contrib/platform/src/com/sun/jna/platform/win32/WinBase.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/WinCrypt.java b/contrib/platform/src/com/sun/jna/platform/win32/WinCrypt.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/WinCrypt.java rename to contrib/platform/src/com/sun/jna/platform/win32/WinCrypt.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/WinDef.java b/contrib/platform/src/com/sun/jna/platform/win32/WinDef.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/WinDef.java rename to contrib/platform/src/com/sun/jna/platform/win32/WinDef.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/WinGDI.java b/contrib/platform/src/com/sun/jna/platform/win32/WinGDI.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/WinGDI.java rename to contrib/platform/src/com/sun/jna/platform/win32/WinGDI.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/WinNT.java b/contrib/platform/src/com/sun/jna/platform/win32/WinNT.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/WinNT.java rename to contrib/platform/src/com/sun/jna/platform/win32/WinNT.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/WinReg.java b/contrib/platform/src/com/sun/jna/platform/win32/WinReg.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/WinReg.java rename to contrib/platform/src/com/sun/jna/platform/win32/WinReg.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/WinUser.java b/contrib/platform/src/com/sun/jna/platform/win32/WinUser.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/WinUser.java rename to contrib/platform/src/com/sun/jna/platform/win32/WinUser.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/Winspool.java b/contrib/platform/src/com/sun/jna/platform/win32/Winspool.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/Winspool.java rename to contrib/platform/src/com/sun/jna/platform/win32/Winspool.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/WinspoolUtil.java b/contrib/platform/src/com/sun/jna/platform/win32/WinspoolUtil.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/WinspoolUtil.java rename to contrib/platform/src/com/sun/jna/platform/win32/WinspoolUtil.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/Winsvc.java b/contrib/platform/src/com/sun/jna/platform/win32/Winsvc.java similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/Winsvc.java rename to contrib/platform/src/com/sun/jna/platform/win32/Winsvc.java diff --git a/jnalib/contrib/platform/src/com/sun/jna/platform/win32/package.html b/contrib/platform/src/com/sun/jna/platform/win32/package.html similarity index 100% rename from jnalib/contrib/platform/src/com/sun/jna/platform/win32/package.html rename to contrib/platform/src/com/sun/jna/platform/win32/package.html diff --git a/jnalib/contrib/platform/test/com/sun/jna/platform/FileUtilsTest.java b/contrib/platform/test/com/sun/jna/platform/FileUtilsTest.java similarity index 100% rename from jnalib/contrib/platform/test/com/sun/jna/platform/FileUtilsTest.java rename to contrib/platform/test/com/sun/jna/platform/FileUtilsTest.java diff --git a/jnalib/contrib/platform/test/com/sun/jna/platform/KeyboardUtilsTest.java b/contrib/platform/test/com/sun/jna/platform/KeyboardUtilsTest.java similarity index 100% rename from jnalib/contrib/platform/test/com/sun/jna/platform/KeyboardUtilsTest.java rename to contrib/platform/test/com/sun/jna/platform/KeyboardUtilsTest.java diff --git a/jnalib/contrib/platform/test/com/sun/jna/platform/RasterRangesUtilsTest.java b/contrib/platform/test/com/sun/jna/platform/RasterRangesUtilsTest.java similarity index 100% rename from jnalib/contrib/platform/test/com/sun/jna/platform/RasterRangesUtilsTest.java rename to contrib/platform/test/com/sun/jna/platform/RasterRangesUtilsTest.java diff --git a/jnalib/contrib/platform/test/com/sun/jna/platform/WindowUtilsTest.java b/contrib/platform/test/com/sun/jna/platform/WindowUtilsTest.java similarity index 100% rename from jnalib/contrib/platform/test/com/sun/jna/platform/WindowUtilsTest.java rename to contrib/platform/test/com/sun/jna/platform/WindowUtilsTest.java diff --git a/jnalib/contrib/platform/test/com/sun/jna/platform/win32/Advapi32Test.java b/contrib/platform/test/com/sun/jna/platform/win32/Advapi32Test.java similarity index 100% rename from jnalib/contrib/platform/test/com/sun/jna/platform/win32/Advapi32Test.java rename to contrib/platform/test/com/sun/jna/platform/win32/Advapi32Test.java diff --git a/jnalib/contrib/platform/test/com/sun/jna/platform/win32/Advapi32UtilTest.java b/contrib/platform/test/com/sun/jna/platform/win32/Advapi32UtilTest.java similarity index 100% rename from jnalib/contrib/platform/test/com/sun/jna/platform/win32/Advapi32UtilTest.java rename to contrib/platform/test/com/sun/jna/platform/win32/Advapi32UtilTest.java diff --git a/jnalib/contrib/platform/test/com/sun/jna/platform/win32/Crypt32Test.java b/contrib/platform/test/com/sun/jna/platform/win32/Crypt32Test.java similarity index 100% rename from jnalib/contrib/platform/test/com/sun/jna/platform/win32/Crypt32Test.java rename to contrib/platform/test/com/sun/jna/platform/win32/Crypt32Test.java diff --git a/jnalib/contrib/platform/test/com/sun/jna/platform/win32/Crypt32UtilTest.java b/contrib/platform/test/com/sun/jna/platform/win32/Crypt32UtilTest.java similarity index 100% rename from jnalib/contrib/platform/test/com/sun/jna/platform/win32/Crypt32UtilTest.java rename to contrib/platform/test/com/sun/jna/platform/win32/Crypt32UtilTest.java diff --git a/jnalib/contrib/platform/test/com/sun/jna/platform/win32/GDI32Test.java b/contrib/platform/test/com/sun/jna/platform/win32/GDI32Test.java similarity index 100% rename from jnalib/contrib/platform/test/com/sun/jna/platform/win32/GDI32Test.java rename to contrib/platform/test/com/sun/jna/platform/win32/GDI32Test.java diff --git a/jnalib/contrib/platform/test/com/sun/jna/platform/win32/Kernel32Test.java b/contrib/platform/test/com/sun/jna/platform/win32/Kernel32Test.java similarity index 100% rename from jnalib/contrib/platform/test/com/sun/jna/platform/win32/Kernel32Test.java rename to contrib/platform/test/com/sun/jna/platform/win32/Kernel32Test.java diff --git a/jnalib/contrib/platform/test/com/sun/jna/platform/win32/Kernel32UtilTest.java b/contrib/platform/test/com/sun/jna/platform/win32/Kernel32UtilTest.java similarity index 100% rename from jnalib/contrib/platform/test/com/sun/jna/platform/win32/Kernel32UtilTest.java rename to contrib/platform/test/com/sun/jna/platform/win32/Kernel32UtilTest.java diff --git a/jnalib/contrib/platform/test/com/sun/jna/platform/win32/Netapi32Test.java b/contrib/platform/test/com/sun/jna/platform/win32/Netapi32Test.java similarity index 100% rename from jnalib/contrib/platform/test/com/sun/jna/platform/win32/Netapi32Test.java rename to contrib/platform/test/com/sun/jna/platform/win32/Netapi32Test.java diff --git a/jnalib/contrib/platform/test/com/sun/jna/platform/win32/Netapi32UtilTest.java b/contrib/platform/test/com/sun/jna/platform/win32/Netapi32UtilTest.java similarity index 100% rename from jnalib/contrib/platform/test/com/sun/jna/platform/win32/Netapi32UtilTest.java rename to contrib/platform/test/com/sun/jna/platform/win32/Netapi32UtilTest.java diff --git a/jnalib/contrib/platform/test/com/sun/jna/platform/win32/NtDllTest.java b/contrib/platform/test/com/sun/jna/platform/win32/NtDllTest.java similarity index 100% rename from jnalib/contrib/platform/test/com/sun/jna/platform/win32/NtDllTest.java rename to contrib/platform/test/com/sun/jna/platform/win32/NtDllTest.java diff --git a/jnalib/contrib/platform/test/com/sun/jna/platform/win32/NtDllUtilTest.java b/contrib/platform/test/com/sun/jna/platform/win32/NtDllUtilTest.java similarity index 100% rename from jnalib/contrib/platform/test/com/sun/jna/platform/win32/NtDllUtilTest.java rename to contrib/platform/test/com/sun/jna/platform/win32/NtDllUtilTest.java diff --git a/jnalib/contrib/platform/test/com/sun/jna/platform/win32/Ole32Test.java b/contrib/platform/test/com/sun/jna/platform/win32/Ole32Test.java similarity index 100% rename from jnalib/contrib/platform/test/com/sun/jna/platform/win32/Ole32Test.java rename to contrib/platform/test/com/sun/jna/platform/win32/Ole32Test.java diff --git a/jnalib/contrib/platform/test/com/sun/jna/platform/win32/Ole32UtilTest.java b/contrib/platform/test/com/sun/jna/platform/win32/Ole32UtilTest.java similarity index 100% rename from jnalib/contrib/platform/test/com/sun/jna/platform/win32/Ole32UtilTest.java rename to contrib/platform/test/com/sun/jna/platform/win32/Ole32UtilTest.java diff --git a/jnalib/contrib/platform/test/com/sun/jna/platform/win32/Oleaut32Test.java b/contrib/platform/test/com/sun/jna/platform/win32/Oleaut32Test.java similarity index 100% rename from jnalib/contrib/platform/test/com/sun/jna/platform/win32/Oleaut32Test.java rename to contrib/platform/test/com/sun/jna/platform/win32/Oleaut32Test.java diff --git a/jnalib/contrib/platform/test/com/sun/jna/platform/win32/Secur32Test.java b/contrib/platform/test/com/sun/jna/platform/win32/Secur32Test.java similarity index 100% rename from jnalib/contrib/platform/test/com/sun/jna/platform/win32/Secur32Test.java rename to contrib/platform/test/com/sun/jna/platform/win32/Secur32Test.java diff --git a/jnalib/contrib/platform/test/com/sun/jna/platform/win32/Secur32UtilTest.java b/contrib/platform/test/com/sun/jna/platform/win32/Secur32UtilTest.java similarity index 100% rename from jnalib/contrib/platform/test/com/sun/jna/platform/win32/Secur32UtilTest.java rename to contrib/platform/test/com/sun/jna/platform/win32/Secur32UtilTest.java diff --git a/jnalib/contrib/platform/test/com/sun/jna/platform/win32/Shell32Test.java b/contrib/platform/test/com/sun/jna/platform/win32/Shell32Test.java similarity index 100% rename from jnalib/contrib/platform/test/com/sun/jna/platform/win32/Shell32Test.java rename to contrib/platform/test/com/sun/jna/platform/win32/Shell32Test.java diff --git a/jnalib/contrib/platform/test/com/sun/jna/platform/win32/Shell32UtilTest.java b/contrib/platform/test/com/sun/jna/platform/win32/Shell32UtilTest.java similarity index 100% rename from jnalib/contrib/platform/test/com/sun/jna/platform/win32/Shell32UtilTest.java rename to contrib/platform/test/com/sun/jna/platform/win32/Shell32UtilTest.java diff --git a/jnalib/contrib/platform/test/com/sun/jna/platform/win32/User32Test.java b/contrib/platform/test/com/sun/jna/platform/win32/User32Test.java similarity index 100% rename from jnalib/contrib/platform/test/com/sun/jna/platform/win32/User32Test.java rename to contrib/platform/test/com/sun/jna/platform/win32/User32Test.java diff --git a/jnalib/contrib/platform/test/com/sun/jna/platform/win32/W32FileMonitorTest.java b/contrib/platform/test/com/sun/jna/platform/win32/W32FileMonitorTest.java similarity index 100% rename from jnalib/contrib/platform/test/com/sun/jna/platform/win32/W32FileMonitorTest.java rename to contrib/platform/test/com/sun/jna/platform/win32/W32FileMonitorTest.java diff --git a/jnalib/contrib/platform/test/com/sun/jna/platform/win32/W32ServiceManagerTest.java b/contrib/platform/test/com/sun/jna/platform/win32/W32ServiceManagerTest.java similarity index 100% rename from jnalib/contrib/platform/test/com/sun/jna/platform/win32/W32ServiceManagerTest.java rename to contrib/platform/test/com/sun/jna/platform/win32/W32ServiceManagerTest.java diff --git a/jnalib/contrib/platform/test/com/sun/jna/platform/win32/W32ServiceTest.java b/contrib/platform/test/com/sun/jna/platform/win32/W32ServiceTest.java similarity index 100% rename from jnalib/contrib/platform/test/com/sun/jna/platform/win32/W32ServiceTest.java rename to contrib/platform/test/com/sun/jna/platform/win32/W32ServiceTest.java diff --git a/jnalib/contrib/platform/test/com/sun/jna/platform/win32/Win32ExceptionTest.java b/contrib/platform/test/com/sun/jna/platform/win32/Win32ExceptionTest.java similarity index 100% rename from jnalib/contrib/platform/test/com/sun/jna/platform/win32/Win32ExceptionTest.java rename to contrib/platform/test/com/sun/jna/platform/win32/Win32ExceptionTest.java diff --git a/jnalib/contrib/platform/test/com/sun/jna/platform/win32/WinspoolTest.java b/contrib/platform/test/com/sun/jna/platform/win32/WinspoolTest.java similarity index 100% rename from jnalib/contrib/platform/test/com/sun/jna/platform/win32/WinspoolTest.java rename to contrib/platform/test/com/sun/jna/platform/win32/WinspoolTest.java diff --git a/jnalib/contrib/platform/test/com/sun/jna/platform/win32/WinspoolUtilTest.java b/contrib/platform/test/com/sun/jna/platform/win32/WinspoolUtilTest.java similarity index 100% rename from jnalib/contrib/platform/test/com/sun/jna/platform/win32/WinspoolUtilTest.java rename to contrib/platform/test/com/sun/jna/platform/win32/WinspoolUtilTest.java diff --git a/jnalib/contrib/shapedwindowdemo/.classpath b/contrib/shapedwindowdemo/.classpath similarity index 100% rename from jnalib/contrib/shapedwindowdemo/.classpath rename to contrib/shapedwindowdemo/.classpath diff --git a/jnalib/contrib/shapedwindowdemo/.project b/contrib/shapedwindowdemo/.project similarity index 100% rename from jnalib/contrib/shapedwindowdemo/.project rename to contrib/shapedwindowdemo/.project diff --git a/jnalib/contrib/shapedwindowdemo/build.xml b/contrib/shapedwindowdemo/build.xml similarity index 100% rename from jnalib/contrib/shapedwindowdemo/build.xml rename to contrib/shapedwindowdemo/build.xml diff --git a/jnalib/contrib/shapedwindowdemo/com/sun/jna/contrib/demo/ShapedWindowDemo.java b/contrib/shapedwindowdemo/com/sun/jna/contrib/demo/ShapedWindowDemo.java similarity index 100% rename from jnalib/contrib/shapedwindowdemo/com/sun/jna/contrib/demo/ShapedWindowDemo.java rename to contrib/shapedwindowdemo/com/sun/jna/contrib/demo/ShapedWindowDemo.java diff --git a/jnalib/contrib/w32keyhook/.classpath b/contrib/w32keyhook/.classpath similarity index 100% rename from jnalib/contrib/w32keyhook/.classpath rename to contrib/w32keyhook/.classpath diff --git a/jnalib/contrib/w32keyhook/.project b/contrib/w32keyhook/.project similarity index 100% rename from jnalib/contrib/w32keyhook/.project rename to contrib/w32keyhook/.project diff --git a/jnalib/contrib/w32keyhook/KeyHook.java b/contrib/w32keyhook/KeyHook.java similarity index 100% rename from jnalib/contrib/w32keyhook/KeyHook.java rename to contrib/w32keyhook/KeyHook.java diff --git a/jnalib/contrib/w32keyhook/build.xml b/contrib/w32keyhook/build.xml similarity index 100% rename from jnalib/contrib/w32keyhook/build.xml rename to contrib/w32keyhook/build.xml diff --git a/jnalib/contrib/x11/.classpath b/contrib/x11/.classpath similarity index 100% rename from jnalib/contrib/x11/.classpath rename to contrib/x11/.classpath diff --git a/jnalib/contrib/x11/.project b/contrib/x11/.project similarity index 100% rename from jnalib/contrib/x11/.project rename to contrib/x11/.project diff --git a/jnalib/contrib/x11/README b/contrib/x11/README similarity index 100% rename from jnalib/contrib/x11/README rename to contrib/x11/README diff --git a/jnalib/contrib/x11/build.xml b/contrib/x11/build.xml similarity index 100% rename from jnalib/contrib/x11/build.xml rename to contrib/x11/build.xml diff --git a/jnalib/contrib/x11/src/jnacontrib/x11/api/X.java b/contrib/x11/src/jnacontrib/x11/api/X.java similarity index 100% rename from jnalib/contrib/x11/src/jnacontrib/x11/api/X.java rename to contrib/x11/src/jnacontrib/x11/api/X.java diff --git a/jnalib/contrib/x11/src/jnacontrib/x11/api/X11KeySymDef.java b/contrib/x11/src/jnacontrib/x11/api/X11KeySymDef.java similarity index 100% rename from jnalib/contrib/x11/src/jnacontrib/x11/api/X11KeySymDef.java rename to contrib/x11/src/jnacontrib/x11/api/X11KeySymDef.java diff --git a/jnalib/contrib/x11/src/jnacontrib/x11/demos/XDesktopDemo.java b/contrib/x11/src/jnacontrib/x11/demos/XDesktopDemo.java similarity index 100% rename from jnalib/contrib/x11/src/jnacontrib/x11/demos/XDesktopDemo.java rename to contrib/x11/src/jnacontrib/x11/demos/XDesktopDemo.java diff --git a/jnalib/contrib/x11/src/jnacontrib/x11/demos/XTestDemo.java b/contrib/x11/src/jnacontrib/x11/demos/XTestDemo.java similarity index 100% rename from jnalib/contrib/x11/src/jnacontrib/x11/demos/XTestDemo.java rename to contrib/x11/src/jnacontrib/x11/demos/XTestDemo.java diff --git a/jnalib/dist/darwin.jar b/dist/darwin.jar similarity index 100% rename from jnalib/dist/darwin.jar rename to dist/darwin.jar diff --git a/jnalib/dist/doc.zip b/dist/doc.zip similarity index 100% rename from jnalib/dist/doc.zip rename to dist/doc.zip diff --git a/jnalib/dist/freebsd-amd64.jar b/dist/freebsd-amd64.jar similarity index 100% rename from jnalib/dist/freebsd-amd64.jar rename to dist/freebsd-amd64.jar diff --git a/jnalib/dist/freebsd-i386.jar b/dist/freebsd-i386.jar similarity index 100% rename from jnalib/dist/freebsd-i386.jar rename to dist/freebsd-i386.jar diff --git a/jnalib/dist/jna.jar b/dist/jna.jar similarity index 100% rename from jnalib/dist/jna.jar rename to dist/jna.jar diff --git a/jnalib/dist/jnacontrib/demo-alphamask.jar b/dist/jnacontrib/demo-alphamask.jar similarity index 100% rename from jnalib/dist/jnacontrib/demo-alphamask.jar rename to dist/jnacontrib/demo-alphamask.jar diff --git a/jnalib/dist/jnacontrib/demo-balloonmanager.jar b/dist/jnacontrib/demo-balloonmanager.jar similarity index 100% rename from jnalib/dist/jnacontrib/demo-balloonmanager.jar rename to dist/jnacontrib/demo-balloonmanager.jar diff --git a/jnalib/dist/jnacontrib/demo-balloontips.jar b/dist/jnacontrib/demo-balloontips.jar similarity index 100% rename from jnalib/dist/jnacontrib/demo-balloontips.jar rename to dist/jnacontrib/demo-balloontips.jar diff --git a/jnalib/dist/jnacontrib/demo-dnd.jar b/dist/jnacontrib/demo-dnd.jar similarity index 100% rename from jnalib/dist/jnacontrib/demo-dnd.jar rename to dist/jnacontrib/demo-dnd.jar diff --git a/jnalib/dist/jnacontrib/demo-shapedwindow.jar b/dist/jnacontrib/demo-shapedwindow.jar similarity index 100% rename from jnalib/dist/jnacontrib/demo-shapedwindow.jar rename to dist/jnacontrib/demo-shapedwindow.jar diff --git a/jnalib/dist/jnacontrib/demo-w32keyhook.jar b/dist/jnacontrib/demo-w32keyhook.jar similarity index 100% rename from jnalib/dist/jnacontrib/demo-w32keyhook.jar rename to dist/jnacontrib/demo-w32keyhook.jar diff --git a/jnalib/dist/jnacontrib/demo-x11.jar b/dist/jnacontrib/demo-x11.jar similarity index 100% rename from jnalib/dist/jnacontrib/demo-x11.jar rename to dist/jnacontrib/demo-x11.jar diff --git a/jnalib/dist/linux-amd64.jar b/dist/linux-amd64.jar similarity index 100% rename from jnalib/dist/linux-amd64.jar rename to dist/linux-amd64.jar diff --git a/jnalib/dist/linux-i386.jar b/dist/linux-i386.jar similarity index 100% rename from jnalib/dist/linux-i386.jar rename to dist/linux-i386.jar diff --git a/jnalib/dist/linux-ia64.jar b/dist/linux-ia64.jar similarity index 100% rename from jnalib/dist/linux-ia64.jar rename to dist/linux-ia64.jar diff --git a/jnalib/dist/openbsd-i386.jar b/dist/openbsd-i386.jar similarity index 100% rename from jnalib/dist/openbsd-i386.jar rename to dist/openbsd-i386.jar diff --git a/jnalib/dist/out-of-date.jar b/dist/out-of-date.jar similarity index 100% rename from jnalib/dist/out-of-date.jar rename to dist/out-of-date.jar diff --git a/jnalib/dist/platform.jar b/dist/platform.jar similarity index 100% rename from jnalib/dist/platform.jar rename to dist/platform.jar diff --git a/jnalib/dist/src-full.zip b/dist/src-full.zip similarity index 100% rename from jnalib/dist/src-full.zip rename to dist/src-full.zip diff --git a/jnalib/dist/src.zip b/dist/src.zip similarity index 100% rename from jnalib/dist/src.zip rename to dist/src.zip diff --git a/jnalib/dist/sunos-amd64.jar b/dist/sunos-amd64.jar similarity index 100% rename from jnalib/dist/sunos-amd64.jar rename to dist/sunos-amd64.jar diff --git a/jnalib/dist/sunos-sparc.jar b/dist/sunos-sparc.jar similarity index 100% rename from jnalib/dist/sunos-sparc.jar rename to dist/sunos-sparc.jar diff --git a/jnalib/dist/sunos-sparcv9.jar b/dist/sunos-sparcv9.jar similarity index 100% rename from jnalib/dist/sunos-sparcv9.jar rename to dist/sunos-sparcv9.jar diff --git a/jnalib/dist/sunos-x86.jar b/dist/sunos-x86.jar similarity index 100% rename from jnalib/dist/sunos-x86.jar rename to dist/sunos-x86.jar diff --git a/jnalib/dist/win32-amd64.jar b/dist/win32-amd64.jar similarity index 100% rename from jnalib/dist/win32-amd64.jar rename to dist/win32-amd64.jar diff --git a/jnalib/dist/win32-x86.jar b/dist/win32-x86.jar similarity index 100% rename from jnalib/dist/win32-x86.jar rename to dist/win32-x86.jar diff --git a/jnalib/jna.keystore b/jna.keystore similarity index 100% rename from jnalib/jna.keystore rename to jna.keystore diff --git a/jnalib/build.xml b/jnalib/build.xml deleted file mode 100644 index 33c8306451..0000000000 --- a/jnalib/build.xml +++ /dev/null @@ -1,692 +0,0 @@ - - - Builds and tests JNA - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Java version ${java.version}, compatibility: ${compatibility} - JNA version ${jna.version}, native ${jni.version} - ${java.vm.name} (${java.vm.vendor}, ${java.vm.version}) - java.home=${java.home} - java.library.path=${java.library.path} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - -
-
- - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Invalidating native code, new checksum is ${md5} - - - - - - - - - - - - - - - - - API for native code has changed. Re-run this build after updating jni.version and jni.md5 in build.xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Saving test results in ${results.junit} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - View test report in file://${reports.junit}/index.html - - - - One or more tests failed - - - - - - - - - - - - - - - - - - - - Reports generated in ${reports.clover} - - - - - - - - - - - - - - - - - - JNA API Documentation -
${header}
- ${footer} - - - - - - - - - - - - - - - - - - -
-
- - - - - -
- - - - - - -
-
- - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - diff --git a/jnalib/lib/clover.jar b/lib/clover.jar similarity index 100% rename from jnalib/lib/clover.jar rename to lib/clover.jar diff --git a/jnalib/lib/clover.license b/lib/clover.license similarity index 100% rename from jnalib/lib/clover.license rename to lib/clover.license diff --git a/jnalib/lib/junit.jar b/lib/junit.jar similarity index 100% rename from jnalib/lib/junit.jar rename to lib/junit.jar diff --git a/jnalib/native/Makefile b/native/Makefile similarity index 100% rename from jnalib/native/Makefile rename to native/Makefile diff --git a/jnalib/native/README.libffi b/native/README.libffi similarity index 100% rename from jnalib/native/README.libffi rename to native/README.libffi diff --git a/jnalib/native/callback.c b/native/callback.c similarity index 100% rename from jnalib/native/callback.c rename to native/callback.c diff --git a/jnalib/native/cc.sh b/native/cc.sh similarity index 100% rename from jnalib/native/cc.sh rename to native/cc.sh diff --git a/jnalib/native/dispatch.c b/native/dispatch.c similarity index 100% rename from jnalib/native/dispatch.c rename to native/dispatch.c diff --git a/jnalib/native/dispatch.h b/native/dispatch.h similarity index 100% rename from jnalib/native/dispatch.h rename to native/dispatch.h diff --git a/jnalib/native/jnidispatch.rc b/native/jnidispatch.rc similarity index 100% rename from jnalib/native/jnidispatch.rc rename to native/jnidispatch.rc diff --git a/jnalib/native/ld.sh b/native/ld.sh similarity index 100% rename from jnalib/native/ld.sh rename to native/ld.sh diff --git a/jnalib/native/libffi/ChangeLog b/native/libffi/ChangeLog similarity index 100% rename from jnalib/native/libffi/ChangeLog rename to native/libffi/ChangeLog diff --git a/jnalib/native/libffi/ChangeLog.libffi b/native/libffi/ChangeLog.libffi similarity index 100% rename from jnalib/native/libffi/ChangeLog.libffi rename to native/libffi/ChangeLog.libffi diff --git a/jnalib/native/libffi/ChangeLog.libgcj b/native/libffi/ChangeLog.libgcj similarity index 100% rename from jnalib/native/libffi/ChangeLog.libgcj rename to native/libffi/ChangeLog.libgcj diff --git a/jnalib/native/libffi/ChangeLog.v1 b/native/libffi/ChangeLog.v1 similarity index 100% rename from jnalib/native/libffi/ChangeLog.v1 rename to native/libffi/ChangeLog.v1 diff --git a/jnalib/native/libffi/LICENSE b/native/libffi/LICENSE similarity index 100% rename from jnalib/native/libffi/LICENSE rename to native/libffi/LICENSE diff --git a/jnalib/native/libffi/Makefile.am b/native/libffi/Makefile.am similarity index 100% rename from jnalib/native/libffi/Makefile.am rename to native/libffi/Makefile.am diff --git a/jnalib/native/libffi/Makefile.in b/native/libffi/Makefile.in similarity index 100% rename from jnalib/native/libffi/Makefile.in rename to native/libffi/Makefile.in diff --git a/jnalib/native/libffi/README b/native/libffi/README similarity index 100% rename from jnalib/native/libffi/README rename to native/libffi/README diff --git a/jnalib/native/libffi/README.jna b/native/libffi/README.jna similarity index 100% rename from jnalib/native/libffi/README.jna rename to native/libffi/README.jna diff --git a/jnalib/native/libffi/acinclude.m4 b/native/libffi/acinclude.m4 similarity index 100% rename from jnalib/native/libffi/acinclude.m4 rename to native/libffi/acinclude.m4 diff --git a/jnalib/native/libffi/aclocal.m4 b/native/libffi/aclocal.m4 similarity index 100% rename from jnalib/native/libffi/aclocal.m4 rename to native/libffi/aclocal.m4 diff --git a/jnalib/native/libffi/build-ios.sh b/native/libffi/build-ios.sh similarity index 100% rename from jnalib/native/libffi/build-ios.sh rename to native/libffi/build-ios.sh diff --git a/jnalib/native/libffi/compile b/native/libffi/compile similarity index 100% rename from jnalib/native/libffi/compile rename to native/libffi/compile diff --git a/jnalib/native/libffi/config.guess b/native/libffi/config.guess similarity index 100% rename from jnalib/native/libffi/config.guess rename to native/libffi/config.guess diff --git a/jnalib/native/libffi/config.sub b/native/libffi/config.sub similarity index 100% rename from jnalib/native/libffi/config.sub rename to native/libffi/config.sub diff --git a/jnalib/native/libffi/configure b/native/libffi/configure similarity index 100% rename from jnalib/native/libffi/configure rename to native/libffi/configure diff --git a/jnalib/native/libffi/configure.ac b/native/libffi/configure.ac similarity index 100% rename from jnalib/native/libffi/configure.ac rename to native/libffi/configure.ac diff --git a/jnalib/native/libffi/configure.host b/native/libffi/configure.host similarity index 100% rename from jnalib/native/libffi/configure.host rename to native/libffi/configure.host diff --git a/jnalib/native/libffi/depcomp b/native/libffi/depcomp similarity index 100% rename from jnalib/native/libffi/depcomp rename to native/libffi/depcomp diff --git a/jnalib/native/libffi/doc/libffi.info b/native/libffi/doc/libffi.info similarity index 100% rename from jnalib/native/libffi/doc/libffi.info rename to native/libffi/doc/libffi.info diff --git a/jnalib/native/libffi/doc/libffi.texi b/native/libffi/doc/libffi.texi similarity index 100% rename from jnalib/native/libffi/doc/libffi.texi rename to native/libffi/doc/libffi.texi diff --git a/jnalib/native/libffi/doc/stamp-vti b/native/libffi/doc/stamp-vti similarity index 100% rename from jnalib/native/libffi/doc/stamp-vti rename to native/libffi/doc/stamp-vti diff --git a/jnalib/native/libffi/doc/version.texi b/native/libffi/doc/version.texi similarity index 100% rename from jnalib/native/libffi/doc/version.texi rename to native/libffi/doc/version.texi diff --git a/jnalib/native/libffi/fficonfig.h.in b/native/libffi/fficonfig.h.in similarity index 100% rename from jnalib/native/libffi/fficonfig.h.in rename to native/libffi/fficonfig.h.in diff --git a/jnalib/native/libffi/include/Makefile.am b/native/libffi/include/Makefile.am similarity index 100% rename from jnalib/native/libffi/include/Makefile.am rename to native/libffi/include/Makefile.am diff --git a/jnalib/native/libffi/include/Makefile.in b/native/libffi/include/Makefile.in similarity index 100% rename from jnalib/native/libffi/include/Makefile.in rename to native/libffi/include/Makefile.in diff --git a/jnalib/native/libffi/include/ffi.h.in b/native/libffi/include/ffi.h.in similarity index 100% rename from jnalib/native/libffi/include/ffi.h.in rename to native/libffi/include/ffi.h.in diff --git a/jnalib/native/libffi/include/ffi_common.h b/native/libffi/include/ffi_common.h similarity index 100% rename from jnalib/native/libffi/include/ffi_common.h rename to native/libffi/include/ffi_common.h diff --git a/jnalib/native/libffi/install-sh b/native/libffi/install-sh similarity index 100% rename from jnalib/native/libffi/install-sh rename to native/libffi/install-sh diff --git a/jnalib/native/libffi/libffi.pc.in b/native/libffi/libffi.pc.in similarity index 100% rename from jnalib/native/libffi/libffi.pc.in rename to native/libffi/libffi.pc.in diff --git a/jnalib/native/libffi/libtool-version b/native/libffi/libtool-version similarity index 100% rename from jnalib/native/libffi/libtool-version rename to native/libffi/libtool-version diff --git a/jnalib/native/libffi/ltmain.sh b/native/libffi/ltmain.sh similarity index 100% rename from jnalib/native/libffi/ltmain.sh rename to native/libffi/ltmain.sh diff --git a/jnalib/native/libffi/m4/ax_cc_maxopt.m4 b/native/libffi/m4/ax_cc_maxopt.m4 similarity index 100% rename from jnalib/native/libffi/m4/ax_cc_maxopt.m4 rename to native/libffi/m4/ax_cc_maxopt.m4 diff --git a/jnalib/native/libffi/m4/ax_cflags_warn_all.m4 b/native/libffi/m4/ax_cflags_warn_all.m4 similarity index 100% rename from jnalib/native/libffi/m4/ax_cflags_warn_all.m4 rename to native/libffi/m4/ax_cflags_warn_all.m4 diff --git a/jnalib/native/libffi/m4/ax_check_compiler_flags.m4 b/native/libffi/m4/ax_check_compiler_flags.m4 similarity index 100% rename from jnalib/native/libffi/m4/ax_check_compiler_flags.m4 rename to native/libffi/m4/ax_check_compiler_flags.m4 diff --git a/jnalib/native/libffi/m4/ax_compiler_vendor.m4 b/native/libffi/m4/ax_compiler_vendor.m4 similarity index 100% rename from jnalib/native/libffi/m4/ax_compiler_vendor.m4 rename to native/libffi/m4/ax_compiler_vendor.m4 diff --git a/jnalib/native/libffi/m4/ax_configure_args.m4 b/native/libffi/m4/ax_configure_args.m4 similarity index 100% rename from jnalib/native/libffi/m4/ax_configure_args.m4 rename to native/libffi/m4/ax_configure_args.m4 diff --git a/jnalib/native/libffi/m4/ax_enable_builddir.m4 b/native/libffi/m4/ax_enable_builddir.m4 similarity index 100% rename from jnalib/native/libffi/m4/ax_enable_builddir.m4 rename to native/libffi/m4/ax_enable_builddir.m4 diff --git a/jnalib/native/libffi/m4/ax_gcc_archflag.m4 b/native/libffi/m4/ax_gcc_archflag.m4 similarity index 100% rename from jnalib/native/libffi/m4/ax_gcc_archflag.m4 rename to native/libffi/m4/ax_gcc_archflag.m4 diff --git a/jnalib/native/libffi/m4/ax_gcc_x86_cpuid.m4 b/native/libffi/m4/ax_gcc_x86_cpuid.m4 similarity index 100% rename from jnalib/native/libffi/m4/ax_gcc_x86_cpuid.m4 rename to native/libffi/m4/ax_gcc_x86_cpuid.m4 diff --git a/jnalib/native/libffi/m4/libtool.m4 b/native/libffi/m4/libtool.m4 similarity index 100% rename from jnalib/native/libffi/m4/libtool.m4 rename to native/libffi/m4/libtool.m4 diff --git a/jnalib/native/libffi/m4/ltoptions.m4 b/native/libffi/m4/ltoptions.m4 similarity index 100% rename from jnalib/native/libffi/m4/ltoptions.m4 rename to native/libffi/m4/ltoptions.m4 diff --git a/jnalib/native/libffi/m4/ltsugar.m4 b/native/libffi/m4/ltsugar.m4 similarity index 100% rename from jnalib/native/libffi/m4/ltsugar.m4 rename to native/libffi/m4/ltsugar.m4 diff --git a/jnalib/native/libffi/m4/ltversion.m4 b/native/libffi/m4/ltversion.m4 similarity index 100% rename from jnalib/native/libffi/m4/ltversion.m4 rename to native/libffi/m4/ltversion.m4 diff --git a/jnalib/native/libffi/m4/lt~obsolete.m4 b/native/libffi/m4/lt~obsolete.m4 similarity index 100% rename from jnalib/native/libffi/m4/lt~obsolete.m4 rename to native/libffi/m4/lt~obsolete.m4 diff --git a/jnalib/native/libffi/man/Makefile.am b/native/libffi/man/Makefile.am similarity index 100% rename from jnalib/native/libffi/man/Makefile.am rename to native/libffi/man/Makefile.am diff --git a/jnalib/native/libffi/man/Makefile.in b/native/libffi/man/Makefile.in similarity index 100% rename from jnalib/native/libffi/man/Makefile.in rename to native/libffi/man/Makefile.in diff --git a/jnalib/native/libffi/man/ffi.3 b/native/libffi/man/ffi.3 similarity index 100% rename from jnalib/native/libffi/man/ffi.3 rename to native/libffi/man/ffi.3 diff --git a/jnalib/native/libffi/man/ffi_call.3 b/native/libffi/man/ffi_call.3 similarity index 100% rename from jnalib/native/libffi/man/ffi_call.3 rename to native/libffi/man/ffi_call.3 diff --git a/jnalib/native/libffi/man/ffi_prep_cif.3 b/native/libffi/man/ffi_prep_cif.3 similarity index 100% rename from jnalib/native/libffi/man/ffi_prep_cif.3 rename to native/libffi/man/ffi_prep_cif.3 diff --git a/jnalib/native/libffi/mdate-sh b/native/libffi/mdate-sh similarity index 100% rename from jnalib/native/libffi/mdate-sh rename to native/libffi/mdate-sh diff --git a/jnalib/native/libffi/missing b/native/libffi/missing similarity index 100% rename from jnalib/native/libffi/missing rename to native/libffi/missing diff --git a/jnalib/native/libffi/msvcc.sh b/native/libffi/msvcc.sh similarity index 100% rename from jnalib/native/libffi/msvcc.sh rename to native/libffi/msvcc.sh diff --git a/jnalib/native/libffi/src/alpha/ffi.c b/native/libffi/src/alpha/ffi.c similarity index 100% rename from jnalib/native/libffi/src/alpha/ffi.c rename to native/libffi/src/alpha/ffi.c diff --git a/jnalib/native/libffi/src/alpha/ffitarget.h b/native/libffi/src/alpha/ffitarget.h similarity index 100% rename from jnalib/native/libffi/src/alpha/ffitarget.h rename to native/libffi/src/alpha/ffitarget.h diff --git a/jnalib/native/libffi/src/alpha/osf.S b/native/libffi/src/alpha/osf.S similarity index 100% rename from jnalib/native/libffi/src/alpha/osf.S rename to native/libffi/src/alpha/osf.S diff --git a/jnalib/native/libffi/src/arm/ffi.c b/native/libffi/src/arm/ffi.c similarity index 100% rename from jnalib/native/libffi/src/arm/ffi.c rename to native/libffi/src/arm/ffi.c diff --git a/jnalib/native/libffi/src/arm/ffitarget.h b/native/libffi/src/arm/ffitarget.h similarity index 100% rename from jnalib/native/libffi/src/arm/ffitarget.h rename to native/libffi/src/arm/ffitarget.h diff --git a/jnalib/native/libffi/src/arm/gentramp.sh b/native/libffi/src/arm/gentramp.sh similarity index 100% rename from jnalib/native/libffi/src/arm/gentramp.sh rename to native/libffi/src/arm/gentramp.sh diff --git a/jnalib/native/libffi/src/arm/sysv.S b/native/libffi/src/arm/sysv.S similarity index 100% rename from jnalib/native/libffi/src/arm/sysv.S rename to native/libffi/src/arm/sysv.S diff --git a/jnalib/native/libffi/src/arm/trampoline.S b/native/libffi/src/arm/trampoline.S similarity index 100% rename from jnalib/native/libffi/src/arm/trampoline.S rename to native/libffi/src/arm/trampoline.S diff --git a/jnalib/native/libffi/src/avr32/ffi.c b/native/libffi/src/avr32/ffi.c similarity index 100% rename from jnalib/native/libffi/src/avr32/ffi.c rename to native/libffi/src/avr32/ffi.c diff --git a/jnalib/native/libffi/src/avr32/ffitarget.h b/native/libffi/src/avr32/ffitarget.h similarity index 100% rename from jnalib/native/libffi/src/avr32/ffitarget.h rename to native/libffi/src/avr32/ffitarget.h diff --git a/jnalib/native/libffi/src/avr32/sysv.S b/native/libffi/src/avr32/sysv.S similarity index 100% rename from jnalib/native/libffi/src/avr32/sysv.S rename to native/libffi/src/avr32/sysv.S diff --git a/jnalib/native/libffi/src/closures.c b/native/libffi/src/closures.c similarity index 100% rename from jnalib/native/libffi/src/closures.c rename to native/libffi/src/closures.c diff --git a/jnalib/native/libffi/src/cris/ffi.c b/native/libffi/src/cris/ffi.c similarity index 100% rename from jnalib/native/libffi/src/cris/ffi.c rename to native/libffi/src/cris/ffi.c diff --git a/jnalib/native/libffi/src/cris/ffitarget.h b/native/libffi/src/cris/ffitarget.h similarity index 100% rename from jnalib/native/libffi/src/cris/ffitarget.h rename to native/libffi/src/cris/ffitarget.h diff --git a/jnalib/native/libffi/src/cris/sysv.S b/native/libffi/src/cris/sysv.S similarity index 100% rename from jnalib/native/libffi/src/cris/sysv.S rename to native/libffi/src/cris/sysv.S diff --git a/jnalib/native/libffi/src/debug.c b/native/libffi/src/debug.c similarity index 100% rename from jnalib/native/libffi/src/debug.c rename to native/libffi/src/debug.c diff --git a/jnalib/native/libffi/src/dlmalloc.c b/native/libffi/src/dlmalloc.c similarity index 100% rename from jnalib/native/libffi/src/dlmalloc.c rename to native/libffi/src/dlmalloc.c diff --git a/jnalib/native/libffi/src/frv/eabi.S b/native/libffi/src/frv/eabi.S similarity index 100% rename from jnalib/native/libffi/src/frv/eabi.S rename to native/libffi/src/frv/eabi.S diff --git a/jnalib/native/libffi/src/frv/ffi.c b/native/libffi/src/frv/ffi.c similarity index 100% rename from jnalib/native/libffi/src/frv/ffi.c rename to native/libffi/src/frv/ffi.c diff --git a/jnalib/native/libffi/src/frv/ffitarget.h b/native/libffi/src/frv/ffitarget.h similarity index 100% rename from jnalib/native/libffi/src/frv/ffitarget.h rename to native/libffi/src/frv/ffitarget.h diff --git a/jnalib/native/libffi/src/ia64/ffi.c b/native/libffi/src/ia64/ffi.c similarity index 100% rename from jnalib/native/libffi/src/ia64/ffi.c rename to native/libffi/src/ia64/ffi.c diff --git a/jnalib/native/libffi/src/ia64/ffitarget.h b/native/libffi/src/ia64/ffitarget.h similarity index 100% rename from jnalib/native/libffi/src/ia64/ffitarget.h rename to native/libffi/src/ia64/ffitarget.h diff --git a/jnalib/native/libffi/src/ia64/ia64_flags.h b/native/libffi/src/ia64/ia64_flags.h similarity index 100% rename from jnalib/native/libffi/src/ia64/ia64_flags.h rename to native/libffi/src/ia64/ia64_flags.h diff --git a/jnalib/native/libffi/src/ia64/unix.S b/native/libffi/src/ia64/unix.S similarity index 100% rename from jnalib/native/libffi/src/ia64/unix.S rename to native/libffi/src/ia64/unix.S diff --git a/jnalib/native/libffi/src/java_raw_api.c b/native/libffi/src/java_raw_api.c similarity index 100% rename from jnalib/native/libffi/src/java_raw_api.c rename to native/libffi/src/java_raw_api.c diff --git a/jnalib/native/libffi/src/m32r/ffi.c b/native/libffi/src/m32r/ffi.c similarity index 100% rename from jnalib/native/libffi/src/m32r/ffi.c rename to native/libffi/src/m32r/ffi.c diff --git a/jnalib/native/libffi/src/m32r/ffitarget.h b/native/libffi/src/m32r/ffitarget.h similarity index 100% rename from jnalib/native/libffi/src/m32r/ffitarget.h rename to native/libffi/src/m32r/ffitarget.h diff --git a/jnalib/native/libffi/src/m32r/sysv.S b/native/libffi/src/m32r/sysv.S similarity index 100% rename from jnalib/native/libffi/src/m32r/sysv.S rename to native/libffi/src/m32r/sysv.S diff --git a/jnalib/native/libffi/src/m68k/ffi.c b/native/libffi/src/m68k/ffi.c similarity index 100% rename from jnalib/native/libffi/src/m68k/ffi.c rename to native/libffi/src/m68k/ffi.c diff --git a/jnalib/native/libffi/src/m68k/ffitarget.h b/native/libffi/src/m68k/ffitarget.h similarity index 100% rename from jnalib/native/libffi/src/m68k/ffitarget.h rename to native/libffi/src/m68k/ffitarget.h diff --git a/jnalib/native/libffi/src/m68k/sysv.S b/native/libffi/src/m68k/sysv.S similarity index 100% rename from jnalib/native/libffi/src/m68k/sysv.S rename to native/libffi/src/m68k/sysv.S diff --git a/jnalib/native/libffi/src/mips/ffi.c b/native/libffi/src/mips/ffi.c similarity index 100% rename from jnalib/native/libffi/src/mips/ffi.c rename to native/libffi/src/mips/ffi.c diff --git a/jnalib/native/libffi/src/mips/ffitarget.h b/native/libffi/src/mips/ffitarget.h similarity index 100% rename from jnalib/native/libffi/src/mips/ffitarget.h rename to native/libffi/src/mips/ffitarget.h diff --git a/jnalib/native/libffi/src/mips/n32.S b/native/libffi/src/mips/n32.S similarity index 100% rename from jnalib/native/libffi/src/mips/n32.S rename to native/libffi/src/mips/n32.S diff --git a/jnalib/native/libffi/src/mips/o32.S b/native/libffi/src/mips/o32.S similarity index 100% rename from jnalib/native/libffi/src/mips/o32.S rename to native/libffi/src/mips/o32.S diff --git a/jnalib/native/libffi/src/moxie/eabi.S b/native/libffi/src/moxie/eabi.S similarity index 100% rename from jnalib/native/libffi/src/moxie/eabi.S rename to native/libffi/src/moxie/eabi.S diff --git a/jnalib/native/libffi/src/moxie/ffi.c b/native/libffi/src/moxie/ffi.c similarity index 100% rename from jnalib/native/libffi/src/moxie/ffi.c rename to native/libffi/src/moxie/ffi.c diff --git a/jnalib/native/libffi/src/pa/ffi.c b/native/libffi/src/pa/ffi.c similarity index 100% rename from jnalib/native/libffi/src/pa/ffi.c rename to native/libffi/src/pa/ffi.c diff --git a/jnalib/native/libffi/src/pa/ffitarget.h b/native/libffi/src/pa/ffitarget.h similarity index 100% rename from jnalib/native/libffi/src/pa/ffitarget.h rename to native/libffi/src/pa/ffitarget.h diff --git a/jnalib/native/libffi/src/pa/hpux32.S b/native/libffi/src/pa/hpux32.S similarity index 100% rename from jnalib/native/libffi/src/pa/hpux32.S rename to native/libffi/src/pa/hpux32.S diff --git a/jnalib/native/libffi/src/pa/linux.S b/native/libffi/src/pa/linux.S similarity index 100% rename from jnalib/native/libffi/src/pa/linux.S rename to native/libffi/src/pa/linux.S diff --git a/jnalib/native/libffi/src/powerpc/aix.S b/native/libffi/src/powerpc/aix.S similarity index 100% rename from jnalib/native/libffi/src/powerpc/aix.S rename to native/libffi/src/powerpc/aix.S diff --git a/jnalib/native/libffi/src/powerpc/aix_closure.S b/native/libffi/src/powerpc/aix_closure.S similarity index 100% rename from jnalib/native/libffi/src/powerpc/aix_closure.S rename to native/libffi/src/powerpc/aix_closure.S diff --git a/jnalib/native/libffi/src/powerpc/asm.h b/native/libffi/src/powerpc/asm.h similarity index 100% rename from jnalib/native/libffi/src/powerpc/asm.h rename to native/libffi/src/powerpc/asm.h diff --git a/jnalib/native/libffi/src/powerpc/darwin.S b/native/libffi/src/powerpc/darwin.S similarity index 100% rename from jnalib/native/libffi/src/powerpc/darwin.S rename to native/libffi/src/powerpc/darwin.S diff --git a/jnalib/native/libffi/src/powerpc/darwin_closure.S b/native/libffi/src/powerpc/darwin_closure.S similarity index 100% rename from jnalib/native/libffi/src/powerpc/darwin_closure.S rename to native/libffi/src/powerpc/darwin_closure.S diff --git a/jnalib/native/libffi/src/powerpc/ffi.c b/native/libffi/src/powerpc/ffi.c similarity index 100% rename from jnalib/native/libffi/src/powerpc/ffi.c rename to native/libffi/src/powerpc/ffi.c diff --git a/jnalib/native/libffi/src/powerpc/ffi_darwin.c b/native/libffi/src/powerpc/ffi_darwin.c similarity index 100% rename from jnalib/native/libffi/src/powerpc/ffi_darwin.c rename to native/libffi/src/powerpc/ffi_darwin.c diff --git a/jnalib/native/libffi/src/powerpc/ffitarget.h b/native/libffi/src/powerpc/ffitarget.h similarity index 100% rename from jnalib/native/libffi/src/powerpc/ffitarget.h rename to native/libffi/src/powerpc/ffitarget.h diff --git a/jnalib/native/libffi/src/powerpc/linux64.S b/native/libffi/src/powerpc/linux64.S similarity index 100% rename from jnalib/native/libffi/src/powerpc/linux64.S rename to native/libffi/src/powerpc/linux64.S diff --git a/jnalib/native/libffi/src/powerpc/linux64_closure.S b/native/libffi/src/powerpc/linux64_closure.S similarity index 100% rename from jnalib/native/libffi/src/powerpc/linux64_closure.S rename to native/libffi/src/powerpc/linux64_closure.S diff --git a/jnalib/native/libffi/src/powerpc/ppc_closure.S b/native/libffi/src/powerpc/ppc_closure.S similarity index 100% rename from jnalib/native/libffi/src/powerpc/ppc_closure.S rename to native/libffi/src/powerpc/ppc_closure.S diff --git a/jnalib/native/libffi/src/powerpc/sysv.S b/native/libffi/src/powerpc/sysv.S similarity index 100% rename from jnalib/native/libffi/src/powerpc/sysv.S rename to native/libffi/src/powerpc/sysv.S diff --git a/jnalib/native/libffi/src/prep_cif.c b/native/libffi/src/prep_cif.c similarity index 100% rename from jnalib/native/libffi/src/prep_cif.c rename to native/libffi/src/prep_cif.c diff --git a/jnalib/native/libffi/src/raw_api.c b/native/libffi/src/raw_api.c similarity index 100% rename from jnalib/native/libffi/src/raw_api.c rename to native/libffi/src/raw_api.c diff --git a/jnalib/native/libffi/src/s390/ffi.c b/native/libffi/src/s390/ffi.c similarity index 100% rename from jnalib/native/libffi/src/s390/ffi.c rename to native/libffi/src/s390/ffi.c diff --git a/jnalib/native/libffi/src/s390/ffitarget.h b/native/libffi/src/s390/ffitarget.h similarity index 100% rename from jnalib/native/libffi/src/s390/ffitarget.h rename to native/libffi/src/s390/ffitarget.h diff --git a/jnalib/native/libffi/src/s390/sysv.S b/native/libffi/src/s390/sysv.S similarity index 100% rename from jnalib/native/libffi/src/s390/sysv.S rename to native/libffi/src/s390/sysv.S diff --git a/jnalib/native/libffi/src/sh/ffi.c b/native/libffi/src/sh/ffi.c similarity index 100% rename from jnalib/native/libffi/src/sh/ffi.c rename to native/libffi/src/sh/ffi.c diff --git a/jnalib/native/libffi/src/sh/ffitarget.h b/native/libffi/src/sh/ffitarget.h similarity index 100% rename from jnalib/native/libffi/src/sh/ffitarget.h rename to native/libffi/src/sh/ffitarget.h diff --git a/jnalib/native/libffi/src/sh/sysv.S b/native/libffi/src/sh/sysv.S similarity index 100% rename from jnalib/native/libffi/src/sh/sysv.S rename to native/libffi/src/sh/sysv.S diff --git a/jnalib/native/libffi/src/sh64/ffi.c b/native/libffi/src/sh64/ffi.c similarity index 100% rename from jnalib/native/libffi/src/sh64/ffi.c rename to native/libffi/src/sh64/ffi.c diff --git a/jnalib/native/libffi/src/sh64/ffitarget.h b/native/libffi/src/sh64/ffitarget.h similarity index 100% rename from jnalib/native/libffi/src/sh64/ffitarget.h rename to native/libffi/src/sh64/ffitarget.h diff --git a/jnalib/native/libffi/src/sh64/sysv.S b/native/libffi/src/sh64/sysv.S similarity index 100% rename from jnalib/native/libffi/src/sh64/sysv.S rename to native/libffi/src/sh64/sysv.S diff --git a/jnalib/native/libffi/src/sparc/ffi.c b/native/libffi/src/sparc/ffi.c similarity index 100% rename from jnalib/native/libffi/src/sparc/ffi.c rename to native/libffi/src/sparc/ffi.c diff --git a/jnalib/native/libffi/src/sparc/ffitarget.h b/native/libffi/src/sparc/ffitarget.h similarity index 100% rename from jnalib/native/libffi/src/sparc/ffitarget.h rename to native/libffi/src/sparc/ffitarget.h diff --git a/jnalib/native/libffi/src/sparc/v8.S b/native/libffi/src/sparc/v8.S similarity index 100% rename from jnalib/native/libffi/src/sparc/v8.S rename to native/libffi/src/sparc/v8.S diff --git a/jnalib/native/libffi/src/sparc/v9.S b/native/libffi/src/sparc/v9.S similarity index 100% rename from jnalib/native/libffi/src/sparc/v9.S rename to native/libffi/src/sparc/v9.S diff --git a/jnalib/native/libffi/src/types.c b/native/libffi/src/types.c similarity index 100% rename from jnalib/native/libffi/src/types.c rename to native/libffi/src/types.c diff --git a/jnalib/native/libffi/src/x86/darwin.S b/native/libffi/src/x86/darwin.S similarity index 100% rename from jnalib/native/libffi/src/x86/darwin.S rename to native/libffi/src/x86/darwin.S diff --git a/jnalib/native/libffi/src/x86/darwin64.S b/native/libffi/src/x86/darwin64.S similarity index 100% rename from jnalib/native/libffi/src/x86/darwin64.S rename to native/libffi/src/x86/darwin64.S diff --git a/jnalib/native/libffi/src/x86/ffi.c b/native/libffi/src/x86/ffi.c similarity index 100% rename from jnalib/native/libffi/src/x86/ffi.c rename to native/libffi/src/x86/ffi.c diff --git a/jnalib/native/libffi/src/x86/ffi64.c b/native/libffi/src/x86/ffi64.c similarity index 100% rename from jnalib/native/libffi/src/x86/ffi64.c rename to native/libffi/src/x86/ffi64.c diff --git a/jnalib/native/libffi/src/x86/ffitarget.h b/native/libffi/src/x86/ffitarget.h similarity index 100% rename from jnalib/native/libffi/src/x86/ffitarget.h rename to native/libffi/src/x86/ffitarget.h diff --git a/jnalib/native/libffi/src/x86/freebsd.S b/native/libffi/src/x86/freebsd.S similarity index 100% rename from jnalib/native/libffi/src/x86/freebsd.S rename to native/libffi/src/x86/freebsd.S diff --git a/jnalib/native/libffi/src/x86/sysv.S b/native/libffi/src/x86/sysv.S similarity index 100% rename from jnalib/native/libffi/src/x86/sysv.S rename to native/libffi/src/x86/sysv.S diff --git a/jnalib/native/libffi/src/x86/unix64.S b/native/libffi/src/x86/unix64.S similarity index 100% rename from jnalib/native/libffi/src/x86/unix64.S rename to native/libffi/src/x86/unix64.S diff --git a/jnalib/native/libffi/src/x86/win32.S b/native/libffi/src/x86/win32.S similarity index 100% rename from jnalib/native/libffi/src/x86/win32.S rename to native/libffi/src/x86/win32.S diff --git a/jnalib/native/libffi/src/x86/win64.S b/native/libffi/src/x86/win64.S similarity index 100% rename from jnalib/native/libffi/src/x86/win64.S rename to native/libffi/src/x86/win64.S diff --git a/jnalib/native/libffi/testsuite/Makefile.am b/native/libffi/testsuite/Makefile.am similarity index 100% rename from jnalib/native/libffi/testsuite/Makefile.am rename to native/libffi/testsuite/Makefile.am diff --git a/jnalib/native/libffi/testsuite/Makefile.in b/native/libffi/testsuite/Makefile.in similarity index 100% rename from jnalib/native/libffi/testsuite/Makefile.in rename to native/libffi/testsuite/Makefile.in diff --git a/jnalib/native/libffi/testsuite/config/default.exp b/native/libffi/testsuite/config/default.exp similarity index 100% rename from jnalib/native/libffi/testsuite/config/default.exp rename to native/libffi/testsuite/config/default.exp diff --git a/jnalib/native/libffi/testsuite/lib/libffi.exp b/native/libffi/testsuite/lib/libffi.exp similarity index 100% rename from jnalib/native/libffi/testsuite/lib/libffi.exp rename to native/libffi/testsuite/lib/libffi.exp diff --git a/jnalib/native/libffi/testsuite/lib/target-libpath.exp b/native/libffi/testsuite/lib/target-libpath.exp similarity index 100% rename from jnalib/native/libffi/testsuite/lib/target-libpath.exp rename to native/libffi/testsuite/lib/target-libpath.exp diff --git a/jnalib/native/libffi/testsuite/lib/wrapper.exp b/native/libffi/testsuite/lib/wrapper.exp similarity index 100% rename from jnalib/native/libffi/testsuite/lib/wrapper.exp rename to native/libffi/testsuite/lib/wrapper.exp diff --git a/jnalib/native/libffi/testsuite/libffi.call/call.exp b/native/libffi/testsuite/libffi.call/call.exp similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/call.exp rename to native/libffi/testsuite/libffi.call/call.exp diff --git a/jnalib/native/libffi/testsuite/libffi.call/closure_fn0.c b/native/libffi/testsuite/libffi.call/closure_fn0.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/closure_fn0.c rename to native/libffi/testsuite/libffi.call/closure_fn0.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/closure_fn1.c b/native/libffi/testsuite/libffi.call/closure_fn1.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/closure_fn1.c rename to native/libffi/testsuite/libffi.call/closure_fn1.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/closure_fn2.c b/native/libffi/testsuite/libffi.call/closure_fn2.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/closure_fn2.c rename to native/libffi/testsuite/libffi.call/closure_fn2.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/closure_fn3.c b/native/libffi/testsuite/libffi.call/closure_fn3.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/closure_fn3.c rename to native/libffi/testsuite/libffi.call/closure_fn3.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/closure_fn4.c b/native/libffi/testsuite/libffi.call/closure_fn4.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/closure_fn4.c rename to native/libffi/testsuite/libffi.call/closure_fn4.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/closure_fn5.c b/native/libffi/testsuite/libffi.call/closure_fn5.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/closure_fn5.c rename to native/libffi/testsuite/libffi.call/closure_fn5.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/closure_fn6.c b/native/libffi/testsuite/libffi.call/closure_fn6.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/closure_fn6.c rename to native/libffi/testsuite/libffi.call/closure_fn6.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/closure_loc_fn0.c b/native/libffi/testsuite/libffi.call/closure_loc_fn0.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/closure_loc_fn0.c rename to native/libffi/testsuite/libffi.call/closure_loc_fn0.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/closure_stdcall.c b/native/libffi/testsuite/libffi.call/closure_stdcall.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/closure_stdcall.c rename to native/libffi/testsuite/libffi.call/closure_stdcall.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_12byte.c b/native/libffi/testsuite/libffi.call/cls_12byte.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_12byte.c rename to native/libffi/testsuite/libffi.call/cls_12byte.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_16byte.c b/native/libffi/testsuite/libffi.call/cls_16byte.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_16byte.c rename to native/libffi/testsuite/libffi.call/cls_16byte.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_18byte.c b/native/libffi/testsuite/libffi.call/cls_18byte.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_18byte.c rename to native/libffi/testsuite/libffi.call/cls_18byte.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_19byte.c b/native/libffi/testsuite/libffi.call/cls_19byte.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_19byte.c rename to native/libffi/testsuite/libffi.call/cls_19byte.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_1_1byte.c b/native/libffi/testsuite/libffi.call/cls_1_1byte.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_1_1byte.c rename to native/libffi/testsuite/libffi.call/cls_1_1byte.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_20byte.c b/native/libffi/testsuite/libffi.call/cls_20byte.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_20byte.c rename to native/libffi/testsuite/libffi.call/cls_20byte.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_20byte1.c b/native/libffi/testsuite/libffi.call/cls_20byte1.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_20byte1.c rename to native/libffi/testsuite/libffi.call/cls_20byte1.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_24byte.c b/native/libffi/testsuite/libffi.call/cls_24byte.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_24byte.c rename to native/libffi/testsuite/libffi.call/cls_24byte.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_2byte.c b/native/libffi/testsuite/libffi.call/cls_2byte.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_2byte.c rename to native/libffi/testsuite/libffi.call/cls_2byte.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_3_1byte.c b/native/libffi/testsuite/libffi.call/cls_3_1byte.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_3_1byte.c rename to native/libffi/testsuite/libffi.call/cls_3_1byte.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_3byte1.c b/native/libffi/testsuite/libffi.call/cls_3byte1.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_3byte1.c rename to native/libffi/testsuite/libffi.call/cls_3byte1.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_3byte2.c b/native/libffi/testsuite/libffi.call/cls_3byte2.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_3byte2.c rename to native/libffi/testsuite/libffi.call/cls_3byte2.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_4_1byte.c b/native/libffi/testsuite/libffi.call/cls_4_1byte.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_4_1byte.c rename to native/libffi/testsuite/libffi.call/cls_4_1byte.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_4byte.c b/native/libffi/testsuite/libffi.call/cls_4byte.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_4byte.c rename to native/libffi/testsuite/libffi.call/cls_4byte.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_5_1_byte.c b/native/libffi/testsuite/libffi.call/cls_5_1_byte.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_5_1_byte.c rename to native/libffi/testsuite/libffi.call/cls_5_1_byte.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_5byte.c b/native/libffi/testsuite/libffi.call/cls_5byte.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_5byte.c rename to native/libffi/testsuite/libffi.call/cls_5byte.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_64byte.c b/native/libffi/testsuite/libffi.call/cls_64byte.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_64byte.c rename to native/libffi/testsuite/libffi.call/cls_64byte.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_6_1_byte.c b/native/libffi/testsuite/libffi.call/cls_6_1_byte.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_6_1_byte.c rename to native/libffi/testsuite/libffi.call/cls_6_1_byte.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_6byte.c b/native/libffi/testsuite/libffi.call/cls_6byte.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_6byte.c rename to native/libffi/testsuite/libffi.call/cls_6byte.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_7_1_byte.c b/native/libffi/testsuite/libffi.call/cls_7_1_byte.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_7_1_byte.c rename to native/libffi/testsuite/libffi.call/cls_7_1_byte.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_7byte.c b/native/libffi/testsuite/libffi.call/cls_7byte.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_7byte.c rename to native/libffi/testsuite/libffi.call/cls_7byte.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_8byte.c b/native/libffi/testsuite/libffi.call/cls_8byte.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_8byte.c rename to native/libffi/testsuite/libffi.call/cls_8byte.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_9byte1.c b/native/libffi/testsuite/libffi.call/cls_9byte1.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_9byte1.c rename to native/libffi/testsuite/libffi.call/cls_9byte1.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_9byte2.c b/native/libffi/testsuite/libffi.call/cls_9byte2.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_9byte2.c rename to native/libffi/testsuite/libffi.call/cls_9byte2.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_align_double.c b/native/libffi/testsuite/libffi.call/cls_align_double.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_align_double.c rename to native/libffi/testsuite/libffi.call/cls_align_double.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_align_float.c b/native/libffi/testsuite/libffi.call/cls_align_float.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_align_float.c rename to native/libffi/testsuite/libffi.call/cls_align_float.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_align_longdouble.c b/native/libffi/testsuite/libffi.call/cls_align_longdouble.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_align_longdouble.c rename to native/libffi/testsuite/libffi.call/cls_align_longdouble.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_align_longdouble_split.c b/native/libffi/testsuite/libffi.call/cls_align_longdouble_split.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_align_longdouble_split.c rename to native/libffi/testsuite/libffi.call/cls_align_longdouble_split.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_align_longdouble_split2.c b/native/libffi/testsuite/libffi.call/cls_align_longdouble_split2.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_align_longdouble_split2.c rename to native/libffi/testsuite/libffi.call/cls_align_longdouble_split2.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_align_pointer.c b/native/libffi/testsuite/libffi.call/cls_align_pointer.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_align_pointer.c rename to native/libffi/testsuite/libffi.call/cls_align_pointer.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_align_sint16.c b/native/libffi/testsuite/libffi.call/cls_align_sint16.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_align_sint16.c rename to native/libffi/testsuite/libffi.call/cls_align_sint16.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_align_sint32.c b/native/libffi/testsuite/libffi.call/cls_align_sint32.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_align_sint32.c rename to native/libffi/testsuite/libffi.call/cls_align_sint32.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_align_sint64.c b/native/libffi/testsuite/libffi.call/cls_align_sint64.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_align_sint64.c rename to native/libffi/testsuite/libffi.call/cls_align_sint64.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_align_uint16.c b/native/libffi/testsuite/libffi.call/cls_align_uint16.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_align_uint16.c rename to native/libffi/testsuite/libffi.call/cls_align_uint16.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_align_uint32.c b/native/libffi/testsuite/libffi.call/cls_align_uint32.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_align_uint32.c rename to native/libffi/testsuite/libffi.call/cls_align_uint32.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_align_uint64.c b/native/libffi/testsuite/libffi.call/cls_align_uint64.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_align_uint64.c rename to native/libffi/testsuite/libffi.call/cls_align_uint64.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_dbls_struct.c b/native/libffi/testsuite/libffi.call/cls_dbls_struct.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_dbls_struct.c rename to native/libffi/testsuite/libffi.call/cls_dbls_struct.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_double.c b/native/libffi/testsuite/libffi.call/cls_double.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_double.c rename to native/libffi/testsuite/libffi.call/cls_double.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_double_va.c b/native/libffi/testsuite/libffi.call/cls_double_va.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_double_va.c rename to native/libffi/testsuite/libffi.call/cls_double_va.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_float.c b/native/libffi/testsuite/libffi.call/cls_float.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_float.c rename to native/libffi/testsuite/libffi.call/cls_float.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_longdouble.c b/native/libffi/testsuite/libffi.call/cls_longdouble.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_longdouble.c rename to native/libffi/testsuite/libffi.call/cls_longdouble.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_longdouble_va.c b/native/libffi/testsuite/libffi.call/cls_longdouble_va.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_longdouble_va.c rename to native/libffi/testsuite/libffi.call/cls_longdouble_va.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_multi_schar.c b/native/libffi/testsuite/libffi.call/cls_multi_schar.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_multi_schar.c rename to native/libffi/testsuite/libffi.call/cls_multi_schar.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_multi_sshort.c b/native/libffi/testsuite/libffi.call/cls_multi_sshort.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_multi_sshort.c rename to native/libffi/testsuite/libffi.call/cls_multi_sshort.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_multi_sshortchar.c b/native/libffi/testsuite/libffi.call/cls_multi_sshortchar.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_multi_sshortchar.c rename to native/libffi/testsuite/libffi.call/cls_multi_sshortchar.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_multi_uchar.c b/native/libffi/testsuite/libffi.call/cls_multi_uchar.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_multi_uchar.c rename to native/libffi/testsuite/libffi.call/cls_multi_uchar.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_multi_ushort.c b/native/libffi/testsuite/libffi.call/cls_multi_ushort.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_multi_ushort.c rename to native/libffi/testsuite/libffi.call/cls_multi_ushort.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_multi_ushortchar.c b/native/libffi/testsuite/libffi.call/cls_multi_ushortchar.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_multi_ushortchar.c rename to native/libffi/testsuite/libffi.call/cls_multi_ushortchar.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_pointer.c b/native/libffi/testsuite/libffi.call/cls_pointer.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_pointer.c rename to native/libffi/testsuite/libffi.call/cls_pointer.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_pointer_stack.c b/native/libffi/testsuite/libffi.call/cls_pointer_stack.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_pointer_stack.c rename to native/libffi/testsuite/libffi.call/cls_pointer_stack.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_schar.c b/native/libffi/testsuite/libffi.call/cls_schar.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_schar.c rename to native/libffi/testsuite/libffi.call/cls_schar.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_sint.c b/native/libffi/testsuite/libffi.call/cls_sint.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_sint.c rename to native/libffi/testsuite/libffi.call/cls_sint.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_sshort.c b/native/libffi/testsuite/libffi.call/cls_sshort.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_sshort.c rename to native/libffi/testsuite/libffi.call/cls_sshort.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_uchar.c b/native/libffi/testsuite/libffi.call/cls_uchar.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_uchar.c rename to native/libffi/testsuite/libffi.call/cls_uchar.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_uint.c b/native/libffi/testsuite/libffi.call/cls_uint.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_uint.c rename to native/libffi/testsuite/libffi.call/cls_uint.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_ulonglong.c b/native/libffi/testsuite/libffi.call/cls_ulonglong.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_ulonglong.c rename to native/libffi/testsuite/libffi.call/cls_ulonglong.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/cls_ushort.c b/native/libffi/testsuite/libffi.call/cls_ushort.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/cls_ushort.c rename to native/libffi/testsuite/libffi.call/cls_ushort.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/err_bad_abi.c b/native/libffi/testsuite/libffi.call/err_bad_abi.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/err_bad_abi.c rename to native/libffi/testsuite/libffi.call/err_bad_abi.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/err_bad_typedef.c b/native/libffi/testsuite/libffi.call/err_bad_typedef.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/err_bad_typedef.c rename to native/libffi/testsuite/libffi.call/err_bad_typedef.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/ffitest.h b/native/libffi/testsuite/libffi.call/ffitest.h similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/ffitest.h rename to native/libffi/testsuite/libffi.call/ffitest.h diff --git a/jnalib/native/libffi/testsuite/libffi.call/float.c b/native/libffi/testsuite/libffi.call/float.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/float.c rename to native/libffi/testsuite/libffi.call/float.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/float1.c b/native/libffi/testsuite/libffi.call/float1.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/float1.c rename to native/libffi/testsuite/libffi.call/float1.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/float2.c b/native/libffi/testsuite/libffi.call/float2.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/float2.c rename to native/libffi/testsuite/libffi.call/float2.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/float3.c b/native/libffi/testsuite/libffi.call/float3.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/float3.c rename to native/libffi/testsuite/libffi.call/float3.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/float4.c b/native/libffi/testsuite/libffi.call/float4.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/float4.c rename to native/libffi/testsuite/libffi.call/float4.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/huge_struct.c b/native/libffi/testsuite/libffi.call/huge_struct.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/huge_struct.c rename to native/libffi/testsuite/libffi.call/huge_struct.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/many.c b/native/libffi/testsuite/libffi.call/many.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/many.c rename to native/libffi/testsuite/libffi.call/many.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/many_win32.c b/native/libffi/testsuite/libffi.call/many_win32.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/many_win32.c rename to native/libffi/testsuite/libffi.call/many_win32.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/negint.c b/native/libffi/testsuite/libffi.call/negint.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/negint.c rename to native/libffi/testsuite/libffi.call/negint.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/nested_struct.c b/native/libffi/testsuite/libffi.call/nested_struct.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/nested_struct.c rename to native/libffi/testsuite/libffi.call/nested_struct.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/nested_struct1.c b/native/libffi/testsuite/libffi.call/nested_struct1.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/nested_struct1.c rename to native/libffi/testsuite/libffi.call/nested_struct1.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/nested_struct10.c b/native/libffi/testsuite/libffi.call/nested_struct10.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/nested_struct10.c rename to native/libffi/testsuite/libffi.call/nested_struct10.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/nested_struct2.c b/native/libffi/testsuite/libffi.call/nested_struct2.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/nested_struct2.c rename to native/libffi/testsuite/libffi.call/nested_struct2.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/nested_struct3.c b/native/libffi/testsuite/libffi.call/nested_struct3.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/nested_struct3.c rename to native/libffi/testsuite/libffi.call/nested_struct3.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/nested_struct4.c b/native/libffi/testsuite/libffi.call/nested_struct4.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/nested_struct4.c rename to native/libffi/testsuite/libffi.call/nested_struct4.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/nested_struct5.c b/native/libffi/testsuite/libffi.call/nested_struct5.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/nested_struct5.c rename to native/libffi/testsuite/libffi.call/nested_struct5.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/nested_struct6.c b/native/libffi/testsuite/libffi.call/nested_struct6.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/nested_struct6.c rename to native/libffi/testsuite/libffi.call/nested_struct6.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/nested_struct7.c b/native/libffi/testsuite/libffi.call/nested_struct7.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/nested_struct7.c rename to native/libffi/testsuite/libffi.call/nested_struct7.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/nested_struct8.c b/native/libffi/testsuite/libffi.call/nested_struct8.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/nested_struct8.c rename to native/libffi/testsuite/libffi.call/nested_struct8.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/nested_struct9.c b/native/libffi/testsuite/libffi.call/nested_struct9.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/nested_struct9.c rename to native/libffi/testsuite/libffi.call/nested_struct9.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/problem1.c b/native/libffi/testsuite/libffi.call/problem1.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/problem1.c rename to native/libffi/testsuite/libffi.call/problem1.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/promotion.c b/native/libffi/testsuite/libffi.call/promotion.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/promotion.c rename to native/libffi/testsuite/libffi.call/promotion.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/pyobjc-tc.c b/native/libffi/testsuite/libffi.call/pyobjc-tc.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/pyobjc-tc.c rename to native/libffi/testsuite/libffi.call/pyobjc-tc.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/return_dbl.c b/native/libffi/testsuite/libffi.call/return_dbl.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/return_dbl.c rename to native/libffi/testsuite/libffi.call/return_dbl.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/return_dbl1.c b/native/libffi/testsuite/libffi.call/return_dbl1.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/return_dbl1.c rename to native/libffi/testsuite/libffi.call/return_dbl1.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/return_dbl2.c b/native/libffi/testsuite/libffi.call/return_dbl2.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/return_dbl2.c rename to native/libffi/testsuite/libffi.call/return_dbl2.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/return_fl.c b/native/libffi/testsuite/libffi.call/return_fl.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/return_fl.c rename to native/libffi/testsuite/libffi.call/return_fl.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/return_fl1.c b/native/libffi/testsuite/libffi.call/return_fl1.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/return_fl1.c rename to native/libffi/testsuite/libffi.call/return_fl1.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/return_fl2.c b/native/libffi/testsuite/libffi.call/return_fl2.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/return_fl2.c rename to native/libffi/testsuite/libffi.call/return_fl2.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/return_fl3.c b/native/libffi/testsuite/libffi.call/return_fl3.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/return_fl3.c rename to native/libffi/testsuite/libffi.call/return_fl3.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/return_ldl.c b/native/libffi/testsuite/libffi.call/return_ldl.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/return_ldl.c rename to native/libffi/testsuite/libffi.call/return_ldl.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/return_ll.c b/native/libffi/testsuite/libffi.call/return_ll.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/return_ll.c rename to native/libffi/testsuite/libffi.call/return_ll.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/return_ll1.c b/native/libffi/testsuite/libffi.call/return_ll1.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/return_ll1.c rename to native/libffi/testsuite/libffi.call/return_ll1.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/return_sc.c b/native/libffi/testsuite/libffi.call/return_sc.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/return_sc.c rename to native/libffi/testsuite/libffi.call/return_sc.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/return_sl.c b/native/libffi/testsuite/libffi.call/return_sl.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/return_sl.c rename to native/libffi/testsuite/libffi.call/return_sl.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/return_uc.c b/native/libffi/testsuite/libffi.call/return_uc.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/return_uc.c rename to native/libffi/testsuite/libffi.call/return_uc.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/return_ul.c b/native/libffi/testsuite/libffi.call/return_ul.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/return_ul.c rename to native/libffi/testsuite/libffi.call/return_ul.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/stret_large.c b/native/libffi/testsuite/libffi.call/stret_large.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/stret_large.c rename to native/libffi/testsuite/libffi.call/stret_large.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/stret_large2.c b/native/libffi/testsuite/libffi.call/stret_large2.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/stret_large2.c rename to native/libffi/testsuite/libffi.call/stret_large2.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/stret_medium.c b/native/libffi/testsuite/libffi.call/stret_medium.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/stret_medium.c rename to native/libffi/testsuite/libffi.call/stret_medium.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/stret_medium2.c b/native/libffi/testsuite/libffi.call/stret_medium2.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/stret_medium2.c rename to native/libffi/testsuite/libffi.call/stret_medium2.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/strlen.c b/native/libffi/testsuite/libffi.call/strlen.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/strlen.c rename to native/libffi/testsuite/libffi.call/strlen.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/strlen_win32.c b/native/libffi/testsuite/libffi.call/strlen_win32.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/strlen_win32.c rename to native/libffi/testsuite/libffi.call/strlen_win32.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/struct1.c b/native/libffi/testsuite/libffi.call/struct1.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/struct1.c rename to native/libffi/testsuite/libffi.call/struct1.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/struct2.c b/native/libffi/testsuite/libffi.call/struct2.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/struct2.c rename to native/libffi/testsuite/libffi.call/struct2.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/struct3.c b/native/libffi/testsuite/libffi.call/struct3.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/struct3.c rename to native/libffi/testsuite/libffi.call/struct3.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/struct4.c b/native/libffi/testsuite/libffi.call/struct4.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/struct4.c rename to native/libffi/testsuite/libffi.call/struct4.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/struct5.c b/native/libffi/testsuite/libffi.call/struct5.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/struct5.c rename to native/libffi/testsuite/libffi.call/struct5.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/struct6.c b/native/libffi/testsuite/libffi.call/struct6.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/struct6.c rename to native/libffi/testsuite/libffi.call/struct6.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/struct7.c b/native/libffi/testsuite/libffi.call/struct7.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/struct7.c rename to native/libffi/testsuite/libffi.call/struct7.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/struct8.c b/native/libffi/testsuite/libffi.call/struct8.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/struct8.c rename to native/libffi/testsuite/libffi.call/struct8.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/struct9.c b/native/libffi/testsuite/libffi.call/struct9.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/struct9.c rename to native/libffi/testsuite/libffi.call/struct9.c diff --git a/jnalib/native/libffi/testsuite/libffi.call/testclosure.c b/native/libffi/testsuite/libffi.call/testclosure.c similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.call/testclosure.c rename to native/libffi/testsuite/libffi.call/testclosure.c diff --git a/jnalib/native/libffi/testsuite/libffi.special/ffitestcxx.h b/native/libffi/testsuite/libffi.special/ffitestcxx.h similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.special/ffitestcxx.h rename to native/libffi/testsuite/libffi.special/ffitestcxx.h diff --git a/jnalib/native/libffi/testsuite/libffi.special/special.exp b/native/libffi/testsuite/libffi.special/special.exp similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.special/special.exp rename to native/libffi/testsuite/libffi.special/special.exp diff --git a/jnalib/native/libffi/testsuite/libffi.special/unwindtest.cc b/native/libffi/testsuite/libffi.special/unwindtest.cc similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.special/unwindtest.cc rename to native/libffi/testsuite/libffi.special/unwindtest.cc diff --git a/jnalib/native/libffi/testsuite/libffi.special/unwindtest_ffi_call.cc b/native/libffi/testsuite/libffi.special/unwindtest_ffi_call.cc similarity index 100% rename from jnalib/native/libffi/testsuite/libffi.special/unwindtest_ffi_call.cc rename to native/libffi/testsuite/libffi.special/unwindtest_ffi_call.cc diff --git a/jnalib/native/libffi/texinfo.tex b/native/libffi/texinfo.tex similarity index 100% rename from jnalib/native/libffi/texinfo.tex rename to native/libffi/texinfo.tex diff --git a/jnalib/native/protect.h b/native/protect.h similarity index 100% rename from jnalib/native/protect.h rename to native/protect.h diff --git a/jnalib/native/testlib.c b/native/testlib.c similarity index 100% rename from jnalib/native/testlib.c rename to native/testlib.c diff --git a/jnalib/native/testlib2.c b/native/testlib2.c similarity index 100% rename from jnalib/native/testlib2.c rename to native/testlib2.c diff --git a/jnalib/nbproject/.cvsignore b/nbproject/.cvsignore similarity index 100% rename from jnalib/nbproject/.cvsignore rename to nbproject/.cvsignore diff --git a/jnalib/nbproject/build-impl.xml b/nbproject/build-impl.xml similarity index 100% rename from jnalib/nbproject/build-impl.xml rename to nbproject/build-impl.xml diff --git a/jnalib/nbproject/configs/Clover_Profiling.properties b/nbproject/configs/Clover_Profiling.properties similarity index 100% rename from jnalib/nbproject/configs/Clover_Profiling.properties rename to nbproject/configs/Clover_Profiling.properties diff --git a/jnalib/nbproject/genfiles.properties b/nbproject/genfiles.properties similarity index 100% rename from jnalib/nbproject/genfiles.properties rename to nbproject/genfiles.properties diff --git a/jnalib/nbproject/profiler-build-impl.xml b/nbproject/profiler-build-impl.xml similarity index 100% rename from jnalib/nbproject/profiler-build-impl.xml rename to nbproject/profiler-build-impl.xml diff --git a/jnalib/nbproject/project.properties b/nbproject/project.properties similarity index 100% rename from jnalib/nbproject/project.properties rename to nbproject/project.properties diff --git a/jnalib/nbproject/project.xml b/nbproject/project.xml similarity index 100% rename from jnalib/nbproject/project.xml rename to nbproject/project.xml diff --git a/jnalib/pom.xml b/pom.xml similarity index 100% rename from jnalib/pom.xml rename to pom.xml diff --git a/jnalib/src/com/sun/jna/AltCallingConvention.java b/src/com/sun/jna/AltCallingConvention.java similarity index 100% rename from jnalib/src/com/sun/jna/AltCallingConvention.java rename to src/com/sun/jna/AltCallingConvention.java diff --git a/jnalib/src/com/sun/jna/Callback.java b/src/com/sun/jna/Callback.java similarity index 100% rename from jnalib/src/com/sun/jna/Callback.java rename to src/com/sun/jna/Callback.java diff --git a/jnalib/src/com/sun/jna/CallbackParameterContext.java b/src/com/sun/jna/CallbackParameterContext.java similarity index 100% rename from jnalib/src/com/sun/jna/CallbackParameterContext.java rename to src/com/sun/jna/CallbackParameterContext.java diff --git a/jnalib/src/com/sun/jna/CallbackProxy.java b/src/com/sun/jna/CallbackProxy.java similarity index 100% rename from jnalib/src/com/sun/jna/CallbackProxy.java rename to src/com/sun/jna/CallbackProxy.java diff --git a/jnalib/src/com/sun/jna/CallbackReference.java b/src/com/sun/jna/CallbackReference.java similarity index 100% rename from jnalib/src/com/sun/jna/CallbackReference.java rename to src/com/sun/jna/CallbackReference.java diff --git a/jnalib/src/com/sun/jna/CallbackResultContext.java b/src/com/sun/jna/CallbackResultContext.java similarity index 100% rename from jnalib/src/com/sun/jna/CallbackResultContext.java rename to src/com/sun/jna/CallbackResultContext.java diff --git a/jnalib/src/com/sun/jna/DefaultTypeMapper.java b/src/com/sun/jna/DefaultTypeMapper.java similarity index 100% rename from jnalib/src/com/sun/jna/DefaultTypeMapper.java rename to src/com/sun/jna/DefaultTypeMapper.java diff --git a/jnalib/src/com/sun/jna/FromNativeContext.java b/src/com/sun/jna/FromNativeContext.java similarity index 100% rename from jnalib/src/com/sun/jna/FromNativeContext.java rename to src/com/sun/jna/FromNativeContext.java diff --git a/jnalib/src/com/sun/jna/FromNativeConverter.java b/src/com/sun/jna/FromNativeConverter.java similarity index 100% rename from jnalib/src/com/sun/jna/FromNativeConverter.java rename to src/com/sun/jna/FromNativeConverter.java diff --git a/jnalib/src/com/sun/jna/Function.java b/src/com/sun/jna/Function.java similarity index 100% rename from jnalib/src/com/sun/jna/Function.java rename to src/com/sun/jna/Function.java diff --git a/jnalib/src/com/sun/jna/FunctionMapper.java b/src/com/sun/jna/FunctionMapper.java similarity index 100% rename from jnalib/src/com/sun/jna/FunctionMapper.java rename to src/com/sun/jna/FunctionMapper.java diff --git a/jnalib/src/com/sun/jna/FunctionParameterContext.java b/src/com/sun/jna/FunctionParameterContext.java similarity index 100% rename from jnalib/src/com/sun/jna/FunctionParameterContext.java rename to src/com/sun/jna/FunctionParameterContext.java diff --git a/jnalib/src/com/sun/jna/FunctionResultContext.java b/src/com/sun/jna/FunctionResultContext.java similarity index 100% rename from jnalib/src/com/sun/jna/FunctionResultContext.java rename to src/com/sun/jna/FunctionResultContext.java diff --git a/jnalib/src/com/sun/jna/IntegerType.java b/src/com/sun/jna/IntegerType.java similarity index 100% rename from jnalib/src/com/sun/jna/IntegerType.java rename to src/com/sun/jna/IntegerType.java diff --git a/jnalib/src/com/sun/jna/InvocationMapper.java b/src/com/sun/jna/InvocationMapper.java similarity index 100% rename from jnalib/src/com/sun/jna/InvocationMapper.java rename to src/com/sun/jna/InvocationMapper.java diff --git a/jnalib/src/com/sun/jna/LastErrorException.java b/src/com/sun/jna/LastErrorException.java similarity index 100% rename from jnalib/src/com/sun/jna/LastErrorException.java rename to src/com/sun/jna/LastErrorException.java diff --git a/jnalib/src/com/sun/jna/Library.java b/src/com/sun/jna/Library.java similarity index 100% rename from jnalib/src/com/sun/jna/Library.java rename to src/com/sun/jna/Library.java diff --git a/jnalib/src/com/sun/jna/Memory.java b/src/com/sun/jna/Memory.java similarity index 100% rename from jnalib/src/com/sun/jna/Memory.java rename to src/com/sun/jna/Memory.java diff --git a/jnalib/src/com/sun/jna/MethodParameterContext.java b/src/com/sun/jna/MethodParameterContext.java similarity index 100% rename from jnalib/src/com/sun/jna/MethodParameterContext.java rename to src/com/sun/jna/MethodParameterContext.java diff --git a/jnalib/src/com/sun/jna/MethodResultContext.java b/src/com/sun/jna/MethodResultContext.java similarity index 100% rename from jnalib/src/com/sun/jna/MethodResultContext.java rename to src/com/sun/jna/MethodResultContext.java diff --git a/jnalib/src/com/sun/jna/Native.java b/src/com/sun/jna/Native.java similarity index 100% rename from jnalib/src/com/sun/jna/Native.java rename to src/com/sun/jna/Native.java diff --git a/jnalib/src/com/sun/jna/NativeLibrary.java b/src/com/sun/jna/NativeLibrary.java similarity index 100% rename from jnalib/src/com/sun/jna/NativeLibrary.java rename to src/com/sun/jna/NativeLibrary.java diff --git a/jnalib/src/com/sun/jna/NativeLong.java b/src/com/sun/jna/NativeLong.java similarity index 100% rename from jnalib/src/com/sun/jna/NativeLong.java rename to src/com/sun/jna/NativeLong.java diff --git a/jnalib/src/com/sun/jna/NativeMapped.java b/src/com/sun/jna/NativeMapped.java similarity index 100% rename from jnalib/src/com/sun/jna/NativeMapped.java rename to src/com/sun/jna/NativeMapped.java diff --git a/jnalib/src/com/sun/jna/NativeMappedConverter.java b/src/com/sun/jna/NativeMappedConverter.java similarity index 100% rename from jnalib/src/com/sun/jna/NativeMappedConverter.java rename to src/com/sun/jna/NativeMappedConverter.java diff --git a/jnalib/src/com/sun/jna/NativeString.java b/src/com/sun/jna/NativeString.java similarity index 100% rename from jnalib/src/com/sun/jna/NativeString.java rename to src/com/sun/jna/NativeString.java diff --git a/jnalib/src/com/sun/jna/Platform.java b/src/com/sun/jna/Platform.java similarity index 100% rename from jnalib/src/com/sun/jna/Platform.java rename to src/com/sun/jna/Platform.java diff --git a/jnalib/src/com/sun/jna/Pointer.java b/src/com/sun/jna/Pointer.java similarity index 100% rename from jnalib/src/com/sun/jna/Pointer.java rename to src/com/sun/jna/Pointer.java diff --git a/jnalib/src/com/sun/jna/PointerType.java b/src/com/sun/jna/PointerType.java similarity index 100% rename from jnalib/src/com/sun/jna/PointerType.java rename to src/com/sun/jna/PointerType.java diff --git a/jnalib/src/com/sun/jna/StringArray.java b/src/com/sun/jna/StringArray.java similarity index 100% rename from jnalib/src/com/sun/jna/StringArray.java rename to src/com/sun/jna/StringArray.java diff --git a/jnalib/src/com/sun/jna/Structure.java b/src/com/sun/jna/Structure.java similarity index 100% rename from jnalib/src/com/sun/jna/Structure.java rename to src/com/sun/jna/Structure.java diff --git a/jnalib/src/com/sun/jna/StructureReadContext.java b/src/com/sun/jna/StructureReadContext.java similarity index 100% rename from jnalib/src/com/sun/jna/StructureReadContext.java rename to src/com/sun/jna/StructureReadContext.java diff --git a/jnalib/src/com/sun/jna/StructureWriteContext.java b/src/com/sun/jna/StructureWriteContext.java similarity index 100% rename from jnalib/src/com/sun/jna/StructureWriteContext.java rename to src/com/sun/jna/StructureWriteContext.java diff --git a/jnalib/src/com/sun/jna/ToNativeContext.java b/src/com/sun/jna/ToNativeContext.java similarity index 100% rename from jnalib/src/com/sun/jna/ToNativeContext.java rename to src/com/sun/jna/ToNativeContext.java diff --git a/jnalib/src/com/sun/jna/ToNativeConverter.java b/src/com/sun/jna/ToNativeConverter.java similarity index 100% rename from jnalib/src/com/sun/jna/ToNativeConverter.java rename to src/com/sun/jna/ToNativeConverter.java diff --git a/jnalib/src/com/sun/jna/TypeConverter.java b/src/com/sun/jna/TypeConverter.java similarity index 100% rename from jnalib/src/com/sun/jna/TypeConverter.java rename to src/com/sun/jna/TypeConverter.java diff --git a/jnalib/src/com/sun/jna/TypeMapper.java b/src/com/sun/jna/TypeMapper.java similarity index 100% rename from jnalib/src/com/sun/jna/TypeMapper.java rename to src/com/sun/jna/TypeMapper.java diff --git a/jnalib/src/com/sun/jna/Union.java b/src/com/sun/jna/Union.java similarity index 100% rename from jnalib/src/com/sun/jna/Union.java rename to src/com/sun/jna/Union.java diff --git a/jnalib/src/com/sun/jna/WString.java b/src/com/sun/jna/WString.java similarity index 100% rename from jnalib/src/com/sun/jna/WString.java rename to src/com/sun/jna/WString.java diff --git a/jnalib/src/com/sun/jna/overview.html b/src/com/sun/jna/overview.html similarity index 100% rename from jnalib/src/com/sun/jna/overview.html rename to src/com/sun/jna/overview.html diff --git a/jnalib/src/com/sun/jna/package.html b/src/com/sun/jna/package.html similarity index 100% rename from jnalib/src/com/sun/jna/package.html rename to src/com/sun/jna/package.html diff --git a/jnalib/src/com/sun/jna/ptr/ByReference.java b/src/com/sun/jna/ptr/ByReference.java similarity index 100% rename from jnalib/src/com/sun/jna/ptr/ByReference.java rename to src/com/sun/jna/ptr/ByReference.java diff --git a/jnalib/src/com/sun/jna/ptr/ByteByReference.java b/src/com/sun/jna/ptr/ByteByReference.java similarity index 100% rename from jnalib/src/com/sun/jna/ptr/ByteByReference.java rename to src/com/sun/jna/ptr/ByteByReference.java diff --git a/jnalib/src/com/sun/jna/ptr/DoubleByReference.java b/src/com/sun/jna/ptr/DoubleByReference.java similarity index 100% rename from jnalib/src/com/sun/jna/ptr/DoubleByReference.java rename to src/com/sun/jna/ptr/DoubleByReference.java diff --git a/jnalib/src/com/sun/jna/ptr/FloatByReference.java b/src/com/sun/jna/ptr/FloatByReference.java similarity index 100% rename from jnalib/src/com/sun/jna/ptr/FloatByReference.java rename to src/com/sun/jna/ptr/FloatByReference.java diff --git a/jnalib/src/com/sun/jna/ptr/IntByReference.java b/src/com/sun/jna/ptr/IntByReference.java similarity index 100% rename from jnalib/src/com/sun/jna/ptr/IntByReference.java rename to src/com/sun/jna/ptr/IntByReference.java diff --git a/jnalib/src/com/sun/jna/ptr/LongByReference.java b/src/com/sun/jna/ptr/LongByReference.java similarity index 100% rename from jnalib/src/com/sun/jna/ptr/LongByReference.java rename to src/com/sun/jna/ptr/LongByReference.java diff --git a/jnalib/src/com/sun/jna/ptr/NativeLongByReference.java b/src/com/sun/jna/ptr/NativeLongByReference.java similarity index 100% rename from jnalib/src/com/sun/jna/ptr/NativeLongByReference.java rename to src/com/sun/jna/ptr/NativeLongByReference.java diff --git a/jnalib/src/com/sun/jna/ptr/PointerByReference.java b/src/com/sun/jna/ptr/PointerByReference.java similarity index 100% rename from jnalib/src/com/sun/jna/ptr/PointerByReference.java rename to src/com/sun/jna/ptr/PointerByReference.java diff --git a/jnalib/src/com/sun/jna/ptr/ShortByReference.java b/src/com/sun/jna/ptr/ShortByReference.java similarity index 100% rename from jnalib/src/com/sun/jna/ptr/ShortByReference.java rename to src/com/sun/jna/ptr/ShortByReference.java diff --git a/jnalib/src/com/sun/jna/ptr/package.html b/src/com/sun/jna/ptr/package.html similarity index 100% rename from jnalib/src/com/sun/jna/ptr/package.html rename to src/com/sun/jna/ptr/package.html diff --git a/jnalib/src/com/sun/jna/win32/StdCall.java b/src/com/sun/jna/win32/StdCall.java similarity index 100% rename from jnalib/src/com/sun/jna/win32/StdCall.java rename to src/com/sun/jna/win32/StdCall.java diff --git a/jnalib/src/com/sun/jna/win32/StdCallFunctionMapper.java b/src/com/sun/jna/win32/StdCallFunctionMapper.java similarity index 100% rename from jnalib/src/com/sun/jna/win32/StdCallFunctionMapper.java rename to src/com/sun/jna/win32/StdCallFunctionMapper.java diff --git a/jnalib/src/com/sun/jna/win32/StdCallLibrary.java b/src/com/sun/jna/win32/StdCallLibrary.java similarity index 100% rename from jnalib/src/com/sun/jna/win32/StdCallLibrary.java rename to src/com/sun/jna/win32/StdCallLibrary.java diff --git a/jnalib/src/com/sun/jna/win32/W32APIFunctionMapper.java b/src/com/sun/jna/win32/W32APIFunctionMapper.java similarity index 100% rename from jnalib/src/com/sun/jna/win32/W32APIFunctionMapper.java rename to src/com/sun/jna/win32/W32APIFunctionMapper.java diff --git a/jnalib/src/com/sun/jna/win32/W32APIOptions.java b/src/com/sun/jna/win32/W32APIOptions.java similarity index 100% rename from jnalib/src/com/sun/jna/win32/W32APIOptions.java rename to src/com/sun/jna/win32/W32APIOptions.java diff --git a/jnalib/src/com/sun/jna/win32/W32APITypeMapper.java b/src/com/sun/jna/win32/W32APITypeMapper.java similarity index 100% rename from jnalib/src/com/sun/jna/win32/W32APITypeMapper.java rename to src/com/sun/jna/win32/W32APITypeMapper.java diff --git a/jnalib/src/com/sun/jna/win32/package.html b/src/com/sun/jna/win32/package.html similarity index 100% rename from jnalib/src/com/sun/jna/win32/package.html rename to src/com/sun/jna/win32/package.html diff --git a/jnalib/test/com/sun/jna/ArgumentsMarshalTest.java b/test/com/sun/jna/ArgumentsMarshalTest.java similarity index 100% rename from jnalib/test/com/sun/jna/ArgumentsMarshalTest.java rename to test/com/sun/jna/ArgumentsMarshalTest.java diff --git a/jnalib/test/com/sun/jna/ByReferenceArgumentsTest.java b/test/com/sun/jna/ByReferenceArgumentsTest.java similarity index 100% rename from jnalib/test/com/sun/jna/ByReferenceArgumentsTest.java rename to test/com/sun/jna/ByReferenceArgumentsTest.java diff --git a/jnalib/test/com/sun/jna/CallbacksTest.java b/test/com/sun/jna/CallbacksTest.java similarity index 100% rename from jnalib/test/com/sun/jna/CallbacksTest.java rename to test/com/sun/jna/CallbacksTest.java diff --git a/jnalib/test/com/sun/jna/DirectArgumentsMarshalTest.java b/test/com/sun/jna/DirectArgumentsMarshalTest.java similarity index 100% rename from jnalib/test/com/sun/jna/DirectArgumentsMarshalTest.java rename to test/com/sun/jna/DirectArgumentsMarshalTest.java diff --git a/jnalib/test/com/sun/jna/DirectByReferenceArgumentsTest.java b/test/com/sun/jna/DirectByReferenceArgumentsTest.java similarity index 100% rename from jnalib/test/com/sun/jna/DirectByReferenceArgumentsTest.java rename to test/com/sun/jna/DirectByReferenceArgumentsTest.java diff --git a/jnalib/test/com/sun/jna/DirectCallbacksTest.java b/test/com/sun/jna/DirectCallbacksTest.java similarity index 100% rename from jnalib/test/com/sun/jna/DirectCallbacksTest.java rename to test/com/sun/jna/DirectCallbacksTest.java diff --git a/jnalib/test/com/sun/jna/DirectReturnTypesTest.java b/test/com/sun/jna/DirectReturnTypesTest.java similarity index 100% rename from jnalib/test/com/sun/jna/DirectReturnTypesTest.java rename to test/com/sun/jna/DirectReturnTypesTest.java diff --git a/jnalib/test/com/sun/jna/DirectStructureByValueTest.java b/test/com/sun/jna/DirectStructureByValueTest.java similarity index 100% rename from jnalib/test/com/sun/jna/DirectStructureByValueTest.java rename to test/com/sun/jna/DirectStructureByValueTest.java diff --git a/jnalib/test/com/sun/jna/DirectTest.java b/test/com/sun/jna/DirectTest.java similarity index 100% rename from jnalib/test/com/sun/jna/DirectTest.java rename to test/com/sun/jna/DirectTest.java diff --git a/jnalib/test/com/sun/jna/DirectTypeMapperTest.java b/test/com/sun/jna/DirectTypeMapperTest.java similarity index 100% rename from jnalib/test/com/sun/jna/DirectTypeMapperTest.java rename to test/com/sun/jna/DirectTypeMapperTest.java diff --git a/jnalib/test/com/sun/jna/HeadlessLoadLibraryTest.java b/test/com/sun/jna/HeadlessLoadLibraryTest.java similarity index 100% rename from jnalib/test/com/sun/jna/HeadlessLoadLibraryTest.java rename to test/com/sun/jna/HeadlessLoadLibraryTest.java diff --git a/jnalib/test/com/sun/jna/IntegerTypeTest.java b/test/com/sun/jna/IntegerTypeTest.java similarity index 100% rename from jnalib/test/com/sun/jna/IntegerTypeTest.java rename to test/com/sun/jna/IntegerTypeTest.java diff --git a/jnalib/test/com/sun/jna/JNAUnloadTest.java b/test/com/sun/jna/JNAUnloadTest.java similarity index 100% rename from jnalib/test/com/sun/jna/JNAUnloadTest.java rename to test/com/sun/jna/JNAUnloadTest.java diff --git a/jnalib/test/com/sun/jna/LastErrorTest.java b/test/com/sun/jna/LastErrorTest.java similarity index 100% rename from jnalib/test/com/sun/jna/LastErrorTest.java rename to test/com/sun/jna/LastErrorTest.java diff --git a/jnalib/test/com/sun/jna/LibraryLoadTest.java b/test/com/sun/jna/LibraryLoadTest.java similarity index 100% rename from jnalib/test/com/sun/jna/LibraryLoadTest.java rename to test/com/sun/jna/LibraryLoadTest.java diff --git a/jnalib/test/com/sun/jna/LibraryTest.java b/test/com/sun/jna/LibraryTest.java similarity index 100% rename from jnalib/test/com/sun/jna/LibraryTest.java rename to test/com/sun/jna/LibraryTest.java diff --git a/jnalib/test/com/sun/jna/MemoryTest.java b/test/com/sun/jna/MemoryTest.java similarity index 100% rename from jnalib/test/com/sun/jna/MemoryTest.java rename to test/com/sun/jna/MemoryTest.java diff --git a/jnalib/test/com/sun/jna/NativeLibraryTest.java b/test/com/sun/jna/NativeLibraryTest.java similarity index 100% rename from jnalib/test/com/sun/jna/NativeLibraryTest.java rename to test/com/sun/jna/NativeLibraryTest.java diff --git a/jnalib/test/com/sun/jna/NativeTest.java b/test/com/sun/jna/NativeTest.java similarity index 100% rename from jnalib/test/com/sun/jna/NativeTest.java rename to test/com/sun/jna/NativeTest.java diff --git a/jnalib/test/com/sun/jna/PointerTest.java b/test/com/sun/jna/PointerTest.java similarity index 100% rename from jnalib/test/com/sun/jna/PointerTest.java rename to test/com/sun/jna/PointerTest.java diff --git a/jnalib/test/com/sun/jna/ReturnTypesTest.java b/test/com/sun/jna/ReturnTypesTest.java similarity index 100% rename from jnalib/test/com/sun/jna/ReturnTypesTest.java rename to test/com/sun/jna/ReturnTypesTest.java diff --git a/jnalib/test/com/sun/jna/StructureByValueTest.java b/test/com/sun/jna/StructureByValueTest.java similarity index 100% rename from jnalib/test/com/sun/jna/StructureByValueTest.java rename to test/com/sun/jna/StructureByValueTest.java diff --git a/jnalib/test/com/sun/jna/StructureTest.java b/test/com/sun/jna/StructureTest.java similarity index 100% rename from jnalib/test/com/sun/jna/StructureTest.java rename to test/com/sun/jna/StructureTest.java diff --git a/jnalib/test/com/sun/jna/TypeMapperTest.java b/test/com/sun/jna/TypeMapperTest.java similarity index 100% rename from jnalib/test/com/sun/jna/TypeMapperTest.java rename to test/com/sun/jna/TypeMapperTest.java diff --git a/jnalib/test/com/sun/jna/UnionTest.java b/test/com/sun/jna/UnionTest.java similarity index 100% rename from jnalib/test/com/sun/jna/UnionTest.java rename to test/com/sun/jna/UnionTest.java diff --git a/jnalib/test/com/sun/jna/VMCrashProtectionTest.java b/test/com/sun/jna/VMCrashProtectionTest.java similarity index 100% rename from jnalib/test/com/sun/jna/VMCrashProtectionTest.java rename to test/com/sun/jna/VMCrashProtectionTest.java diff --git a/jnalib/test/com/sun/jna/VarArgsTest.java b/test/com/sun/jna/VarArgsTest.java similarity index 100% rename from jnalib/test/com/sun/jna/VarArgsTest.java rename to test/com/sun/jna/VarArgsTest.java diff --git a/jnalib/test/com/sun/jna/WebStartTest.java b/test/com/sun/jna/WebStartTest.java similarity index 100% rename from jnalib/test/com/sun/jna/WebStartTest.java rename to test/com/sun/jna/WebStartTest.java diff --git a/jnalib/test/com/sun/jna/win32/W32APIMapperTest.java b/test/com/sun/jna/win32/W32APIMapperTest.java similarity index 100% rename from jnalib/test/com/sun/jna/win32/W32APIMapperTest.java rename to test/com/sun/jna/win32/W32APIMapperTest.java diff --git a/jnalib/test/com/sun/jna/win32/W32StdCallTest.java b/test/com/sun/jna/win32/W32StdCallTest.java similarity index 100% rename from jnalib/test/com/sun/jna/win32/W32StdCallTest.java rename to test/com/sun/jna/win32/W32StdCallTest.java