diff --git a/DroidFish/src/org/petero/droidfish/engine/CtgBook.java b/DroidFish/src/org/petero/droidfish/book/CtgBook.java
similarity index 99%
rename from DroidFish/src/org/petero/droidfish/engine/CtgBook.java
rename to DroidFish/src/org/petero/droidfish/book/CtgBook.java
index 3590d14..1b73bd0 100644
--- a/DroidFish/src/org/petero/droidfish/engine/CtgBook.java
+++ b/DroidFish/src/org/petero/droidfish/book/CtgBook.java
@@ -16,7 +16,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-package org.petero.droidfish.engine;
+package org.petero.droidfish.book;
 
 import java.io.File;
 import java.io.IOException;
@@ -25,7 +25,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.petero.droidfish.BookOptions;
-import org.petero.droidfish.engine.DroidBook.BookEntry;
+import org.petero.droidfish.book.DroidBook.BookEntry;
 import org.petero.droidfish.gamelogic.Move;
 import org.petero.droidfish.gamelogic.Piece;
 import org.petero.droidfish.gamelogic.Position;
diff --git a/DroidFish/src/org/petero/droidfish/engine/DroidBook.java b/DroidFish/src/org/petero/droidfish/book/DroidBook.java
similarity index 99%
rename from DroidFish/src/org/petero/droidfish/engine/DroidBook.java
rename to DroidFish/src/org/petero/droidfish/book/DroidBook.java
index 41a1861..7442d29 100644
--- a/DroidFish/src/org/petero/droidfish/engine/DroidBook.java
+++ b/DroidFish/src/org/petero/droidfish/book/DroidBook.java
@@ -16,7 +16,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-package org.petero.droidfish.engine;
+package org.petero.droidfish.book;
 
 import java.security.SecureRandom;
 import java.util.ArrayList;
diff --git a/DroidFish/src/org/petero/droidfish/engine/IOpeningBook.java b/DroidFish/src/org/petero/droidfish/book/IOpeningBook.java
similarity index 92%
rename from DroidFish/src/org/petero/droidfish/engine/IOpeningBook.java
rename to DroidFish/src/org/petero/droidfish/book/IOpeningBook.java
index a871d1e..cca503b 100644
--- a/DroidFish/src/org/petero/droidfish/engine/IOpeningBook.java
+++ b/DroidFish/src/org/petero/droidfish/book/IOpeningBook.java
@@ -16,12 +16,12 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-package org.petero.droidfish.engine;
+package org.petero.droidfish.book;
 
 import java.util.List;
 
 import org.petero.droidfish.BookOptions;
