From 405fd633fd6e72a13edaef6e0f086dd31d680041 Mon Sep 17 00:00:00 2001 From: UnlegitDqrk Date: Sun, 1 Mar 2026 12:56:55 +0100 Subject: [PATCH] Added missed Classes --- README.md | 18 +++++++------- core/src/main/java/org/luaj/vm2/Globals.java | 20 ++++++++-------- .../src/main/java/org/luaj/vm2/LoadState.java | 4 ++-- .../main/java/org/luaj/vm2/LuaClosure.java | 2 +- .../src/main/java/org/luaj/vm2/LuaDouble.java | 2 +- .../main/java/org/luaj/vm2/LuaFunction.java | 4 ++-- .../main/java/org/luaj/vm2/LuaInteger.java | 2 +- .../src/main/java/org/luaj/vm2/LuaString.java | 2 +- .../src/main/java/org/luaj/vm2/LuaThread.java | 10 ++++---- core/src/main/java/org/luaj/vm2/LuaValue.java | 6 ++--- .../java/org/luaj/vm2/compiler/LexState.java | 2 +- .../main/java/org/luaj/vm2/compiler/LuaC.java | 8 +++---- .../android/src/android/LuajActivity.java | 2 +- examples/android/src/android/LuajView.java | 6 ++--- examples/jme/SampleMIDlet.java | 2 +- .../jse/CollectingOrphanedCoroutines.java | 2 +- examples/jse/SampleApplet.java | 24 +++++++++---------- examples/jse/SampleJseMain.java | 2 +- examples/jse/SampleMultiThreaded.java | 2 +- examples/jse/SampleSandboxed.java | 18 +++++++------- examples/jse/SampleUsingClassLoader.java | 2 +- examples/jse/ScriptEngineSample.java | 2 +- examples/jse/hyperbolic.java | 4 ++-- examples/maven/src/main/java/acme/App.java | 2 +- .../maven/src/test/java/acme/AppTest.java | 4 +--- .../openautonomousconnection/luaj/Main.java | 17 ------------- jse/src/main/java/lua.java | 2 +- jse/src/main/java/luac.java | 2 +- jse/src/main/java/luajc.java | 2 +- .../java/org/luaj/vm2/luajc/JavaBuilder.java | 10 ++++---- .../main/java/org/luaj/vm2/luajc/LuaJC.java | 5 ++-- .../org/luaj/vm2/script/LuaScriptEngine.java | 6 ++--- .../java/org/luaj/vm2/script/LuajContext.java | 2 +- .../org/luaj/vm2/server/DefaultLauncher.java | 4 ++-- .../java/org/luaj/luajc/SampleMainChunk.java | 4 ++-- .../test/java/org/luaj/luajc/TestLuaJ.java | 2 +- .../test/java/org/luaj/luajc/TestLuaJC.java | 2 +- jse/src/test/java/org/luaj/vm2/AllTests.java | 10 ++++---- .../test/java/org/luaj/vm2/FragmentsTest.java | 2 +- .../test/java/org/luaj/vm2/LoadOrderTest.java | 2 +- .../java/org/luaj/vm2/LuaOperationsTest.java | 8 +++---- .../test/java/org/luaj/vm2/MathLibTest.java | 4 ++-- .../test/java/org/luaj/vm2/MetatableTest.java | 8 +++---- .../java/org/luaj/vm2/OrphanedThreadTest.java | 4 ++-- .../java/org/luaj/vm2/RequireClassTest.java | 2 +- .../java/org/luaj/vm2/ScriptDrivenTest.java | 9 +++---- .../test/java/org/luaj/vm2/StringTest.java | 2 +- .../test/java/org/luaj/vm2/TableHashTest.java | 5 +--- jse/src/test/java/org/luaj/vm2/TypeTest.java | 4 ++-- .../java/org/luaj/vm2/UTF8StreamTest.java | 2 +- .../luaj/vm2/UnaryBinaryOperatorsTest.java | 2 +- .../luaj/vm2/compiler/AbstractUnitTests.java | 3 +-- .../vm2/compiler/DumpLoadEndianIntTest.java | 3 +-- .../org/luaj/vm2/compiler/SimpleTests.java | 2 +- .../require/RequireSampleLoadLuaError.java | 2 +- .../RequireSampleLoadRuntimeExcep.java | 2 +- .../vm2/require/RequireSampleSuccess.java | 2 +- .../luaj/vm2/script/ScriptEngineTests.java | 2 +- 58 files changed, 134 insertions(+), 156 deletions(-) delete mode 100644 jme/src/main/java/org/openautonomousconnection/luaj/Main.java diff --git a/README.md b/README.md index 86848e6c..239ad5c7 100644 --- a/README.md +++ b/README.md @@ -254,7 +254,7 @@ A simple hello, world example in luaj is: 
 	import org.luaj.vm2.*;
-	import org.luaj.vm2.lib.jse.*;
+	import org.luaj.vm2.libs.jse.*;
 
 	Globals globals = JsePlatform.standardGlobals();
 	LuaValue chunk = globals.load("print 'hello, world'");
@@ -296,7 +296,7 @@ For MIDlets the JmePlatform is used instead:
 
 
 	import org.luaj.vm2.*;
-	import org.luaj.vm2.lib.jme.*;
+	import org.luaj.vm2.libs.jme.*;
 
 	Globals globals = JmePlatform.standardGlobals();
 	LuaValue chunk = globals.loadfile("examples/lua/hello.lua");
@@ -566,7 +566,7 @@ create globals that contain the debug library in addition to the other standard
 
 To install dynamically from lua use java-class-based require::
 
-	require 'org.luaj.vm2.lib.DebugLib'
+	require 'org.luaj.vm2.libs.DebugLib'
 

 
 The lua command line utility includes the debug library by default.
@@ -666,11 +666,11 @@ The simplest way to implement a function is to choose a base class based on the
 LuaJ provides 5 base classes for this purpose, depending if the function has 0, 1, 2, 3 or variable arguments, 
 and if it provide multiple return values.   
 
-	 org.luaj.vm2.lib.ZeroArgFunction
-	 org.luaj.vm2.lib.OneArgFunction
-	 org.luaj.vm2.lib.TwoArgFunction
-	 org.luaj.vm2.lib.ThreeArgFunction
-	 org.luaj.vm2.lib.VarArgFunction
+	 org.luaj.vm2.libs.ZeroArgFunction
+	 org.luaj.vm2.libs.OneArgFunction
+	 org.luaj.vm2.libs.TwoArgFunction
+	 org.luaj.vm2.libs.ThreeArgFunction
+	 org.luaj.vm2.libs.VarArgFunction
 

 
 Each of these functions has an abstract method that must be implemented, 
@@ -724,7 +724,7 @@ in the environment that can be called from lua.
 A complete example of Java code for a simple toy library is in examples/jse/hyperbolic.java 
 
 import org.luaj.vm2.LuaValue;
