diff --git a/DroidFish/jni/gtb/GtbProbe.cpp b/DroidFish/jni/gtb/GtbProbe.cpp
index cbfbf73..4e2a8b6 100644
--- a/DroidFish/jni/gtb/GtbProbe.cpp
+++ b/DroidFish/jni/gtb/GtbProbe.cpp
@@ -27,7 +27,7 @@ static const char** paths = NULL;
 
 
 JNIEXPORT jboolean
-JNICALL Java_org_petero_droidfish_gtb_GtbProbe_init(
+JNICALL Java_org_petero_droidfish_tb_GtbProbe_init(
         JNIEnv* env, jclass cls, jstring jTbPath)
 {
     initOk = false;
@@ -70,7 +70,7 @@ JNICALL Java_org_petero_droidfish_gtb_GtbProbe_init(
 #define BLACK_TO_MOVE 1
 
 JNIEXPORT jboolean
-JNICALL Java_org_petero_droidfish_gtb_GtbProbe_probeHard(
+JNICALL Java_org_petero_droidfish_tb_GtbProbe_probeHard(
         JNIEnv* env, jobject ths,
         jboolean wtm, jint epSq, jint castleMask,
         jintArray whiteSquares, jintArray blackSquares,
diff --git a/DroidFish/jni/gtb/GtbProbe.h b/DroidFish/jni/gtb/GtbProbe.h
index 3137625..51de3fd 100644
--- a/DroidFish/jni/gtb/GtbProbe.h
+++ b/DroidFish/jni/gtb/GtbProbe.h
@@ -2,59 +2,59 @@
 #include <jni.h>
 /* Header for class org_petero_droidfish_gtb_GtbProbe */
 
-#ifndef _Included_org_petero_droidfish_gtb_GtbProbe
-#define _Included_org_petero_droidfish_gtb_GtbProbe
+#ifndef _Included_org_petero_droidfish_tb_GtbProbe
+#define _Included_org_petero_droidfish_tb_GtbProbe
 #ifdef __cplusplus
 extern "C" {
 #endif
-#undef org_petero_droidfish_gtb_GtbProbe_NOPIECE
-#define org_petero_droidfish_gtb_GtbProbe_NOPIECE 0L
-#undef org_petero_droidfish_gtb_GtbProbe_PAWN
-#define org_petero_droidfish_gtb_GtbProbe_PAWN 1L
-#undef org_petero_droidfish_gtb_GtbProbe_KNIGHT
-#define org_petero_droidfish_gtb_GtbProbe_KNIGHT 2L
-#undef org_petero_droidfish_gtb_GtbProbe_BISHOP
-#define org_petero_droidfish_gtb_GtbProbe_BISHOP 3L
-#undef org_petero_droidfish_gtb_GtbProbe_ROOK
-#define org_petero_droidfish_gtb_GtbProbe_ROOK 4L
-#undef org_petero_droidfish_gtb_GtbProbe_QUEEN
-#define org_petero_droidfish_gtb_GtbProbe_QUEEN 5L
-#undef org_petero_droidfish_gtb_GtbProbe_KING
-#define org_petero_droidfish_gtb_GtbProbe_KING 6L
-#undef org_petero_droidfish_gtb_GtbProbe_NOSQUARE
-#define org_petero_droidfish_gtb_GtbProbe_NOSQUARE 64L
-#undef org_petero_droidfish_gtb_GtbProbe_H1_CASTLE
-#define org_petero_droidfish_gtb_GtbProbe_H1_CASTLE 8L
-#undef org_petero_droidfish_gtb_GtbProbe_A1_CASTLE
-#define org_petero_droidfish_gtb_GtbProbe_A1_CASTLE 4L
-#undef org_petero_droidfish_gtb_GtbProbe_H8_CASTLE
-#define org_petero_droidfish_gtb_GtbProbe_H8_CASTLE 2L
-#undef org_petero_droidfish_gtb_GtbProbe_A8_CASTLE
-#define org_petero_droidfish_gtb_GtbProbe_A8_CASTLE 1L
-#undef org_petero_droidfish_gtb_GtbProbe_DRAW
-#define org_petero_droidfish_gtb_GtbProbe_DRAW 0L
-#undef org_petero_droidfish_gtb_GtbProbe_WMATE
-#define org_petero_droidfish_gtb_GtbProbe_WMATE 1L
-#undef org_petero_droidfish_gtb_GtbProbe_BMATE
-#define org_petero_droidfish_gtb_GtbProbe_BMATE 2L
-#undef org_petero_droidfish_gtb_GtbProbe_FORBID
-#define org_petero_droidfish_gtb_GtbProbe_FORBID 3L
-#undef org_petero_droidfish_gtb_GtbProbe_UNKNOWN
-#define org_petero_droidfish_gtb_GtbProbe_UNKNOWN 7L
+#undef org_petero_droidfish_tb_GtbProbe_NOPIECE
+#define org_petero_droidfish_tb_GtbProbe_NOPIECE 0L
+#undef org_petero_droidfish_tb_GtbProbe_PAWN
+#define org_petero_droidfish_tb_GtbProbe_PAWN 1L
+#undef org_petero_droidfish_tb_GtbProbe_KNIGHT
+#define org_petero_droidfish_tb_GtbProbe_KNIGHT 2L
+#undef org_petero_droidfish_tb_GtbProbe_BISHOP
+#define org_petero_droidfish_tb_GtbProbe_BISHOP 3L
+#undef org_petero_droidfish_tb_GtbProbe_ROOK
+#define org_petero_droidfish_tb_GtbProbe_ROOK 4L
+#undef org_petero_droidfish_tb_GtbProbe_QUEEN
+#define org_petero_droidfish_tb_GtbProbe_QUEEN 5L
+#undef org_petero_droidfish_tb_GtbProbe_KING
+#define org_petero_droidfish_tb_GtbProbe_KING 6L
+#undef org_petero_droidfish_tb_GtbProbe_NOSQUARE
+#define org_petero_droidfish_tb_GtbProbe_NOSQUARE 64L
+#undef org_petero_droidfish_tb_GtbProbe_H1_CASTLE
+#define org_petero_droidfish_tb_GtbProbe_H1_CASTLE 8L
+#undef org_petero_droidfish_tb_GtbProbe_A1_CASTLE
+#define org_petero_droidfish_tb_GtbProbe_A1_CASTLE 4L
+#undef org_petero_droidfish_tb_GtbProbe_H8_CASTLE
+#define org_petero_droidfish_tb_GtbProbe_H8_CASTLE 2L
+#undef org_petero_droidfish_tb_GtbProbe_A8_CASTLE
+#define org_petero_droidfish_tb_GtbProbe_A8_CASTLE 1L
+#undef org_petero_droidfish_tb_GtbProbe_DRAW
+#define org_petero_droidfish_tb_GtbProbe_DRAW 0L
+#undef org_petero_droidfish_tb_GtbProbe_WMATE
+#define org_petero_droidfish_tb_GtbProbe_WMATE 1L
+#undef org_petero_droidfish_tb_GtbProbe_BMATE
+#define org_petero_droidfish_tb_GtbProbe_BMATE 2L
+#undef org_petero_droidfish_tb_GtbProbe_FORBID
+#define org_petero_droidfish_tb_GtbProbe_FORBID 3L
+#undef org_petero_droidfish_tb_GtbProbe_UNKNOWN
+#define org_petero_droidfish_tb_GtbProbe_UNKNOWN 7L
 /*
- * Class:     org_petero_droidfish_gtb_GtbProbe
+ * Class:     org_petero_droidfish_tb_GtbProbe
  * Method:    probeHard
  * Signature: (ZII[I[I[B[B[I)Z
  */
-JNIEXPORT jboolean JNICALL Java_org_petero_droidfish_gtb_GtbProbe_probeHard
+JNIEXPORT jboolean JNICALL Java_org_petero_droidfish_tb_GtbProbe_probeHard
   (JNIEnv *, jobject, jboolean, jint, jint, jintArray, jintArray, jbyteArray, jbyteArray, jintArray);
 
 /*
- * Class:     org_petero_droidfish_gtb_GtbProbe
+ * Class:     org_petero_droidfish_tb_GtbProbe
  * Method:    init
  * Signature: (Ljava/lang/String;)Z
  */
-JNIEXPORT jboolean JNICALL Java_org_petero_droidfish_gtb_GtbProbe_init
+JNIEXPORT jboolean JNICALL Java_org_petero_droidfish_tb_GtbProbe_init
   (JNIEnv *, jclass, jstring);
 
 #ifdef __cplusplus
diff --git a/DroidFish/jni/rtb/RtbProbe.cpp b/DroidFish/jni/rtb/RtbProbe.cpp
index 6768211..32312f3 100644
--- a/DroidFish/jni/rtb/RtbProbe.cpp
+++ b/DroidFish/jni/rtb/RtbProbe.cpp
@@ -23,7 +23,7 @@
 static bool initOk = false;
 
 JNIEXPORT jboolean
-JNICALL Java_org_petero_droidfish_gtb_RtbProbe_init(
+JNICALL Java_org_petero_droidfish_tb_RtbProbe_init(
         JNIEnv* env, jclass cls, jstring jTbPath)
 {
     initOk = false;
@@ -39,7 +39,7 @@ JNICALL Java_org_petero_droidfish_gtb_RtbProbe_init(
 }
 
 JNIEXPORT void
-JNICALL Java_org_petero_droidfish_gtb_RtbProbe_probe(
+JNICALL Java_org_petero_droidfish_tb_RtbProbe_probe(
         JNIEnv* env, jobject ths, jbyteArray jSquares, jboolean wtm,
         jint epSq, jint castleMask,
         jint halfMoveClock, jint fullMoveCounter,
diff --git a/DroidFish/jni/rtb/RtbProbe.h b/DroidFish/jni/rtb/RtbProbe.h
index 01b3bd3..1a29224 100644
--- a/DroidFish/jni/rtb/RtbProbe.h
+++ b/DroidFish/jni/rtb/RtbProbe.h
@@ -1,26 +1,26 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
 #include <jni.h>
-/* Header for class org_petero_droidfish_gtb_RtbProbe */
+/* Header for class org_petero_droidfish_tb_RtbProbe */
 
-#ifndef _Included_org_petero_droidfish_gtb_RtbProbe
-#define _Included_org_petero_droidfish_gtb_RtbProbe
+#ifndef _Included_org_petero_droidfish_tb_RtbProbe
+#define _Included_org_petero_droidfish_tb_RtbProbe
 #ifdef __cplusplus
 extern "C" {
 #endif
 /*
- * Class:     org_petero_droidfish_gtb_RtbProbe
+ * Class:     org_petero_droidfish_tb_RtbProbe
  * Method:    probe
  * Signature: ([BZIIII[I)V
  */
-JNIEXPORT void JNICALL Java_org_petero_droidfish_gtb_RtbProbe_probe
+JNIEXPORT void JNICALL Java_org_petero_droidfish_tb_RtbProbe_probe
   (JNIEnv *, jobject, jbyteArray, jboolean, jint, jint, jint, jint, jintArray);
 
 /*
- * Class:     org_petero_droidfish_gtb_RtbProbe
+ * Class:     org_petero_droidfish_tb_RtbProbe
  * Method:    init
  * Signature: (Ljava/lang/String;)Z
  */
-JNIEXPORT jboolean JNICALL Java_org_petero_droidfish_gtb_RtbProbe_init
+JNIEXPORT jboolean JNICALL Java_org_petero_droidfish_tb_RtbProbe_init
   (JNIEnv *, jclass, jstring);
 
 #ifdef __cplusplus
diff --git a/DroidFish/src/org/petero/droidfish/ChessBoard.java b/DroidFish/src/org/petero/droidfish/ChessBoard.java
index c05d14f..4cadfb4 100644
--- a/DroidFish/src/org/petero/droidfish/ChessBoard.java
+++ b/DroidFish/src/org/petero/droidfish/ChessBoard.java
@@ -26,7 +26,7 @@ import org.petero.droidfish.gamelogic.Move;
 import org.petero.droidfish.gamelogic.Piece;
 import org.petero.droidfish.gamelogic.Position;
 import org.petero.droidfish.gamelogic.UndoInfo;
-import org.petero.droidfish.gtb.ProbeResult;
+import org.petero.droidfish.tb.ProbeResult;
 
 import android.content.Context;
 import android.graphics.Canvas;
diff --git a/DroidFish/src/org/petero/droidfish/DroidFish.java b/DroidFish/src/org/petero/droidfish/DroidFish.java
index d1e6365..bb15714 100644
--- a/DroidFish/src/org/petero/droidfish/DroidFish.java
+++ b/DroidFish/src/org/petero/droidfish/DroidFish.java
@@ -57,8 +57,8 @@ import org.petero.droidfish.gamelogic.TextIO;
 import org.petero.droidfish.gamelogic.PgnToken;
 import org.petero.droidfish.gamelogic.GameTree.Node;
 import org.petero.droidfish.gamelogic.TimeControlData;
-import org.petero.droidfish.gtb.Probe;
-import org.petero.droidfish.gtb.ProbeResult;
+import org.petero.droidfish.tb.Probe;
+import org.petero.droidfish.tb.ProbeResult;
 
 import com.kalab.chess.enginesupport.ChessEngine;
 import com.kalab.chess.enginesupport.ChessEngineResolver;
diff --git a/DroidFish/src/org/petero/droidfish/activities/EditBoard.java b/DroidFish/src/org/petero/droidfish/activities/EditBoard.java
index 0477b00..26f2cc5 100644
--- a/DroidFish/src/org/petero/droidfish/activities/EditBoard.java
+++ b/DroidFish/src/org/petero/droidfish/activities/EditBoard.java
@@ -34,8 +34,8 @@ import org.petero.droidfish.gamelogic.Pair;
 import org.petero.droidfish.gamelogic.Piece;
 import org.petero.droidfish.gamelogic.Position;
 import org.petero.droidfish.gamelogic.TextIO;
-import org.petero.droidfish.gtb.Probe;
-import org.petero.droidfish.gtb.ProbeResult;
+import org.petero.droidfish.tb.Probe;
+import org.petero.droidfish.tb.ProbeResult;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
diff --git a/DroidFish/src/org/petero/droidfish/engine/DroidComputerPlayer.java b/DroidFish/src/org/petero/droidfish/engine/DroidComputerPlayer.java
index 5ec0c92..13556a7 100644
--- a/DroidFish/src/org/petero/droidfish/engine/DroidComputerPlayer.java
+++ b/DroidFish/src/org/petero/droidfish/engine/DroidComputerPlayer.java
@@ -39,7 +39,7 @@ import org.petero.droidfish.gamelogic.SearchListener;
 import org.petero.droidfish.gamelogic.TextIO;
 import org.petero.droidfish.gamelogic.UndoInfo;
 import org.petero.droidfish.gamelogic.SearchListener.PvInfo;
-import org.petero.droidfish.gtb.Probe;
+import org.petero.droidfish.tb.Probe;
 
 import android.content.Context;
 
diff --git a/DroidFish/src/org/petero/droidfish/gtb/GtbProbe.java b/DroidFish/src/org/petero/droidfish/tb/GtbProbe.java
similarity index 99%
rename from DroidFish/src/org/petero/droidfish/gtb/GtbProbe.java
rename to DroidFish/src/org/petero/droidfish/tb/GtbProbe.java
index ddca6c1..71c827e 100644
--- a/DroidFish/src/org/petero/droidfish/gtb/GtbProbe.java
+++ b/DroidFish/src/org/petero/droidfish/tb/GtbProbe.java
@@ -16,7 +16,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-package org.petero.droidfish.gtb;
+package org.petero.droidfish.tb;
 
 import java.util.concurrent.ConcurrentLinkedQueue;
 
diff --git a/DroidFish/src/org/petero/droidfish/gtb/Probe.java b/DroidFish/src/org/petero/droidfish/tb/Probe.java
similarity index 99%
rename from DroidFish/src/org/petero/droidfish/gtb/Probe.java
rename to DroidFish/src/org/petero/droidfish/tb/Probe.java
index ad3df65..ff06b4f 100644
--- a/DroidFish/src/org/petero/droidfish/gtb/Probe.java
+++ b/DroidFish/src/org/petero/droidfish/tb/Probe.java
@@ -16,7 +16,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-package org.petero.droidfish.gtb;
+package org.petero.droidfish.tb;
 
 import java.util.ArrayList;
 
diff --git a/DroidFish/src/org/petero/droidfish/gtb/ProbeResult.java b/DroidFish/src/org/petero/droidfish/tb/ProbeResult.java
similarity index 99%
rename from DroidFish/src/org/petero/droidfish/gtb/ProbeResult.java
rename to DroidFish/src/org/petero/droidfish/tb/ProbeResult.java
index 133a9f5..675ef4f 100644
--- a/DroidFish/src/org/petero/droidfish/gtb/ProbeResult.java
+++ b/DroidFish/src/org/petero/droidfish/tb/ProbeResult.java
@@ -1,4 +1,4 @@
-package org.petero.droidfish.gtb;
+package org.petero.droidfish.tb;
 
 /** Tablebase probe result. */
 public final class ProbeResult implements Comparable<ProbeResult> {
diff --git a/DroidFish/src/org/petero/droidfish/gtb/RtbProbe.java b/DroidFish/src/org/petero/droidfish/tb/RtbProbe.java
similarity index 99%
rename from DroidFish/src/org/petero/droidfish/gtb/RtbProbe.java
rename to DroidFish/src/org/petero/droidfish/tb/RtbProbe.java
index 0c0bd0c..7597988 100644
--- a/DroidFish/src/org/petero/droidfish/gtb/RtbProbe.java
+++ b/DroidFish/src/org/petero/droidfish/tb/RtbProbe.java
@@ -16,7 +16,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-package org.petero.droidfish.gtb;
+package org.petero.droidfish.tb;
 
 import java.util.concurrent.ConcurrentLinkedQueue;
 
diff --git a/DroidFishTest/src/org/petero/droidfish/gtb/ProbeResultTest.java b/DroidFishTest/src/org/petero/droidfish/tb/ProbeResultTest.java
similarity index 99%
rename from DroidFishTest/src/org/petero/droidfish/gtb/ProbeResultTest.java
rename to DroidFishTest/src/org/petero/droidfish/tb/ProbeResultTest.java
index 514bfeb..ad6726f 100644
--- a/DroidFishTest/src/org/petero/droidfish/gtb/ProbeResultTest.java
+++ b/DroidFishTest/src/org/petero/droidfish/tb/ProbeResultTest.java
@@ -1,6 +1,7 @@
-package org.petero.droidfish.gtb;
+package org.petero.droidfish.tb;
 
-import org.petero.droidfish.gtb.ProbeResult.Type;
+import org.petero.droidfish.tb.ProbeResult;
+import org.petero.droidfish.tb.ProbeResult.Type;
 
 import junit.framework.TestCase;
 
diff --git a/DroidFishTest/src/org/petero/droidfish/gtb/ProbeTest.java b/DroidFishTest/src/org/petero/droidfish/tb/ProbeTest.java
similarity index 89%
rename from DroidFishTest/src/org/petero/droidfish/gtb/ProbeTest.java
rename to DroidFishTest/src/org/petero/droidfish/tb/ProbeTest.java
index 186a52a..5a5136a 100644
--- a/DroidFishTest/src/org/petero/droidfish/gtb/ProbeTest.java
+++ b/DroidFishTest/src/org/petero/droidfish/tb/ProbeTest.java
@@ -1,7 +1,9 @@
-package org.petero.droidfish.gtb;
+package org.petero.droidfish.tb;
 
 import org.petero.droidfish.gamelogic.Position;
 import org.petero.droidfish.gamelogic.TextIO;
+import org.petero.droidfish.tb.Probe;
+import org.petero.droidfish.tb.ProbeResult;
 
 import android.os.Environment;