diff --git a/DroidFish/src/org/petero/droidfish/DroidFish.java b/DroidFish/src/org/petero/droidfish/DroidFish.java
index 66deaf2..02b3486 100644
--- a/DroidFish/src/org/petero/droidfish/DroidFish.java
+++ b/DroidFish/src/org/petero/droidfish/DroidFish.java
@@ -34,6 +34,7 @@ import org.petero.droidfish.activities.EditPGNLoad;
 import org.petero.droidfish.activities.EditPGNSave;
 import org.petero.droidfish.activities.LoadScid;
 import org.petero.droidfish.activities.Preferences;
+import org.petero.droidfish.book.BookOptions;
 import org.petero.droidfish.gamelogic.DroidChessController;
 import org.petero.droidfish.gamelogic.ChessParseError;
 import org.petero.droidfish.gamelogic.Move;
diff --git a/DroidFish/src/org/petero/droidfish/BookOptions.java b/DroidFish/src/org/petero/droidfish/book/BookOptions.java
similarity index 98%
rename from DroidFish/src/org/petero/droidfish/BookOptions.java
rename to DroidFish/src/org/petero/droidfish/book/BookOptions.java
index 49d6cd2..d175a8f 100644
--- a/DroidFish/src/org/petero/droidfish/BookOptions.java
+++ b/DroidFish/src/org/petero/droidfish/book/BookOptions.java
@@ -16,7 +16,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-package org.petero.droidfish;
+package org.petero.droidfish.book;
 
 /** Settings controlling opening book usage */
 public class BookOptions {
diff --git a/DroidFish/src/org/petero/droidfish/book/CtgBook.java b/DroidFish/src/org/petero/droidfish/book/CtgBook.java
index 1b73bd0..40f8893 100644
--- a/DroidFish/src/org/petero/droidfish/book/CtgBook.java
+++ b/DroidFish/src/org/petero/droidfish/book/CtgBook.java
@@ -24,7 +24,6 @@ import java.io.RandomAccessFile;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.petero.droidfish.BookOptions;
 import org.petero.droidfish.book.DroidBook.BookEntry;
 import org.petero.droidfish.gamelogic.Move;
 import org.petero.droidfish.gamelogic.Piece;
diff --git a/DroidFish/src/org/petero/droidfish/book/DroidBook.java b/DroidFish/src/org/petero/droidfish/book/DroidBook.java
index 7442d29..6ad8327 100644
--- a/DroidFish/src/org/petero/droidfish/book/DroidBook.java
+++ b/DroidFish/src/org/petero/droidfish/book/DroidBook.java
@@ -25,7 +25,6 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.Random;
 
-import org.petero.droidfish.BookOptions;
 import org.petero.droidfish.gamelogic.Move;
 import org.petero.droidfish.gamelogic.MoveGen;
 import org.petero.droidfish.gamelogic.Position;
diff --git a/DroidFish/src/org/petero/droidfish/book/IOpeningBook.java b/DroidFish/src/org/petero/droidfish/book/IOpeningBook.java
index cca503b..6943363 100644
--- a/DroidFish/src/org/petero/droidfish/book/IOpeningBook.java
+++ b/DroidFish/src/org/petero/droidfish/book/IOpeningBook.java
@@ -20,7 +20,6 @@ package org.petero.droidfish.book;
 
 import java.util.List;
 
-import org.petero.droidfish.BookOptions;
 import org.petero.droidfish.book.DroidBook.BookEntry;
 import org.petero.droidfish.gamelogic.Position;
 
diff --git a/DroidFish/src/org/petero/droidfish/book/InternalBook.java b/DroidFish/src/org/petero/droidfish/book/InternalBook.java
index dc1204d..e103ce2 100644
--- a/DroidFish/src/org/petero/droidfish/book/InternalBook.java
+++ b/DroidFish/src/org/petero/droidfish/book/InternalBook.java
@@ -25,7 +25,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.petero.droidfish.BookOptions;
 import org.petero.droidfish.book.DroidBook.BookEntry;
 import org.petero.droidfish.gamelogic.ChessParseError;
 import org.petero.droidfish.gamelogic.Move;
diff --git a/DroidFish/src/org/petero/droidfish/book/NullBook.java b/DroidFish/src/org/petero/droidfish/book/NullBook.java
index 95230ce..97e18a0 100644
--- a/DroidFish/src/org/petero/droidfish/book/NullBook.java
+++ b/DroidFish/src/org/petero/droidfish/book/NullBook.java
@@ -20,7 +20,6 @@ package org.petero.droidfish.book;
 
 import java.util.List;
 
-import org.petero.droidfish.BookOptions;
 import org.petero.droidfish.book.DroidBook.BookEntry;
 import org.petero.droidfish.gamelogic.Position;
 
diff --git a/DroidFish/src/org/petero/droidfish/book/PolyglotBook.java b/DroidFish/src/org/petero/droidfish/book/PolyglotBook.java
index fac8ac1..a283fb7 100644
--- a/DroidFish/src/org/petero/droidfish/book/PolyglotBook.java
+++ b/DroidFish/src/org/petero/droidfish/book/PolyglotBook.java
@@ -25,7 +25,6 @@ import java.io.RandomAccessFile;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.petero.droidfish.BookOptions;
 import org.petero.droidfish.book.DroidBook.BookEntry;
 import org.petero.droidfish.gamelogic.Move;
 import org.petero.droidfish.gamelogic.Piece;
diff --git a/DroidFish/src/org/petero/droidfish/engine/DroidComputerPlayer.java b/DroidFish/src/org/petero/droidfish/engine/DroidComputerPlayer.java
index dcfd734..cd91587 100644
--- a/DroidFish/src/org/petero/droidfish/engine/DroidComputerPlayer.java
+++ b/DroidFish/src/org/petero/droidfish/engine/DroidComputerPlayer.java
@@ -23,7 +23,7 @@ import java.io.FileReader;
 import java.io.IOException;
 import java.util.ArrayList;
 
-import org.petero.droidfish.BookOptions;
+import org.petero.droidfish.book.BookOptions;
 import org.petero.droidfish.book.DroidBook;
 import org.petero.droidfish.engine.cuckoochess.CuckooChessEngine;
 import org.petero.droidfish.gamelogic.Move;
diff --git a/DroidFish/src/org/petero/droidfish/gamelogic/DroidChessController.java b/DroidFish/src/org/petero/droidfish/gamelogic/DroidChessController.java
index 97bbb9d..0bccb70 100644
--- a/DroidFish/src/org/petero/droidfish/gamelogic/DroidChessController.java
+++ b/DroidFish/src/org/petero/droidfish/gamelogic/DroidChessController.java
@@ -22,10 +22,10 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.petero.droidfish.BookOptions;
 import org.petero.droidfish.GUIInterface;
 import org.petero.droidfish.GameMode;
 import org.petero.droidfish.PGNOptions;
+import org.petero.droidfish.book.BookOptions;
 import org.petero.droidfish.engine.DroidComputerPlayer;
 import org.petero.droidfish.engine.DroidComputerPlayer.SearchRequest;
 import org.petero.droidfish.engine.DroidComputerPlayer.SearchType;