-import org.petero.droidfish.engine.DroidBook.BookEntry;
+import org.petero.droidfish.book.DroidBook.BookEntry;
 import org.petero.droidfish.gamelogic.Position;
 
 interface IOpeningBook {
diff --git a/DroidFish/src/org/petero/droidfish/engine/InternalBook.java b/DroidFish/src/org/petero/droidfish/book/InternalBook.java
similarity index 98%
rename from DroidFish/src/org/petero/droidfish/engine/InternalBook.java
rename to DroidFish/src/org/petero/droidfish/book/InternalBook.java
index edff909..dc1204d 100644
--- a/DroidFish/src/org/petero/droidfish/engine/InternalBook.java
+++ b/DroidFish/src/org/petero/droidfish/book/InternalBook.java
@@ -16,7 +16,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-package org.petero.droidfish.engine;
+package org.petero.droidfish.book;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -26,7 +26,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.petero.droidfish.BookOptions;
-import org.petero.droidfish.engine.DroidBook.BookEntry;
+import org.petero.droidfish.book.DroidBook.BookEntry;
 import org.petero.droidfish.gamelogic.ChessParseError;
 import org.petero.droidfish.gamelogic.Move;
 import org.petero.droidfish.gamelogic.Piece;
diff --git a/DroidFish/src/org/petero/droidfish/engine/NullBook.java b/DroidFish/src/org/petero/droidfish/book/NullBook.java
similarity index 92%
rename from DroidFish/src/org/petero/droidfish/engine/NullBook.java
rename to DroidFish/src/org/petero/droidfish/book/NullBook.java
index 7af42a0..95230ce 100644
--- a/DroidFish/src/org/petero/droidfish/engine/NullBook.java
+++ b/DroidFish/src/org/petero/droidfish/book/NullBook.java
@@ -16,12 +16,12 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-package org.petero.droidfish.engine;
+package org.petero.droidfish.book;
 
 import java.util.List;
 
 import org.petero.droidfish.BookOptions;
-import org.petero.droidfish.engine.DroidBook.BookEntry;
+import org.petero.droidfish.book.DroidBook.BookEntry;
 import org.petero.droidfish.gamelogic.Position;
 
 public class NullBook implements IOpeningBook {
diff --git a/DroidFish/src/org/petero/droidfish/engine/PolyglotBook.java b/DroidFish/src/org/petero/droidfish/book/PolyglotBook.java
similarity index 99%
rename from DroidFish/src/org/petero/droidfish/engine/PolyglotBook.java
rename to DroidFish/src/org/petero/droidfish/book/PolyglotBook.java
index 38fc0ff..fac8ac1 100644
--- a/DroidFish/src/org/petero/droidfish/engine/PolyglotBook.java
+++ b/DroidFish/src/org/petero/droidfish/book/PolyglotBook.java
@@ -16,7 +16,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-package org.petero.droidfish.engine;
+package org.petero.droidfish.book;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -26,7 +26,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.petero.droidfish.BookOptions;
-import org.petero.droidfish.engine.DroidBook.BookEntry;
+import org.petero.droidfish.book.DroidBook.BookEntry;
 import org.petero.droidfish.gamelogic.Move;
 import org.petero.droidfish.gamelogic.Piece;
 import org.petero.droidfish.gamelogic.Position;
diff --git a/DroidFish/src/org/petero/droidfish/engine/DroidComputerPlayer.java b/DroidFish/src/org/petero/droidfish/engine/DroidComputerPlayer.java
index c8d9aca..dcfd734 100644
--- a/DroidFish/src/org/petero/droidfish/engine/DroidComputerPlayer.java
+++ b/DroidFish/src/org/petero/droidfish/engine/DroidComputerPlayer.java
@@ -24,6 +24,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 
 import org.petero.droidfish.BookOptions;
+import org.petero.droidfish.book.DroidBook;
 import org.petero.droidfish.engine.cuckoochess.CuckooChessEngine;
 import org.petero.droidfish.gamelogic.Move;
 import org.petero.droidfish.gamelogic.MoveGen;
diff --git a/DroidFishTest/src/org/petero/droidfish/engine/BookTest.java b/DroidFishTest/src/org/petero/droidfish/book/BookTest.java
similarity index 96%
rename from DroidFishTest/src/org/petero/droidfish/engine/BookTest.java
rename to DroidFishTest/src/org/petero/droidfish/book/BookTest.java
index e39444d..b76a5f1 100644
--- a/DroidFishTest/src/org/petero/droidfish/engine/BookTest.java
+++ b/DroidFishTest/src/org/petero/droidfish/book/BookTest.java
@@ -16,13 +16,14 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-package org.petero.droidfish.engine;
+package org.petero.droidfish.book;
 
 
 import java.util.ArrayList;
 
 import junit.framework.TestCase;
 
+import org.petero.droidfish.book.DroidBook;
 import org.petero.droidfish.gamelogic.ChessParseError;
 import org.petero.droidfish.gamelogic.Move;
 import org.petero.droidfish.gamelogic.MoveGen;
diff --git a/DroidFishTest/src/org/petero/droidfish/engine/PolyglotBookTest.java b/DroidFishTest/src/org/petero/droidfish/book/PolyglotBookTest.java
similarity index 97%
rename from DroidFishTest/src/org/petero/droidfish/engine/PolyglotBookTest.java
rename to DroidFishTest/src/org/petero/droidfish/book/PolyglotBookTest.java
index 3f7e379..2a93e9b 100644
--- a/DroidFishTest/src/org/petero/droidfish/engine/PolyglotBookTest.java
+++ b/DroidFishTest/src/org/petero/droidfish/book/PolyglotBookTest.java
@@ -16,11 +16,12 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-package org.petero.droidfish.engine;
+package org.petero.droidfish.book;
 
 
 import junit.framework.TestCase;
 
+import org.petero.droidfish.book.PolyglotBook;
 import org.petero.droidfish.gamelogic.ChessParseError;
 import org.petero.droidfish.gamelogic.Position;
 import org.petero.droidfish.gamelogic.TextIO;