-import org.luaj.vm2.lib.*;
+import org.luaj.vm2.libs.*;
 
 public class hyperbolic extends TwoArgFunction {
 
diff --git a/core/src/main/java/org/luaj/vm2/Globals.java b/core/src/main/java/org/luaj/vm2/Globals.java
index c1d32466..76d9c6c4 100644
--- a/core/src/main/java/org/luaj/vm2/Globals.java
+++ b/core/src/main/java/org/luaj/vm2/Globals.java
@@ -26,11 +26,11 @@ import java.io.InputStream;
 import java.io.PrintStream;
 import java.io.Reader;
 
-import org.luaj.vm2.lib.BaseLib;
-import org.luaj.vm2.lib.DebugLib;
-import org.luaj.vm2.lib.IoLib;
-import org.luaj.vm2.lib.PackageLib;
-import org.luaj.vm2.lib.ResourceFinder;
+import org.luaj.vm2.libs.BaseLib;
+import org.luaj.vm2.libs.DebugLib;
+import org.luaj.vm2.libs.IoLib;
+import org.luaj.vm2.libs.PackageLib;
+import org.luaj.vm2.libs.ResourceFinder;
 
 /**
  * Global environment used by luaj.  Contains global variables referenced by executing lua.
@@ -38,8 +38,8 @@ import org.luaj.vm2.lib.ResourceFinder;
  * 
  * 
Constructing and Initializing Instances

  * Typically, this is constructed indirectly by a call to 
- * {@link org.luaj.vm2.lib.jse.JsePlatform#standardGlobals()} or 
- * {@link org.luaj.vm2.lib.jme.JmePlatform#standardGlobals()}, 
+ * {@link org.luaj.vm2.libs.jse.JsePlatform#standardGlobals()} or
+ * {@link org.luaj.vm2.libs.jme.JmePlatform#standardGlobals()},
  * and then used to load lua scripts for execution as in the following example. 
  * 
 {@code
  * Globals globals = JsePlatform.standardGlobals();
@@ -89,7 +89,7 @@ import org.luaj.vm2.lib.ResourceFinder;
  * 
  * 
  * 
Lua Environment Variables

- * When using {@link org.luaj.vm2.lib.jse.JsePlatform} or {@link org.luaj.vm2.lib.jme.JmePlatform}, 
+ * When using {@link org.luaj.vm2.libs.jse.JsePlatform} or {@link org.luaj.vm2.libs.jme.JmePlatform},
  * these environment variables are created within the Globals.
  * 
    
  * 
  • "_G" Pointer to this Globals.
@@ -102,8 +102,8 @@ import org.luaj.vm2.lib.ResourceFinder;
  * static immutable resources such as class data and string data.
  * 
    
  * 
- * @see org.luaj.vm2.lib.jse.JsePlatform
- * @see org.luaj.vm2.lib.jme.JmePlatform
+ * @see org.luaj.vm2.libs.jse.JsePlatform
+ * @see org.luaj.vm2.libs.jme.JmePlatform
  * @see LuaValue
  * @see Compiler
  * @see Loader
diff --git a/core/src/main/java/org/luaj/vm2/LoadState.java b/core/src/main/java/org/luaj/vm2/LoadState.java
index 8d71a74a..e353020c 100644
--- a/core/src/main/java/org/luaj/vm2/LoadState.java
+++ b/core/src/main/java/org/luaj/vm2/LoadState.java
@@ -44,8 +44,8 @@ import java.io.InputStream;
 * This should work regardless of which {@link Globals.Compiler} or {@link Globals.Undumper}
 * have been installed.
 * 
    
-* By default, when using {@link org.luaj.vm2.lib.jse.JsePlatform} or
-* {@link org.luaj.vm2.lib.jme.JmePlatform}
+* By default, when using {@link org.luaj.vm2.libs.jse.JsePlatform} or
+* {@link org.luaj.vm2.libs.jme.JmePlatform}
 * to construct globals, the {@link LoadState} default undumper is installed
 * as the default {@link Globals.Undumper}.
 * 
    
diff --git a/core/src/main/java/org/luaj/vm2/LuaClosure.java b/core/src/main/java/org/luaj/vm2/LuaClosure.java
index a1c1c078..47e7d9e8 100644
--- a/core/src/main/java/org/luaj/vm2/LuaClosure.java
+++ b/core/src/main/java/org/luaj/vm2/LuaClosure.java
@@ -21,7 +21,7 @@
 ******************************************************************************/
 package org.luaj.vm2;
 
-import org.luaj.vm2.lib.DebugLib.CallFrame;
+import org.luaj.vm2.libs.DebugLib.CallFrame;
 
 /**
  * Extension of {@link LuaFunction} which executes lua bytecode.
diff --git a/core/src/main/java/org/luaj/vm2/LuaDouble.java b/core/src/main/java/org/luaj/vm2/LuaDouble.java
index 0c5cdd66..a0b6f97e 100644
--- a/core/src/main/java/org/luaj/vm2/LuaDouble.java
+++ b/core/src/main/java/org/luaj/vm2/LuaDouble.java
@@ -21,7 +21,7 @@
 ******************************************************************************/
 package org.luaj.vm2;
 
-import org.luaj.vm2.lib.MathLib;
+import org.luaj.vm2.libs.MathLib;
 
 /**
  * Extension of {@link LuaNumber} which can hold a Java double as its value.
diff --git a/core/src/main/java/org/luaj/vm2/LuaFunction.java b/core/src/main/java/org/luaj/vm2/LuaFunction.java
index 83bee86d..6be07d1d 100644
--- a/core/src/main/java/org/luaj/vm2/LuaFunction.java
+++ b/core/src/main/java/org/luaj/vm2/LuaFunction.java
@@ -25,14 +25,14 @@ package org.luaj.vm2;
 /**
  * Base class for functions implemented in Java.
  * 
    
- * Direct subclass include {@link org.luaj.vm2.lib.LibFunction}
+ * Direct subclass include {@link org.luaj.vm2.libs.LibFunction}
  * which is the base class for
  * all built-in library functions coded in Java,
  * and {@link LuaClosure}, which represents a lua closure
  * whose bytecode is interpreted when the function is invoked.
  * @see LuaValue
  * @see LuaClosure
- * @see org.luaj.vm2.lib.LibFunction
+ * @see org.luaj.vm2.libs.LibFunction
  */
 abstract
 public class LuaFunction extends LuaValue {
diff --git a/core/src/main/java/org/luaj/vm2/LuaInteger.java b/core/src/main/java/org/luaj/vm2/LuaInteger.java
index e5e651dc..bddff621 100644
--- a/core/src/main/java/org/luaj/vm2/LuaInteger.java
+++ b/core/src/main/java/org/luaj/vm2/LuaInteger.java
@@ -21,7 +21,7 @@
 ******************************************************************************/
 package org.luaj.vm2;
 
-import org.luaj.vm2.lib.MathLib;
+import org.luaj.vm2.libs.MathLib;
 
 /**
  * Extension of {@link LuaNumber} which can hold a Java int as its value.
diff --git a/core/src/main/java/org/luaj/vm2/LuaString.java b/core/src/main/java/org/luaj/vm2/LuaString.java
index 08c1022b..94383ec4 100644
--- a/core/src/main/java/org/luaj/vm2/LuaString.java
+++ b/core/src/main/java/org/luaj/vm2/LuaString.java
@@ -28,7 +28,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
 
-import org.luaj.vm2.lib.MathLib;
+import org.luaj.vm2.libs.MathLib;
 
 /**
  * Subclass of {@link LuaValue} for representing lua strings.
diff --git a/core/src/main/java/org/luaj/vm2/LuaThread.java b/core/src/main/java/org/luaj/vm2/LuaThread.java
index a210d4c7..58eeab01 100644
--- a/core/src/main/java/org/luaj/vm2/LuaThread.java
+++ b/core/src/main/java/org/luaj/vm2/LuaThread.java
@@ -40,8 +40,8 @@ import java.util.concurrent.locks.ReentrantLock;
  * This is done via the constructor arguments {@link #LuaThread(Globals)} or
  * {@link #LuaThread(Globals, LuaValue)}.
  * 
    
- * The utility classes {@link org.luaj.vm2.lib.jse.JsePlatform} and
- * {@link org.luaj.vm2.lib.jme.JmePlatform}
+ * The utility classes {@link org.luaj.vm2.libs.jse.JsePlatform} and
+ * {@link org.luaj.vm2.libs.jme.JmePlatform}
  * see to it that this {@link Globals} are initialized properly.
  * 
    
  * The behavior of coroutine threads matches closely the behavior
@@ -65,9 +65,9 @@ import java.util.concurrent.locks.ReentrantLock;
  *
  *
  * @see LuaValue
- * @see org.luaj.vm2.lib.jse.JsePlatform
- * @see org.luaj.vm2.lib.jme.JmePlatform
- * @see org.luaj.vm2.lib.CoroutineLib
+ * @see org.luaj.vm2.libs.jse.JsePlatform
+ * @see org.luaj.vm2.libs.jme.JmePlatform
+ * @see org.luaj.vm2.libs.CoroutineLib
  */
 public class LuaThread extends LuaValue {
 
diff --git a/core/src/main/java/org/luaj/vm2/LuaValue.java b/core/src/main/java/org/luaj/vm2/LuaValue.java
index 34913cb3..c7c287cf 100644
--- a/core/src/main/java/org/luaj/vm2/LuaValue.java
+++ b/core/src/main/java/org/luaj/vm2/LuaValue.java
@@ -75,7 +75,7 @@ package org.luaj.vm2;
  * } 

  * For this to work the file must be in the current directory, or in the class path,
  * dependening on the platform.
- * See {@link org.luaj.vm2.lib.jse.JsePlatform} and {@link org.luaj.vm2.lib.jme.JmePlatform} for details.
+ * See {@link org.luaj.vm2.libs.jse.JsePlatform} and {@link org.luaj.vm2.libs.jme.JmePlatform} for details.
  * 

  * In general a {@link LuaError} may be thrown on any operation when the
  * types supplied to any operation are illegal from a lua perspective.
@@ -101,8 +101,8 @@ package org.luaj.vm2;
  * {@link #MOD}, {@link #UNM}, {@link #LEN}, {@link #EQ}, {@link #LT},
  * {@link #LE}, {@link #TOSTRING}, and {@link #CONCAT}.
  * 
- * @see org.luaj.vm2.lib.jse.JsePlatform
- * @see org.luaj.vm2.lib.jme.JmePlatform
+ * @see org.luaj.vm2.libs.jse.JsePlatform
+ * @see org.luaj.vm2.libs.jme.JmePlatform
  * @see LoadState
  * @see Varargs
  */
diff --git a/core/src/main/java/org/luaj/vm2/compiler/LexState.java b/core/src/main/java/org/luaj/vm2/compiler/LexState.java
index e889514e..2f8b4329 100644
--- a/core/src/main/java/org/luaj/vm2/compiler/LexState.java
+++ b/core/src/main/java/org/luaj/vm2/compiler/LexState.java
@@ -33,7 +33,7 @@ import org.luaj.vm2.LuaString;
 import org.luaj.vm2.LuaValue;
 import org.luaj.vm2.Prototype;
 import org.luaj.vm2.compiler.FuncState.BlockCnt;
-import org.luaj.vm2.lib.MathLib;
+import org.luaj.vm2.libs.MathLib;
 
 
 public class LexState extends Constants {
diff --git a/core/src/main/java/org/luaj/vm2/compiler/LuaC.java b/core/src/main/java/org/luaj/vm2/compiler/LuaC.java
index 6d41ce08..96c9fb71 100644
--- a/core/src/main/java/org/luaj/vm2/compiler/LuaC.java
+++ b/core/src/main/java/org/luaj/vm2/compiler/LuaC.java
@@ -31,7 +31,7 @@ import org.luaj.vm2.LuaFunction;
 import org.luaj.vm2.LuaString;
 import org.luaj.vm2.LuaValue;
 import org.luaj.vm2.Prototype;
-import org.luaj.vm2.lib.BaseLib;
+import org.luaj.vm2.libs.BaseLib;
 
 /**
  * Compiler for Lua.
@@ -49,7 +49,7 @@ import org.luaj.vm2.lib.BaseLib;
  *  
  * 
 
  * The {@link LuaC} compiler is installed by default by both the 
- * {@link org.luaj.vm2.lib.jse.JsePlatform} and {@link org.luaj.vm2.lib.jme.JmePlatform} classes, 
+ * {@link org.luaj.vm2.libs.jse.JsePlatform} and {@link org.luaj.vm2.libs.jme.JmePlatform} classes,
  * so in the following example, the default {@link LuaC} compiler 
  * will be used:
  * 
 {@code
@@ -66,8 +66,8 @@ import org.luaj.vm2.lib.BaseLib;
  * @see Globals#compiler
  * @see Globals#loader
  * @see org.luaj.vm2.luajc.LuaJC
- * @see org.luaj.vm2.lib.jse.JsePlatform
- * @see org.luaj.vm2.lib.jme.JmePlatform
+ * @see org.luaj.vm2.libs.jse.JsePlatform
+ * @see org.luaj.vm2.libs.jme.JmePlatform
  * @see BaseLib
  * @see LuaValue
  * @see Prototype
diff --git a/examples/android/src/android/LuajActivity.java b/examples/android/src/android/LuajActivity.java
index 0a6380e8..3783b1cd 100644
--- a/examples/android/src/android/LuajActivity.java
+++ b/examples/android/src/android/LuajActivity.java
@@ -1,7 +1,7 @@
 package org.luaj.vm2.android;
 
 import org.luaj.vm2.LuaValue;
-import org.luaj.vm2.lib.jse.CoerceJavaToLua;
+import org.luaj.vm2.libs.jse.CoerceJavaToLua;
 
 import android.app.Activity;
 import android.os.Bundle;
diff --git a/examples/android/src/android/LuajView.java b/examples/android/src/android/LuajView.java
index 979486d8..6e9faee1 100644
--- a/examples/android/src/android/LuajView.java
+++ b/examples/android/src/android/LuajView.java
@@ -4,9 +4,9 @@ import java.io.InputStream;
 
 import org.luaj.vm2.Globals;
 import org.luaj.vm2.LuaValue;
-import org.luaj.vm2.lib.ResourceFinder;
-import org.luaj.vm2.lib.jse.CoerceJavaToLua;
-import org.luaj.vm2.lib.jse.JsePlatform;
+import org.luaj.vm2.libs.ResourceFinder;
+import org.luaj.vm2.libs.jse.CoerceJavaToLua;
+import org.luaj.vm2.libs.jse.JsePlatform;
 
 import android.content.Context;
 import android.graphics.Canvas;
diff --git a/examples/jme/SampleMIDlet.java b/examples/jme/SampleMIDlet.java
index f4287a4a..b6120dff 100644
--- a/examples/jme/SampleMIDlet.java
+++ b/examples/jme/SampleMIDlet.java
@@ -4,7 +4,7 @@ import javax.microedition.midlet.MIDlet;
 import javax.microedition.midlet.MIDletStateChangeException;
 
 import org.luaj.vm2.*;
-import org.luaj.vm2.lib.jme.JmePlatform;
+import org.luaj.vm2.libs.jme.JmePlatform;
 
 
 public class SampleMIDlet extends MIDlet {
diff --git a/examples/jse/CollectingOrphanedCoroutines.java b/examples/jse/CollectingOrphanedCoroutines.java
index 86e79287..3b9345e3 100644
--- a/examples/jse/CollectingOrphanedCoroutines.java
+++ b/examples/jse/CollectingOrphanedCoroutines.java
@@ -1,7 +1,7 @@
 import org.luaj.vm2.Globals;
 import org.luaj.vm2.LuaThread;
 import org.luaj.vm2.LuaValue;
-import org.luaj.vm2.lib.jse.JsePlatform;
+import org.luaj.vm2.libs.jse.JsePlatform;
 
 /** Example that continually launches coroutines, and illustrates how to make 
 * sure the orphaned coroutines are cleaned up properly.
diff --git a/examples/jse/SampleApplet.java b/examples/jse/SampleApplet.java
index adf77cb5..57e849cf 100644
--- a/examples/jse/SampleApplet.java
+++ b/examples/jse/SampleApplet.java
@@ -7,18 +7,18 @@ import org.luaj.vm2.Globals;
 import org.luaj.vm2.LoadState;
 import org.luaj.vm2.LuaValue;
 import org.luaj.vm2.compiler.LuaC;
-import org.luaj.vm2.lib.Bit32Lib;
-import org.luaj.vm2.lib.CoroutineLib;
-import org.luaj.vm2.lib.PackageLib;
-import org.luaj.vm2.lib.ResourceFinder;
-import org.luaj.vm2.lib.TableLib;
-import org.luaj.vm2.lib.jse.CoerceJavaToLua;
-import org.luaj.vm2.lib.jse.JseBaseLib;
-import org.luaj.vm2.lib.jse.JseIoLib;
-import org.luaj.vm2.lib.jse.JseMathLib;
-import org.luaj.vm2.lib.jse.JseOsLib;
-import org.luaj.vm2.lib.jse.JseStringLib;
-import org.luaj.vm2.lib.jse.LuajavaLib;
+import org.luaj.vm2.libs.Bit32Lib;
+import org.luaj.vm2.libs.CoroutineLib;
+import org.luaj.vm2.libs.PackageLib;
+import org.luaj.vm2.libs.ResourceFinder;
+import org.luaj.vm2.libs.TableLib;
+import org.luaj.vm2.libs.jse.CoerceJavaToLua;
+import org.luaj.vm2.libs.jse.JseBaseLib;
+import org.luaj.vm2.libs.jse.JseIoLib;
+import org.luaj.vm2.libs.jse.JseMathLib;
+import org.luaj.vm2.libs.jse.JseOsLib;
+import org.luaj.vm2.libs.jse.JseStringLib;
+import org.luaj.vm2.libs.jse.LuajavaLib;
 
 /**
  * Simple Applet that forwards Applet lifecycle events to a lua script.
diff --git a/examples/jse/SampleJseMain.java b/examples/jse/SampleJseMain.java
index 519d7995..400dce91 100644
--- a/examples/jse/SampleJseMain.java
+++ b/examples/jse/SampleJseMain.java
@@ -1,7 +1,7 @@
 
 import org.luaj.vm2.Globals;
 import org.luaj.vm2.LuaValue;
-import org.luaj.vm2.lib.jse.JsePlatform;
+import org.luaj.vm2.libs.jse.JsePlatform;
 
 /** Simple program showing the minimal Java program to launch a script.
  * 
diff --git a/examples/jse/SampleMultiThreaded.java b/examples/jse/SampleMultiThreaded.java
index e68b22e9..8c313349 100644
--- a/examples/jse/SampleMultiThreaded.java
+++ b/examples/jse/SampleMultiThreaded.java
@@ -1,7 +1,7 @@
 import java.io.IOException;
 
 import org.luaj.vm2.Globals;
-import org.luaj.vm2.lib.jse.JsePlatform;
+import org.luaj.vm2.libs.jse.JsePlatform;
 
 /** Simple toy program illustrating how to run Luaj in multiple threads. 
  * 
diff --git a/examples/jse/SampleSandboxed.java b/examples/jse/SampleSandboxed.java
index ee1738af..1f445469 100644
--- a/examples/jse/SampleSandboxed.java
+++ b/examples/jse/SampleSandboxed.java
@@ -7,15 +7,15 @@ import org.luaj.vm2.LuaThread;
 import org.luaj.vm2.LuaValue;
 import org.luaj.vm2.Varargs;
 import org.luaj.vm2.compiler.LuaC;
-import org.luaj.vm2.lib.Bit32Lib;
-import org.luaj.vm2.lib.DebugLib;
-import org.luaj.vm2.lib.PackageLib;
-import org.luaj.vm2.lib.TableLib;
-import org.luaj.vm2.lib.TwoArgFunction;
-import org.luaj.vm2.lib.ZeroArgFunction;
-import org.luaj.vm2.lib.jse.JseBaseLib;
-import org.luaj.vm2.lib.jse.JseMathLib;
-import org.luaj.vm2.lib.jse.JseStringLib;
+import org.luaj.vm2.libs.Bit32Lib;
+import org.luaj.vm2.libs.DebugLib;
+import org.luaj.vm2.libs.PackageLib;
+import org.luaj.vm2.libs.TableLib;
+import org.luaj.vm2.libs.TwoArgFunction;
+import org.luaj.vm2.libs.ZeroArgFunction;
+import org.luaj.vm2.libs.jse.JseBaseLib;
+import org.luaj.vm2.libs.jse.JseMathLib;
+import org.luaj.vm2.libs.jse.JseStringLib;
 
 /** Simple program that illustrates basic sand-boxing of client scripts
  * in a server environment.
diff --git a/examples/jse/SampleUsingClassLoader.java b/examples/jse/SampleUsingClassLoader.java
index cb64039d..07bfa3d7 100644
--- a/examples/jse/SampleUsingClassLoader.java
+++ b/examples/jse/SampleUsingClassLoader.java
@@ -3,7 +3,7 @@ import java.io.Reader;
 
 import org.luaj.vm2.Globals;
 import org.luaj.vm2.LuaValue;
-import org.luaj.vm2.lib.jse.JsePlatform;
+import org.luaj.vm2.libs.jse.JsePlatform;
 import org.luaj.vm2.server.Launcher;
 import org.luaj.vm2.server.LuajClassLoader;
 
diff --git a/examples/jse/ScriptEngineSample.java b/examples/jse/ScriptEngineSample.java
index 7e8e6e25..04a65b14 100644
--- a/examples/jse/ScriptEngineSample.java
+++ b/examples/jse/ScriptEngineSample.java
@@ -12,7 +12,7 @@ import javax.script.ScriptException;
 import javax.script.SimpleBindings;
 
 import org.luaj.vm2.LuaValue;
-import org.luaj.vm2.lib.OneArgFunction;
+import org.luaj.vm2.libs.OneArgFunction;
 
 /** Sample code that uses the JSE-223 pluggable scripting language interface
  * to instantiate and use luaj. 
diff --git a/examples/jse/hyperbolic.java b/examples/jse/hyperbolic.java
index d637e98a..bfa37b92 100644
--- a/examples/jse/hyperbolic.java
+++ b/examples/jse/hyperbolic.java
@@ -1,6 +1,6 @@
 import org.luaj.vm2.LuaValue;
-import org.luaj.vm2.lib.OneArgFunction;
-import org.luaj.vm2.lib.TwoArgFunction;
+import org.luaj.vm2.libs.OneArgFunction;
+import org.luaj.vm2.libs.TwoArgFunction;
 
 /**
  * Sample library that can be called via luaj's require() implementation.
diff --git a/examples/maven/src/main/java/acme/App.java b/examples/maven/src/main/java/acme/App.java
index 16c6d3f7..ef640841 100644
--- a/examples/maven/src/main/java/acme/App.java
+++ b/examples/maven/src/main/java/acme/App.java
@@ -2,7 +2,7 @@ package acme;
 
 import org.luaj.vm2.Globals;
 import org.luaj.vm2.LuaValue;
-import org.luaj.vm2.lib.jse.JsePlatform;
+import org.luaj.vm2.libs.jse.JsePlatform;
 
 /**
  * Sample source file for a maven project that depends on luaj.
diff --git a/examples/maven/src/test/java/acme/AppTest.java b/examples/maven/src/test/java/acme/AppTest.java
index 5da75f7f..1da3de05 100644
--- a/examples/maven/src/test/java/acme/AppTest.java
+++ b/examples/maven/src/test/java/acme/AppTest.java
@@ -10,9 +10,7 @@ import junit.framework.TestSuite;
 
 import org.luaj.vm2.Globals;
 import org.luaj.vm2.LuaValue;
-import org.luaj.vm2.lib.jse.JsePlatform;
-
-import acme.App;
+import org.luaj.vm2.libs.jse.JsePlatform;
 
 /**
  * Skeleton unit test for App, required for maven to be used to build the app.
diff --git a/jme/src/main/java/org/openautonomousconnection/luaj/Main.java b/jme/src/main/java/org/openautonomousconnection/luaj/Main.java
deleted file mode 100644
index eaac0957..00000000
--- a/jme/src/main/java/org/openautonomousconnection/luaj/Main.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.openautonomousconnection.luaj;
-
-//TIP To Run code, press  or
-// click the  icon in the gutter.
-public class Main {
-    static void main() {
-        //TIP Press  with your caret at the highlighted text
-        // to see how IntelliJ IDEA suggests fixing it.
-        IO.println(String.format("Hello and welcome!"));
-
-        for (int i = 1; i <= 5; i++) {
-            //TIP Press  to start debugging your code. We have set one  breakpoint
-            // for you, but you can always add more by pressing .
-            IO.println("i = " + i);
-        }
-    }
-}
diff --git a/jse/src/main/java/lua.java b/jse/src/main/java/lua.java
index 39e488f2..707cf444 100644
--- a/jse/src/main/java/lua.java
+++ b/jse/src/main/java/lua.java
@@ -35,7 +35,7 @@ import org.luaj.vm2.LuaTable;
 import org.luaj.vm2.LuaValue;
 import org.luaj.vm2.Print;
 import org.luaj.vm2.Varargs;
-import org.luaj.vm2.lib.jse.JsePlatform;
+import org.luaj.vm2.libs.jse.JsePlatform;
 import org.luaj.vm2.luajc.LuaJC;
 
 
diff --git a/jse/src/main/java/luac.java b/jse/src/main/java/luac.java
index f0af43fe..19921986 100644
--- a/jse/src/main/java/luac.java
+++ b/jse/src/main/java/luac.java
@@ -33,7 +33,7 @@ import org.luaj.vm2.Lua;
 import org.luaj.vm2.Print;
 import org.luaj.vm2.Prototype;
 import org.luaj.vm2.compiler.DumpState;
-import org.luaj.vm2.lib.jse.JsePlatform;
+import org.luaj.vm2.libs.jse.JsePlatform;
 
 
 /**
diff --git a/jse/src/main/java/luajc.java b/jse/src/main/java/luajc.java
index f54176b4..81113bc8 100644
--- a/jse/src/main/java/luajc.java
+++ b/jse/src/main/java/luajc.java
@@ -32,7 +32,7 @@ import java.util.List;
 
 import org.luaj.vm2.Globals;
 import org.luaj.vm2.Lua;
-import org.luaj.vm2.lib.jse.JsePlatform;
+import org.luaj.vm2.libs.jse.JsePlatform;
 import org.luaj.vm2.luajc.LuaJC;
 
 /**
diff --git a/jse/src/main/java/org/luaj/vm2/luajc/JavaBuilder.java b/jse/src/main/java/org/luaj/vm2/luajc/JavaBuilder.java
index cd6cf132..c5ebf96e 100644
--- a/jse/src/main/java/org/luaj/vm2/luajc/JavaBuilder.java
+++ b/jse/src/main/java/org/luaj/vm2/luajc/JavaBuilder.java
@@ -60,11 +60,11 @@ import org.luaj.vm2.LuaTable;
 import org.luaj.vm2.LuaValue;
 import org.luaj.vm2.Prototype;
 import org.luaj.vm2.Varargs;
-import org.luaj.vm2.lib.OneArgFunction;
-import org.luaj.vm2.lib.ThreeArgFunction;
-import org.luaj.vm2.lib.TwoArgFunction;
-import org.luaj.vm2.lib.VarArgFunction;
-import org.luaj.vm2.lib.ZeroArgFunction;
+import org.luaj.vm2.libs.OneArgFunction;
+import org.luaj.vm2.libs.ThreeArgFunction;
+import org.luaj.vm2.libs.TwoArgFunction;
+import org.luaj.vm2.libs.VarArgFunction;
+import org.luaj.vm2.libs.ZeroArgFunction;
 
 public class JavaBuilder {
 	
diff --git a/jse/src/main/java/org/luaj/vm2/luajc/LuaJC.java b/jse/src/main/java/org/luaj/vm2/luajc/LuaJC.java
index 53117478..036605fb 100644
--- a/jse/src/main/java/org/luaj/vm2/luajc/LuaJC.java
+++ b/jse/src/main/java/org/luaj/vm2/luajc/LuaJC.java
@@ -32,13 +32,14 @@ import org.luaj.vm2.LuaFunction;
 import org.luaj.vm2.LuaValue;
 import org.luaj.vm2.Prototype;
 import org.luaj.vm2.compiler.LuaC;
+import org.luaj.vm2.libs.jse.JsePlatform;
 
 /**
  * Implementation of {@link Globals.Compiler} which does direct
  * lua-to-java-bytecode compiling. 
  * 

- * By default, when using {@link org.luaj.vm2.lib.jse.JsePlatform} or 
- * {@link org.luaj.vm2.lib.jme.JmePlatform}
+ * By default, when using {@link JsePlatform} or
+ * {@link org.luaj.vm2.libs.jme.JmePlatform}
  * to construct globals, the plain compiler {@link LuaC} is installed and lua code 
  * will only be compiled into lua bytecode and execute as {@link LuaClosure}. 
  * 

diff --git a/jse/src/main/java/org/luaj/vm2/script/LuaScriptEngine.java b/jse/src/main/java/org/luaj/vm2/script/LuaScriptEngine.java
index 8ef45743..e8525c0e 100644
--- a/jse/src/main/java/org/luaj/vm2/script/LuaScriptEngine.java
+++ b/jse/src/main/java/org/luaj/vm2/script/LuaScriptEngine.java
@@ -26,9 +26,9 @@ import java.io.*;
 import javax.script.*;
 
 import org.luaj.vm2.*;
-import org.luaj.vm2.lib.ThreeArgFunction;
-import org.luaj.vm2.lib.TwoArgFunction;
-import org.luaj.vm2.lib.jse.CoerceJavaToLua;
+import org.luaj.vm2.libs.ThreeArgFunction;
+import org.luaj.vm2.libs.TwoArgFunction;
+import org.luaj.vm2.libs.jse.CoerceJavaToLua;
 
 /**
  * Implementation of the ScriptEngine interface which can compile and execute
diff --git a/jse/src/main/java/org/luaj/vm2/script/LuajContext.java b/jse/src/main/java/org/luaj/vm2/script/LuajContext.java
index 4668e41c..b80784df 100644
--- a/jse/src/main/java/org/luaj/vm2/script/LuajContext.java
+++ b/jse/src/main/java/org/luaj/vm2/script/LuajContext.java
@@ -32,7 +32,7 @@ import javax.script.ScriptContext;
 import javax.script.SimpleScriptContext;
 
 import org.luaj.vm2.Globals;
-import org.luaj.vm2.lib.jse.JsePlatform;
+import org.luaj.vm2.libs.jse.JsePlatform;
 import org.luaj.vm2.luajc.LuaJC;
 
 /** 
diff --git a/jse/src/main/java/org/luaj/vm2/server/DefaultLauncher.java b/jse/src/main/java/org/luaj/vm2/server/DefaultLauncher.java
index 098f64a4..aeeaf535 100644
--- a/jse/src/main/java/org/luaj/vm2/server/DefaultLauncher.java
+++ b/jse/src/main/java/org/luaj/vm2/server/DefaultLauncher.java
@@ -27,8 +27,8 @@ import java.io.Reader;
 import org.luaj.vm2.Globals;
 import org.luaj.vm2.LuaValue;
 import org.luaj.vm2.Varargs;
-import org.luaj.vm2.lib.jse.CoerceJavaToLua;
-import org.luaj.vm2.lib.jse.JsePlatform;
+import org.luaj.vm2.libs.jse.CoerceJavaToLua;
+import org.luaj.vm2.libs.jse.JsePlatform;
 
 /**
  * Default {@link Launcher} instance that creates standard globals 
diff --git a/jse/src/test/java/org/luaj/luajc/SampleMainChunk.java b/jse/src/test/java/org/luaj/luajc/SampleMainChunk.java
index 87168ada..9889638f 100644
--- a/jse/src/test/java/org/luaj/luajc/SampleMainChunk.java
+++ b/jse/src/test/java/org/luaj/luajc/SampleMainChunk.java
@@ -2,8 +2,8 @@ package org.luaj.luajc;
 
 import org.luaj.vm2.LuaValue;
 import org.luaj.vm2.Varargs;
-import org.luaj.vm2.lib.TwoArgFunction;
-import org.luaj.vm2.lib.VarArgFunction;
+import org.luaj.vm2.libs.TwoArgFunction;
+import org.luaj.vm2.libs.VarArgFunction;
 
 public class SampleMainChunk extends VarArgFunction {
 
diff --git a/jse/src/test/java/org/luaj/luajc/TestLuaJ.java b/jse/src/test/java/org/luaj/luajc/TestLuaJ.java
index eee17c5c..8e6c7253 100644
--- a/jse/src/test/java/org/luaj/luajc/TestLuaJ.java
+++ b/jse/src/test/java/org/luaj/luajc/TestLuaJ.java
@@ -25,7 +25,7 @@ import org.luaj.vm2.Globals;
 import org.luaj.vm2.LuaValue;
 import org.luaj.vm2.Print;
 import org.luaj.vm2.Prototype;
-import org.luaj.vm2.lib.jse.JsePlatform;
+import org.luaj.vm2.libs.jse.JsePlatform;
 
 /** Test the plain old bytecode interpreter */
 public class TestLuaJ {
diff --git a/jse/src/test/java/org/luaj/luajc/TestLuaJC.java b/jse/src/test/java/org/luaj/luajc/TestLuaJC.java
index 061d110f..82fc77cc 100644
--- a/jse/src/test/java/org/luaj/luajc/TestLuaJC.java
+++ b/jse/src/test/java/org/luaj/luajc/TestLuaJC.java
@@ -31,7 +31,7 @@ import org.luaj.vm2.LuaValue;
 import org.luaj.vm2.Print;
 import org.luaj.vm2.Prototype;
 import org.luaj.vm2.Varargs;
-import org.luaj.vm2.lib.jse.JsePlatform;
+import org.luaj.vm2.libs.jse.JsePlatform;
 import org.luaj.vm2.luajc.LuaJC;
 
 public class TestLuaJC {
diff --git a/jse/src/test/java/org/luaj/vm2/AllTests.java b/jse/src/test/java/org/luaj/vm2/AllTests.java
index 0062371f..6da43538 100644
--- a/jse/src/test/java/org/luaj/vm2/AllTests.java
+++ b/jse/src/test/java/org/luaj/vm2/AllTests.java
@@ -32,11 +32,11 @@ import org.luaj.vm2.compiler.DumpLoadEndianIntTest;
 import org.luaj.vm2.compiler.LuaParserTests;
 import org.luaj.vm2.compiler.RegressionTests;
 import org.luaj.vm2.compiler.SimpleTests;
-import org.luaj.vm2.lib.jse.JsePlatformTest;
-import org.luaj.vm2.lib.jse.LuaJavaCoercionTest;
-import org.luaj.vm2.lib.jse.LuajavaAccessibleMembersTest;
-import org.luaj.vm2.lib.jse.LuajavaClassMembersTest;
-import org.luaj.vm2.lib.jse.OsLibTest;
+import org.luaj.vm2.libs.jse.JsePlatformTest;
+import org.luaj.vm2.libs.jse.LuaJavaCoercionTest;
+import org.luaj.vm2.libs.jse.LuajavaAccessibleMembersTest;
+import org.luaj.vm2.libs.jse.LuajavaClassMembersTest;
+import org.luaj.vm2.libs.jse.OsLibTest;
 import org.luaj.vm2.script.ScriptEngineTests;
 
 public class AllTests {
diff --git a/jse/src/test/java/org/luaj/vm2/FragmentsTest.java b/jse/src/test/java/org/luaj/vm2/FragmentsTest.java
index 822f92b4..33846915 100644
--- a/jse/src/test/java/org/luaj/vm2/FragmentsTest.java
+++ b/jse/src/test/java/org/luaj/vm2/FragmentsTest.java
@@ -27,7 +27,7 @@ import java.io.StringReader;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import org.luaj.vm2.lib.jse.JsePlatform;
+import org.luaj.vm2.libs.jse.JsePlatform;
 import org.luaj.vm2.luajc.LuaJC;
 
 /** 
diff --git a/jse/src/test/java/org/luaj/vm2/LoadOrderTest.java b/jse/src/test/java/org/luaj/vm2/LoadOrderTest.java
index de8ae6a0..d911cd7f 100644
--- a/jse/src/test/java/org/luaj/vm2/LoadOrderTest.java
+++ b/jse/src/test/java/org/luaj/vm2/LoadOrderTest.java
@@ -26,7 +26,7 @@ import java.io.Reader;
 
 import junit.framework.TestCase;
 
-import org.luaj.vm2.lib.jse.JsePlatform;
+import org.luaj.vm2.libs.jse.JsePlatform;
 import org.luaj.vm2.server.Launcher;
 import org.luaj.vm2.server.LuajClassLoader;
 
diff --git a/jse/src/test/java/org/luaj/vm2/LuaOperationsTest.java b/jse/src/test/java/org/luaj/vm2/LuaOperationsTest.java
index 84231586..84119a57 100644
--- a/jse/src/test/java/org/luaj/vm2/LuaOperationsTest.java
+++ b/jse/src/test/java/org/luaj/vm2/LuaOperationsTest.java
@@ -28,8 +28,8 @@ import java.lang.reflect.InvocationTargetException;
 import junit.framework.TestCase;
 
 import org.luaj.vm2.TypeTest.MyData;
-import org.luaj.vm2.compiler.LuaC;
-import org.luaj.vm2.lib.ZeroArgFunction;
+import org.luaj.vm2.libs.ZeroArgFunction;
+import org.luaj.vm2.libs.jse.JsePlatform;
 
 public class LuaOperationsTest extends TestCase {
 	
@@ -130,7 +130,7 @@ public class LuaOperationsTest extends TestCase {
 
 	public Prototype createPrototype( String script, String name ) {
 		try {
-			Globals globals = org.luaj.vm2.lib.jse.JsePlatform.standardGlobals();
+			Globals globals = JsePlatform.standardGlobals();
 			Reader reader = new StringReader(script);
 			return globals.compilePrototype(reader, name);
 		} catch (Exception e) {
@@ -146,7 +146,7 @@ public class LuaOperationsTest extends TestCase {
 		// set up suitable environments for execution
 		LuaValue aaa = LuaValue.valueOf("aaa");
 		LuaValue eee = LuaValue.valueOf("eee");
-		final Globals globals = org.luaj.vm2.lib.jse.JsePlatform.standardGlobals();
+		final Globals globals = JsePlatform.standardGlobals();
 		LuaTable newenv = LuaValue.tableOf( new LuaValue[] { 
 				LuaValue.valueOf("a"), LuaValue.valueOf("aaa"), 
 				LuaValue.valueOf("b"), LuaValue.valueOf("bbb"), } );
diff --git a/jse/src/test/java/org/luaj/vm2/MathLibTest.java b/jse/src/test/java/org/luaj/vm2/MathLibTest.java
index ba3b290b..db696e40 100644
--- a/jse/src/test/java/org/luaj/vm2/MathLibTest.java
+++ b/jse/src/test/java/org/luaj/vm2/MathLibTest.java
@@ -2,8 +2,8 @@ package org.luaj.vm2;
 
 import junit.framework.TestCase;
 
-import org.luaj.vm2.lib.jme.JmePlatform;
-import org.luaj.vm2.lib.jse.JsePlatform;
+import org.luaj.vm2.libs.jme.JmePlatform;
+import org.luaj.vm2.libs.jse.JsePlatform;
 
 public class MathLibTest extends TestCase {
 
diff --git a/jse/src/test/java/org/luaj/vm2/MetatableTest.java b/jse/src/test/java/org/luaj/vm2/MetatableTest.java
index 1dffff45..0e9e0ae4 100644
--- a/jse/src/test/java/org/luaj/vm2/MetatableTest.java
+++ b/jse/src/test/java/org/luaj/vm2/MetatableTest.java
@@ -24,10 +24,10 @@ package org.luaj.vm2;
 import junit.framework.TestCase;
 
 import org.luaj.vm2.TypeTest.MyData;
-import org.luaj.vm2.lib.StringLib;
-import org.luaj.vm2.lib.ThreeArgFunction;
-import org.luaj.vm2.lib.TwoArgFunction;
-import org.luaj.vm2.lib.ZeroArgFunction;
+import org.luaj.vm2.libs.StringLib;
+import org.luaj.vm2.libs.ThreeArgFunction;
+import org.luaj.vm2.libs.TwoArgFunction;
+import org.luaj.vm2.libs.ZeroArgFunction;
 
 public class MetatableTest extends TestCase {
 
diff --git a/jse/src/test/java/org/luaj/vm2/OrphanedThreadTest.java b/jse/src/test/java/org/luaj/vm2/OrphanedThreadTest.java
index 14cecb4c..2daa6b06 100644
--- a/jse/src/test/java/org/luaj/vm2/OrphanedThreadTest.java
+++ b/jse/src/test/java/org/luaj/vm2/OrphanedThreadTest.java
@@ -25,8 +25,8 @@ import java.lang.ref.WeakReference;
 
 import junit.framework.TestCase;
 
-import org.luaj.vm2.lib.OneArgFunction;
-import org.luaj.vm2.lib.jse.JsePlatform;
+import org.luaj.vm2.libs.OneArgFunction;
+import org.luaj.vm2.libs.jse.JsePlatform;
 
 
 public class OrphanedThreadTest extends TestCase {
diff --git a/jse/src/test/java/org/luaj/vm2/RequireClassTest.java b/jse/src/test/java/org/luaj/vm2/RequireClassTest.java
index e617a5c4..a66a02fe 100644
--- a/jse/src/test/java/org/luaj/vm2/RequireClassTest.java
+++ b/jse/src/test/java/org/luaj/vm2/RequireClassTest.java
@@ -2,7 +2,7 @@ package org.luaj.vm2;
 
 import junit.framework.TestCase;
 
-import org.luaj.vm2.lib.jse.JsePlatform;
+import org.luaj.vm2.libs.jse.JsePlatform;
 import org.luaj.vm2.require.RequireSampleClassCastExcep;
 import org.luaj.vm2.require.RequireSampleLoadLuaError;
 import org.luaj.vm2.require.RequireSampleLoadRuntimeExcep;
diff --git a/jse/src/test/java/org/luaj/vm2/ScriptDrivenTest.java b/jse/src/test/java/org/luaj/vm2/ScriptDrivenTest.java
index 98ec7d18..71c33cfb 100644
--- a/jse/src/test/java/org/luaj/vm2/ScriptDrivenTest.java
+++ b/jse/src/test/java/org/luaj/vm2/ScriptDrivenTest.java
@@ -34,8 +34,9 @@ import java.net.URL;
 
 import junit.framework.TestCase;
 
-import org.luaj.vm2.lib.ResourceFinder;
-import org.luaj.vm2.lib.jse.JseProcess;
+import org.luaj.vm2.libs.ResourceFinder;
+import org.luaj.vm2.libs.jse.JseProcess;
+import org.luaj.vm2.libs.jse.JsePlatform;
 import org.luaj.vm2.luajc.LuaJC;
 
 abstract
@@ -64,10 +65,10 @@ public class ScriptDrivenTest extends TestCase implements ResourceFinder {
 		default:
 		case JSE:
 		case LUAJIT:
-			globals = org.luaj.vm2.lib.jse.JsePlatform.debugGlobals();
+			globals = JsePlatform.debugGlobals();
 			break;
 		case JME:
-			globals = org.luaj.vm2.lib.jme.JmePlatform.debugGlobals();
+			globals = org.luaj.vm2.libs.jme.JmePlatform.debugGlobals();
 			break;
 		}
 	}
diff --git a/jse/src/test/java/org/luaj/vm2/StringTest.java b/jse/src/test/java/org/luaj/vm2/StringTest.java
index ff01d0d6..1b72bf12 100644
--- a/jse/src/test/java/org/luaj/vm2/StringTest.java
+++ b/jse/src/test/java/org/luaj/vm2/StringTest.java
@@ -6,7 +6,7 @@ import java.io.UnsupportedEncodingException;
 
 import junit.framework.TestCase;
 
-import org.luaj.vm2.lib.jse.JsePlatform;
+import org.luaj.vm2.libs.jse.JsePlatform;
 
 public class StringTest extends TestCase {
 
diff --git a/jse/src/test/java/org/luaj/vm2/TableHashTest.java b/jse/src/test/java/org/luaj/vm2/TableHashTest.java
index b36b84cc..88ed4247 100644
--- a/jse/src/test/java/org/luaj/vm2/TableHashTest.java
+++ b/jse/src/test/java/org/luaj/vm2/TableHashTest.java
@@ -23,10 +23,7 @@ package org.luaj.vm2;
 
 import junit.framework.TestCase;
 
-import org.luaj.vm2.LuaString;
-import org.luaj.vm2.LuaTable;
-import org.luaj.vm2.LuaValue;
-import org.luaj.vm2.lib.TwoArgFunction;
+import org.luaj.vm2.libs.TwoArgFunction;
 
 /**
  * Tests for tables used as lists. 
diff --git a/jse/src/test/java/org/luaj/vm2/TypeTest.java b/jse/src/test/java/org/luaj/vm2/TypeTest.java
index 74535e43..e240bcc5 100644
--- a/jse/src/test/java/org/luaj/vm2/TypeTest.java
+++ b/jse/src/test/java/org/luaj/vm2/TypeTest.java
@@ -25,8 +25,8 @@ import java.lang.reflect.InvocationTargetException;
 
 import junit.framework.TestCase;
 
-import org.luaj.vm2.lib.ZeroArgFunction;
-import org.luaj.vm2.lib.jse.JsePlatform;
+import org.luaj.vm2.libs.ZeroArgFunction;
+import org.luaj.vm2.libs.jse.JsePlatform;
 
 public class TypeTest extends TestCase {
 	static {
diff --git a/jse/src/test/java/org/luaj/vm2/UTF8StreamTest.java b/jse/src/test/java/org/luaj/vm2/UTF8StreamTest.java
index 1d9f3d23..fa859b7e 100644
--- a/jse/src/test/java/org/luaj/vm2/UTF8StreamTest.java
+++ b/jse/src/test/java/org/luaj/vm2/UTF8StreamTest.java
@@ -23,7 +23,7 @@ package org.luaj.vm2;
 
 import junit.framework.TestCase;
 
-import org.luaj.vm2.lib.jse.JsePlatform;
+import org.luaj.vm2.libs.jse.JsePlatform;
 
 public class UTF8StreamTest  extends TestCase {
 
diff --git a/jse/src/test/java/org/luaj/vm2/UnaryBinaryOperatorsTest.java b/jse/src/test/java/org/luaj/vm2/UnaryBinaryOperatorsTest.java
index 90bacd19..38080040 100644
--- a/jse/src/test/java/org/luaj/vm2/UnaryBinaryOperatorsTest.java
+++ b/jse/src/test/java/org/luaj/vm2/UnaryBinaryOperatorsTest.java
@@ -25,7 +25,7 @@ import java.lang.reflect.InvocationTargetException;
 
 import junit.framework.TestCase;
 
-import org.luaj.vm2.lib.TwoArgFunction;
+import org.luaj.vm2.libs.TwoArgFunction;
 
 /**
  * Tests of basic unary and binary operators on main value types.
diff --git a/jse/src/test/java/org/luaj/vm2/compiler/AbstractUnitTests.java b/jse/src/test/java/org/luaj/vm2/compiler/AbstractUnitTests.java
index 5e4fb3a4..4b9f10eb 100644
--- a/jse/src/test/java/org/luaj/vm2/compiler/AbstractUnitTests.java
+++ b/jse/src/test/java/org/luaj/vm2/compiler/AbstractUnitTests.java
@@ -4,8 +4,7 @@ import junit.framework.TestCase;
 import org.luaj.vm2.Globals;
 import org.luaj.vm2.Print;
 import org.luaj.vm2.Prototype;
-import org.luaj.vm2.compiler.DumpState;
-import org.luaj.vm2.lib.jse.JsePlatform;
+import org.luaj.vm2.libs.jse.JsePlatform;
 
 import java.io.*;
 import java.net.MalformedURLException;
diff --git a/jse/src/test/java/org/luaj/vm2/compiler/DumpLoadEndianIntTest.java b/jse/src/test/java/org/luaj/vm2/compiler/DumpLoadEndianIntTest.java
index 066af4c9..a3a64119 100644
--- a/jse/src/test/java/org/luaj/vm2/compiler/DumpLoadEndianIntTest.java
+++ b/jse/src/test/java/org/luaj/vm2/compiler/DumpLoadEndianIntTest.java
@@ -2,8 +2,7 @@ package org.luaj.vm2.compiler;
 
 import junit.framework.TestCase;
 import org.luaj.vm2.*;
-import org.luaj.vm2.compiler.DumpState;
-import org.luaj.vm2.lib.jse.JsePlatform;
+import org.luaj.vm2.libs.jse.JsePlatform;
 
 import java.io.*;
 
diff --git a/jse/src/test/java/org/luaj/vm2/compiler/SimpleTests.java b/jse/src/test/java/org/luaj/vm2/compiler/SimpleTests.java
index 3055d281..143b9490 100644
--- a/jse/src/test/java/org/luaj/vm2/compiler/SimpleTests.java
+++ b/jse/src/test/java/org/luaj/vm2/compiler/SimpleTests.java
@@ -5,7 +5,7 @@ import org.luaj.vm2.Globals;
 import org.luaj.vm2.LuaDouble;
 import org.luaj.vm2.LuaInteger;
 import org.luaj.vm2.LuaValue;
-import org.luaj.vm2.lib.jse.JsePlatform;
+import org.luaj.vm2.libs.jse.JsePlatform;
 
 public class SimpleTests extends TestCase {
 
diff --git a/jse/src/test/java/org/luaj/vm2/require/RequireSampleLoadLuaError.java b/jse/src/test/java/org/luaj/vm2/require/RequireSampleLoadLuaError.java
index 0ba5e148..abfc0849 100644
--- a/jse/src/test/java/org/luaj/vm2/require/RequireSampleLoadLuaError.java
+++ b/jse/src/test/java/org/luaj/vm2/require/RequireSampleLoadLuaError.java
@@ -1,7 +1,7 @@
 package org.luaj.vm2.require;
 
 import org.luaj.vm2.LuaValue;
-import org.luaj.vm2.lib.ZeroArgFunction;
+import org.luaj.vm2.libs.ZeroArgFunction;
 
 /**
  * This should fail while trying to load via 
diff --git a/jse/src/test/java/org/luaj/vm2/require/RequireSampleLoadRuntimeExcep.java b/jse/src/test/java/org/luaj/vm2/require/RequireSampleLoadRuntimeExcep.java
index 1f416b89..770c01a3 100644
--- a/jse/src/test/java/org/luaj/vm2/require/RequireSampleLoadRuntimeExcep.java
+++ b/jse/src/test/java/org/luaj/vm2/require/RequireSampleLoadRuntimeExcep.java
@@ -1,7 +1,7 @@
 package org.luaj.vm2.require;
 
 import org.luaj.vm2.LuaValue;
-import org.luaj.vm2.lib.ZeroArgFunction;
+import org.luaj.vm2.libs.ZeroArgFunction;
 
 /**
 * This should fail while trying to load via "require()" because it throws a RuntimeException
diff --git a/jse/src/test/java/org/luaj/vm2/require/RequireSampleSuccess.java b/jse/src/test/java/org/luaj/vm2/require/RequireSampleSuccess.java
index 766d3eb8..31099a50 100644
--- a/jse/src/test/java/org/luaj/vm2/require/RequireSampleSuccess.java
+++ b/jse/src/test/java/org/luaj/vm2/require/RequireSampleSuccess.java
@@ -1,7 +1,7 @@
 package org.luaj.vm2.require;
 
 import org.luaj.vm2.LuaValue;
-import org.luaj.vm2.lib.TwoArgFunction;
+import org.luaj.vm2.libs.TwoArgFunction;
 
 /**
  * This should succeed as a library that can be loaded dynamically via "require()"
diff --git a/jse/src/test/java/org/luaj/vm2/script/ScriptEngineTests.java b/jse/src/test/java/org/luaj/vm2/script/ScriptEngineTests.java
index 102c2874..88e63497 100644
--- a/jse/src/test/java/org/luaj/vm2/script/ScriptEngineTests.java
+++ b/jse/src/test/java/org/luaj/vm2/script/ScriptEngineTests.java
@@ -40,7 +40,7 @@ import junit.framework.TestSuite;
 
 import org.luaj.vm2.LuaFunction;
 import org.luaj.vm2.LuaValue;
-import org.luaj.vm2.lib.OneArgFunction;
+import org.luaj.vm2.libs.OneArgFunction;
 
 public class ScriptEngineTests extends TestSuite  {