diff --git a/community/index/src/main/java/org/neo4j/index/gbptree/ConsistencyChecker.java b/community/index/src/main/java/org/neo4j/index/internal/gbptree/ConsistencyChecker.java
similarity index 99%
rename from community/index/src/main/java/org/neo4j/index/gbptree/ConsistencyChecker.java
rename to community/index/src/main/java/org/neo4j/index/internal/gbptree/ConsistencyChecker.java
index 7a39ed3de4cae..e72f0e0ba8509 100644
--- a/community/index/src/main/java/org/neo4j/index/gbptree/ConsistencyChecker.java
+++ b/community/index/src/main/java/org/neo4j/index/internal/gbptree/ConsistencyChecker.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -31,8 +31,8 @@
 import static java.lang.Math.toIntExact;
 import static java.lang.String.format;
 
-import static org.neo4j.index.gbptree.GenSafePointerPair.pointer;
-import static org.neo4j.index.gbptree.PageCursorUtil.checkOutOfBounds;
+import static org.neo4j.index.internal.gbptree.GenSafePointerPair.pointer;
+import static org.neo4j.index.internal.gbptree.PageCursorUtil.checkOutOfBounds;
 
 /**
  * <ul>
diff --git a/community/index/src/main/java/org/neo4j/index/gbptree/FreeListIdProvider.java b/community/index/src/main/java/org/neo4j/index/internal/gbptree/FreeListIdProvider.java
similarity index 98%
rename from community/index/src/main/java/org/neo4j/index/gbptree/FreeListIdProvider.java
rename to community/index/src/main/java/org/neo4j/index/internal/gbptree/FreeListIdProvider.java
index a14ea029557bd..9cb7697716b51 100644
--- a/community/index/src/main/java/org/neo4j/index/gbptree/FreeListIdProvider.java
+++ b/community/index/src/main/java/org/neo4j/index/internal/gbptree/FreeListIdProvider.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import java.io.IOException;
 import java.util.function.LongConsumer;
@@ -25,8 +25,8 @@
 import org.neo4j.io.pagecache.PageCursor;
 import org.neo4j.io.pagecache.PagedFile;
 
-import static org.neo4j.index.gbptree.PageCursorUtil.checkOutOfBounds;
-import static org.neo4j.index.gbptree.PageCursorUtil.goTo;
+import static org.neo4j.index.internal.gbptree.PageCursorUtil.checkOutOfBounds;
+import static org.neo4j.index.internal.gbptree.PageCursorUtil.goTo;
 
 class FreeListIdProvider implements IdProvider
 {
diff --git a/community/index/src/main/java/org/neo4j/index/gbptree/FreelistNode.java b/community/index/src/main/java/org/neo4j/index/internal/gbptree/FreelistNode.java
similarity index 93%
rename from community/index/src/main/java/org/neo4j/index/gbptree/FreelistNode.java
rename to community/index/src/main/java/org/neo4j/index/internal/gbptree/FreelistNode.java
index fc79ebbe41e40..ff11799e52640 100644
--- a/community/index/src/main/java/org/neo4j/index/gbptree/FreelistNode.java
+++ b/community/index/src/main/java/org/neo4j/index/internal/gbptree/FreelistNode.java
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import org.neo4j.io.pagecache.PageCursor;
 
-import static org.neo4j.index.gbptree.PageCursorUtil.get6BLong;
-import static org.neo4j.index.gbptree.PageCursorUtil.getUnsignedInt;
-import static org.neo4j.index.gbptree.PageCursorUtil.put6BLong;
+import static org.neo4j.index.internal.gbptree.PageCursorUtil.get6BLong;
+import static org.neo4j.index.internal.gbptree.PageCursorUtil.getUnsignedInt;
+import static org.neo4j.index.internal.gbptree.PageCursorUtil.put6BLong;
 
 /**
  * Manages the physical format of a free-list node, i.e. how bytes about free-list pages
diff --git a/community/index/src/main/java/org/neo4j/index/gbptree/GBPTree.java b/community/index/src/main/java/org/neo4j/index/internal/gbptree/GBPTree.java
similarity index 99%
rename from community/index/src/main/java/org/neo4j/index/gbptree/GBPTree.java
rename to community/index/src/main/java/org/neo4j/index/internal/gbptree/GBPTree.java
index 69688c18bc862..d45b5f4b8bc15 100644
--- a/community/index/src/main/java/org/neo4j/index/gbptree/GBPTree.java
+++ b/community/index/src/main/java/org/neo4j/index/internal/gbptree/GBPTree.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import org.apache.commons.lang3.tuple.Pair;
 
@@ -42,10 +42,11 @@
 import org.neo4j.io.pagecache.PagedFile;
 
 import static java.lang.String.format;
-import static org.neo4j.index.gbptree.Generation.generation;
-import static org.neo4j.index.gbptree.Generation.stableGeneration;
-import static org.neo4j.index.gbptree.Generation.unstableGeneration;
-import static org.neo4j.index.gbptree.PageCursorUtil.checkOutOfBounds;
+
+import static org.neo4j.index.internal.gbptree.Generation.generation;
+import static org.neo4j.index.internal.gbptree.Generation.stableGeneration;
+import static org.neo4j.index.internal.gbptree.Generation.unstableGeneration;
+import static org.neo4j.index.internal.gbptree.PageCursorUtil.checkOutOfBounds;
 
 /**
  * A generation-aware B+tree (GB+Tree) implementation directly atop a {@link PageCache} with no caching in between.
diff --git a/community/index/src/main/java/org/neo4j/index/gbptree/GenSafePointer.java b/community/index/src/main/java/org/neo4j/index/internal/gbptree/GenSafePointer.java
similarity index 95%
rename from community/index/src/main/java/org/neo4j/index/gbptree/GenSafePointer.java
rename to community/index/src/main/java/org/neo4j/index/internal/gbptree/GenSafePointer.java
index 48fb1aa7968c3..936565b396594 100644
--- a/community/index/src/main/java/org/neo4j/index/gbptree/GenSafePointer.java
+++ b/community/index/src/main/java/org/neo4j/index/internal/gbptree/GenSafePointer.java
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import org.neo4j.io.pagecache.PageCursor;
 
-import static org.neo4j.index.gbptree.PageCursorUtil.get6BLong;
-import static org.neo4j.index.gbptree.PageCursorUtil.getUnsignedInt;
-import static org.neo4j.index.gbptree.PageCursorUtil.put6BLong;
+import static org.neo4j.index.internal.gbptree.PageCursorUtil.get6BLong;
+import static org.neo4j.index.internal.gbptree.PageCursorUtil.getUnsignedInt;
+import static org.neo4j.index.internal.gbptree.PageCursorUtil.put6BLong;
 
 /**
  * Provides static methods for getting and manipulating GSP (gen-safe pointer) data.
diff --git a/community/index/src/main/java/org/neo4j/index/gbptree/GenSafePointerPair.java b/community/index/src/main/java/org/neo4j/index/internal/gbptree/GenSafePointerPair.java
similarity index 98%
rename from community/index/src/main/java/org/neo4j/index/gbptree/GenSafePointerPair.java
rename to community/index/src/main/java/org/neo4j/index/internal/gbptree/GenSafePointerPair.java
index 77828407066ce..833d85f988ad7 100644
--- a/community/index/src/main/java/org/neo4j/index/gbptree/GenSafePointerPair.java
+++ b/community/index/src/main/java/org/neo4j/index/internal/gbptree/GenSafePointerPair.java
@@ -17,17 +17,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import org.neo4j.io.pagecache.PageCursor;
 
 import static java.lang.String.format;
 
-import static org.neo4j.index.gbptree.GenSafePointer.MIN_GENERATION;
-import static org.neo4j.index.gbptree.GenSafePointer.checksumOf;
-import static org.neo4j.index.gbptree.GenSafePointer.readChecksum;
-import static org.neo4j.index.gbptree.GenSafePointer.readGeneration;
-import static org.neo4j.index.gbptree.GenSafePointer.readPointer;
+import static org.neo4j.index.internal.gbptree.GenSafePointer.MIN_GENERATION;
+import static org.neo4j.index.internal.gbptree.GenSafePointer.checksumOf;
+import static org.neo4j.index.internal.gbptree.GenSafePointer.readChecksum;
+import static org.neo4j.index.internal.gbptree.GenSafePointer.readGeneration;
+import static org.neo4j.index.internal.gbptree.GenSafePointer.readPointer;
 
 /**
  * Two {@link GenSafePointer} forming the basis for a B+tree becoming generate-aware.
diff --git a/community/index/src/main/java/org/neo4j/index/gbptree/Generation.java b/community/index/src/main/java/org/neo4j/index/internal/gbptree/Generation.java
similarity index 98%
rename from community/index/src/main/java/org/neo4j/index/gbptree/Generation.java
rename to community/index/src/main/java/org/neo4j/index/internal/gbptree/Generation.java
index c8e379aeb0dc7..b8b1f2eca4973 100644
--- a/community/index/src/main/java/org/neo4j/index/gbptree/Generation.java
+++ b/community/index/src/main/java/org/neo4j/index/internal/gbptree/Generation.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 /**
  * Logic for composing and decomposing stable/unstable generation number (unsigned int) to/from a single {@code long}.
diff --git a/community/index/src/main/java/org/neo4j/index/gbptree/Hit.java b/community/index/src/main/java/org/neo4j/index/internal/gbptree/Hit.java
similarity index 97%
rename from community/index/src/main/java/org/neo4j/index/gbptree/Hit.java
rename to community/index/src/main/java/org/neo4j/index/internal/gbptree/Hit.java
index b91b5a660f0d2..1bac3162f2fe7 100644
--- a/community/index/src/main/java/org/neo4j/index/gbptree/Hit.java
+++ b/community/index/src/main/java/org/neo4j/index/internal/gbptree/Hit.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 /**
  * Represents a hit during an {@link Index#seek(Object, Object)}. There's no guarantee about whether or
diff --git a/community/index/src/main/java/org/neo4j/index/gbptree/IdProvider.java b/community/index/src/main/java/org/neo4j/index/internal/gbptree/IdProvider.java
similarity index 98%
rename from community/index/src/main/java/org/neo4j/index/gbptree/IdProvider.java
rename to community/index/src/main/java/org/neo4j/index/internal/gbptree/IdProvider.java
index 741ed87d881ad..8f6eb55608a1f 100644
--- a/community/index/src/main/java/org/neo4j/index/gbptree/IdProvider.java
+++ b/community/index/src/main/java/org/neo4j/index/internal/gbptree/IdProvider.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import java.io.IOException;
 
diff --git a/community/index/src/main/java/org/neo4j/index/gbptree/IdSpace.java b/community/index/src/main/java/org/neo4j/index/internal/gbptree/IdSpace.java
similarity index 97%
rename from community/index/src/main/java/org/neo4j/index/gbptree/IdSpace.java
rename to community/index/src/main/java/org/neo4j/index/internal/gbptree/IdSpace.java
index 7abd75f3bfabb..40657f0bfe009 100644
--- a/community/index/src/main/java/org/neo4j/index/gbptree/IdSpace.java
+++ b/community/index/src/main/java/org/neo4j/index/internal/gbptree/IdSpace.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 /**
  * Defines special page ids for {@link GBPTree}.
diff --git a/community/index/src/main/java/org/neo4j/index/gbptree/InternalTreeLogic.java b/community/index/src/main/java/org/neo4j/index/internal/gbptree/InternalTreeLogic.java
similarity index 99%
rename from community/index/src/main/java/org/neo4j/index/gbptree/InternalTreeLogic.java
rename to community/index/src/main/java/org/neo4j/index/internal/gbptree/InternalTreeLogic.java
index 46ef9c1657d13..f81653fa09e18 100644
--- a/community/index/src/main/java/org/neo4j/index/gbptree/InternalTreeLogic.java
+++ b/community/index/src/main/java/org/neo4j/index/internal/gbptree/InternalTreeLogic.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -25,9 +25,9 @@
 
 import org.neo4j.io.pagecache.PageCursor;
 
-import static org.neo4j.index.gbptree.KeySearch.isHit;
-import static org.neo4j.index.gbptree.KeySearch.positionOf;
-import static org.neo4j.index.gbptree.PageCursorUtil.goTo;
+import static org.neo4j.index.internal.gbptree.KeySearch.isHit;
+import static org.neo4j.index.internal.gbptree.KeySearch.positionOf;
+import static org.neo4j.index.internal.gbptree.PageCursorUtil.goTo;
 
 /**
  * Implementation of GB+ tree insert/remove algorithms.
diff --git a/community/index/src/main/java/org/neo4j/index/gbptree/KeySearch.java b/community/index/src/main/java/org/neo4j/index/internal/gbptree/KeySearch.java
similarity index 99%
rename from community/index/src/main/java/org/neo4j/index/gbptree/KeySearch.java
rename to community/index/src/main/java/org/neo4j/index/internal/gbptree/KeySearch.java
index e3c1d83def5c3..61d7bc2a1a6e8 100644
--- a/community/index/src/main/java/org/neo4j/index/gbptree/KeySearch.java
+++ b/community/index/src/main/java/org/neo4j/index/internal/gbptree/KeySearch.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import java.util.Comparator;
 
diff --git a/community/index/src/main/java/org/neo4j/index/gbptree/Layout.java b/community/index/src/main/java/org/neo4j/index/internal/gbptree/Layout.java
similarity index 99%
rename from community/index/src/main/java/org/neo4j/index/gbptree/Layout.java
rename to community/index/src/main/java/org/neo4j/index/internal/gbptree/Layout.java
index 051fb17bce225..252b96c753262 100644
--- a/community/index/src/main/java/org/neo4j/index/gbptree/Layout.java
+++ b/community/index/src/main/java/org/neo4j/index/internal/gbptree/Layout.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import java.util.Comparator;
 
diff --git a/community/index/src/main/java/org/neo4j/index/gbptree/MetadataMismatchException.java b/community/index/src/main/java/org/neo4j/index/internal/gbptree/MetadataMismatchException.java
similarity index 96%
rename from community/index/src/main/java/org/neo4j/index/gbptree/MetadataMismatchException.java
rename to community/index/src/main/java/org/neo4j/index/internal/gbptree/MetadataMismatchException.java
index e6bebbbc2f650..3bd60c514d423 100644
--- a/community/index/src/main/java/org/neo4j/index/gbptree/MetadataMismatchException.java
+++ b/community/index/src/main/java/org/neo4j/index/internal/gbptree/MetadataMismatchException.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 /**
  * Thrown to signal mismatches between meta data about tree and user-provided configuration.
diff --git a/community/index/src/main/java/org/neo4j/index/gbptree/PageCursorUtil.java b/community/index/src/main/java/org/neo4j/index/internal/gbptree/PageCursorUtil.java
similarity index 99%
rename from community/index/src/main/java/org/neo4j/index/gbptree/PageCursorUtil.java
rename to community/index/src/main/java/org/neo4j/index/internal/gbptree/PageCursorUtil.java
index 2e014d0e69b57..ed76b4959cd44 100644
--- a/community/index/src/main/java/org/neo4j/index/gbptree/PageCursorUtil.java
+++ b/community/index/src/main/java/org/neo4j/index/internal/gbptree/PageCursorUtil.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import java.io.IOException;
 
diff --git a/community/index/src/main/java/org/neo4j/index/gbptree/PointerChecking.java b/community/index/src/main/java/org/neo4j/index/internal/gbptree/PointerChecking.java
similarity index 97%
rename from community/index/src/main/java/org/neo4j/index/gbptree/PointerChecking.java
rename to community/index/src/main/java/org/neo4j/index/internal/gbptree/PointerChecking.java
index ca048ab20b409..a9afe494de93a 100644
--- a/community/index/src/main/java/org/neo4j/index/gbptree/PointerChecking.java
+++ b/community/index/src/main/java/org/neo4j/index/internal/gbptree/PointerChecking.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import org.neo4j.io.pagecache.PageCursor;
 
diff --git a/community/index/src/main/java/org/neo4j/index/gbptree/RightmostInChain.java b/community/index/src/main/java/org/neo4j/index/internal/gbptree/RightmostInChain.java
similarity index 96%
rename from community/index/src/main/java/org/neo4j/index/gbptree/RightmostInChain.java
rename to community/index/src/main/java/org/neo4j/index/internal/gbptree/RightmostInChain.java
index d5ad530c15408..56d900d0ed5eb 100644
--- a/community/index/src/main/java/org/neo4j/index/gbptree/RightmostInChain.java
+++ b/community/index/src/main/java/org/neo4j/index/internal/gbptree/RightmostInChain.java
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import org.neo4j.io.pagecache.PageCursor;
 
-import static org.neo4j.index.gbptree.TreeNode.NO_NODE_FLAG;
+import static org.neo4j.index.internal.gbptree.TreeNode.NO_NODE_FLAG;
 
 /**
  * Used to verify a chain of siblings starting with leftmost node.
diff --git a/community/index/src/main/java/org/neo4j/index/gbptree/Root.java b/community/index/src/main/java/org/neo4j/index/internal/gbptree/Root.java
similarity index 97%
rename from community/index/src/main/java/org/neo4j/index/gbptree/Root.java
rename to community/index/src/main/java/org/neo4j/index/internal/gbptree/Root.java
index 53b4193791e15..28f65ba0faaa3 100644
--- a/community/index/src/main/java/org/neo4j/index/gbptree/Root.java
+++ b/community/index/src/main/java/org/neo4j/index/internal/gbptree/Root.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import java.io.IOException;
 
diff --git a/community/index/src/main/java/org/neo4j/index/gbptree/SeekCursor.java b/community/index/src/main/java/org/neo4j/index/internal/gbptree/SeekCursor.java
similarity index 99%
rename from community/index/src/main/java/org/neo4j/index/gbptree/SeekCursor.java
rename to community/index/src/main/java/org/neo4j/index/internal/gbptree/SeekCursor.java
index e32cf27cc59d9..55c0d468f45ee 100644
--- a/community/index/src/main/java/org/neo4j/index/gbptree/SeekCursor.java
+++ b/community/index/src/main/java/org/neo4j/index/internal/gbptree/SeekCursor.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import java.io.IOException;
 import java.util.function.LongSupplier;
@@ -27,7 +27,8 @@
 import org.neo4j.io.pagecache.PageCursor;
 
 import static java.lang.Integer.max;
-import static org.neo4j.index.gbptree.PageCursorUtil.checkOutOfBounds;
+
+import static org.neo4j.index.internal.gbptree.PageCursorUtil.checkOutOfBounds;
 
 /**
  * {@link RawCursor} over tree leaves, making keys/values accessible to user. Given a starting leaf
diff --git a/community/index/src/main/java/org/neo4j/index/gbptree/StructurePropagation.java b/community/index/src/main/java/org/neo4j/index/internal/gbptree/StructurePropagation.java
similarity index 97%
rename from community/index/src/main/java/org/neo4j/index/gbptree/StructurePropagation.java
rename to community/index/src/main/java/org/neo4j/index/internal/gbptree/StructurePropagation.java
index d61e29ed48873..063d66cae3621 100644
--- a/community/index/src/main/java/org/neo4j/index/gbptree/StructurePropagation.java
+++ b/community/index/src/main/java/org/neo4j/index/internal/gbptree/StructurePropagation.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 /**
  * Means of communicating information about splits, caused by insertion, from lower levels of the tree up to parent
diff --git a/community/index/src/main/java/org/neo4j/index/gbptree/TreeInconsistencyException.java b/community/index/src/main/java/org/neo4j/index/internal/gbptree/TreeInconsistencyException.java
similarity index 96%
rename from community/index/src/main/java/org/neo4j/index/gbptree/TreeInconsistencyException.java
rename to community/index/src/main/java/org/neo4j/index/internal/gbptree/TreeInconsistencyException.java
index 804279f5d7b73..9971a42d7ea51 100644
--- a/community/index/src/main/java/org/neo4j/index/gbptree/TreeInconsistencyException.java
+++ b/community/index/src/main/java/org/neo4j/index/internal/gbptree/TreeInconsistencyException.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 /**
  * Thrown to signal inconsistencies in the tree, either between tree nodes or inside a tree node.
diff --git a/community/index/src/main/java/org/neo4j/index/gbptree/TreeNode.java b/community/index/src/main/java/org/neo4j/index/internal/gbptree/TreeNode.java
similarity index 98%
rename from community/index/src/main/java/org/neo4j/index/gbptree/TreeNode.java
rename to community/index/src/main/java/org/neo4j/index/internal/gbptree/TreeNode.java
index 58418fc71b3de..d779ba938cd6a 100644
--- a/community/index/src/main/java/org/neo4j/index/gbptree/TreeNode.java
+++ b/community/index/src/main/java/org/neo4j/index/internal/gbptree/TreeNode.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import java.io.IOException;
 import java.util.Comparator;
@@ -25,8 +25,8 @@
 
 import org.neo4j.io.pagecache.PageCursor;
 
-import static org.neo4j.index.gbptree.GenSafePointerPair.NO_LOGICAL_POS;
-import static org.neo4j.index.gbptree.GenSafePointerPair.read;
+import static org.neo4j.index.internal.gbptree.GenSafePointerPair.NO_LOGICAL_POS;
+import static org.neo4j.index.internal.gbptree.GenSafePointerPair.read;
 
 /**
  * Methods to manipulate single tree node such as set and get header fields,
diff --git a/community/index/src/main/java/org/neo4j/index/gbptree/TreePrinter.java b/community/index/src/main/java/org/neo4j/index/internal/gbptree/TreePrinter.java
similarity index 96%
rename from community/index/src/main/java/org/neo4j/index/gbptree/TreePrinter.java
rename to community/index/src/main/java/org/neo4j/index/internal/gbptree/TreePrinter.java
index 93cfa85edcab8..7b61b050ea34a 100644
--- a/community/index/src/main/java/org/neo4j/index/gbptree/TreePrinter.java
+++ b/community/index/src/main/java/org/neo4j/index/internal/gbptree/TreePrinter.java
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import java.io.IOException;
 import java.io.PrintStream;
 import org.neo4j.io.pagecache.PageCursor;
 
-import static org.neo4j.index.gbptree.ConsistencyChecker.assertOnTreeNode;
-import static org.neo4j.index.gbptree.GenSafePointerPair.pointer;
+import static org.neo4j.index.internal.gbptree.ConsistencyChecker.assertOnTreeNode;
+import static org.neo4j.index.internal.gbptree.GenSafePointerPair.pointer;
 
 /**
  * Utility class for printing a {@link GBPTree}, either whole or sub-tree.
diff --git a/community/index/src/main/java/org/neo4j/index/gbptree/TreeState.java b/community/index/src/main/java/org/neo4j/index/internal/gbptree/TreeState.java
similarity index 99%
rename from community/index/src/main/java/org/neo4j/index/gbptree/TreeState.java
rename to community/index/src/main/java/org/neo4j/index/internal/gbptree/TreeState.java
index 2700832982da4..f12550f7dd64f 100644
--- a/community/index/src/main/java/org/neo4j/index/gbptree/TreeState.java
+++ b/community/index/src/main/java/org/neo4j/index/internal/gbptree/TreeState.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import java.util.Objects;
 
diff --git a/community/index/src/main/java/org/neo4j/index/gbptree/TreeStatePair.java b/community/index/src/main/java/org/neo4j/index/internal/gbptree/TreeStatePair.java
similarity index 97%
rename from community/index/src/main/java/org/neo4j/index/gbptree/TreeStatePair.java
rename to community/index/src/main/java/org/neo4j/index/internal/gbptree/TreeStatePair.java
index b003cfdbe04be..b9bbd9f56a5ce 100644
--- a/community/index/src/main/java/org/neo4j/index/gbptree/TreeStatePair.java
+++ b/community/index/src/main/java/org/neo4j/index/internal/gbptree/TreeStatePair.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import org.apache.commons.lang3.tuple.Pair;
 
@@ -26,7 +26,7 @@
 
 import org.neo4j.io.pagecache.PageCursor;
 
-import static org.neo4j.index.gbptree.PageCursorUtil.checkOutOfBounds;
+import static org.neo4j.index.internal.gbptree.PageCursorUtil.checkOutOfBounds;
 
 /**
  * Pair of {@link TreeState}, ability to make decision about which of the two to read and write respectively,
diff --git a/community/index/src/main/java/org/neo4j/index/gbptree/ValueMerger.java b/community/index/src/main/java/org/neo4j/index/internal/gbptree/ValueMerger.java
similarity index 97%
rename from community/index/src/main/java/org/neo4j/index/gbptree/ValueMerger.java
rename to community/index/src/main/java/org/neo4j/index/internal/gbptree/ValueMerger.java
index 0e105d9108498..ba9ce5ef0ca17 100644
--- a/community/index/src/main/java/org/neo4j/index/gbptree/ValueMerger.java
+++ b/community/index/src/main/java/org/neo4j/index/internal/gbptree/ValueMerger.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 /**
  * Decides what to do when inserting key which already exists in index. Different implementations of
diff --git a/community/index/src/main/java/org/neo4j/index/gbptree/ValueMergers.java b/community/index/src/main/java/org/neo4j/index/internal/gbptree/ValueMergers.java
similarity index 97%
rename from community/index/src/main/java/org/neo4j/index/gbptree/ValueMergers.java
rename to community/index/src/main/java/org/neo4j/index/internal/gbptree/ValueMergers.java
index d26588d7c5581..06ebac688d5c4 100644
--- a/community/index/src/main/java/org/neo4j/index/gbptree/ValueMergers.java
+++ b/community/index/src/main/java/org/neo4j/index/internal/gbptree/ValueMergers.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 /**
  * Common {@link ValueMerger} implementations.
diff --git a/community/index/src/main/java/org/neo4j/index/gbptree/Writer.java b/community/index/src/main/java/org/neo4j/index/internal/gbptree/Writer.java
similarity index 98%
rename from community/index/src/main/java/org/neo4j/index/gbptree/Writer.java
rename to community/index/src/main/java/org/neo4j/index/internal/gbptree/Writer.java
index a4c1e2c671c8d..d0af1b1cd4bfb 100644
--- a/community/index/src/main/java/org/neo4j/index/gbptree/Writer.java
+++ b/community/index/src/main/java/org/neo4j/index/internal/gbptree/Writer.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/community/index/src/main/java/org/neo4j/index/gbptree/package-info.java b/community/index/src/main/java/org/neo4j/index/internal/gbptree/package-info.java
similarity index 96%
rename from community/index/src/main/java/org/neo4j/index/gbptree/package-info.java
rename to community/index/src/main/java/org/neo4j/index/internal/gbptree/package-info.java
index 9847cf7b1e56e..8f8a03a3923b5 100644
--- a/community/index/src/main/java/org/neo4j/index/gbptree/package-info.java
+++ b/community/index/src/main/java/org/neo4j/index/internal/gbptree/package-info.java
@@ -27,4 +27,4 @@
  * <p>
  * See https://en.wikipedia.org/wiki/B%2B_tree
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
diff --git a/community/index/src/test/java/org/neo4j/index/gbptree/ByteArrayPageCursor.java b/community/index/src/test/java/org/neo4j/index/internal/gbptree/ByteArrayPageCursor.java
similarity index 99%
rename from community/index/src/test/java/org/neo4j/index/gbptree/ByteArrayPageCursor.java
rename to community/index/src/test/java/org/neo4j/index/internal/gbptree/ByteArrayPageCursor.java
index 30a2a8a8a9b5b..af975c7caffcf 100644
--- a/community/index/src/test/java/org/neo4j/index/gbptree/ByteArrayPageCursor.java
+++ b/community/index/src/test/java/org/neo4j/index/internal/gbptree/ByteArrayPageCursor.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/community/index/src/test/java/org/neo4j/index/gbptree/ConsistencyCheckerTest.java b/community/index/src/test/java/org/neo4j/index/internal/gbptree/ConsistencyCheckerTest.java
similarity index 89%
rename from community/index/src/test/java/org/neo4j/index/gbptree/ConsistencyCheckerTest.java
rename to community/index/src/test/java/org/neo4j/index/internal/gbptree/ConsistencyCheckerTest.java
index 1725e19b6eb8b..8d9c14e1d8548 100644
--- a/community/index/src/test/java/org/neo4j/index/gbptree/ConsistencyCheckerTest.java
+++ b/community/index/src/test/java/org/neo4j/index/internal/gbptree/ConsistencyCheckerTest.java
@@ -17,12 +17,19 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import org.apache.commons.lang3.mutable.MutableLong;
 import org.junit.Test;
 
 import org.neo4j.collection.primitive.PrimitiveLongCollections;
+import org.neo4j.index.internal.gbptree.ConsistencyChecker;
+import org.neo4j.index.internal.gbptree.GenSafePointer;
+import org.neo4j.index.internal.gbptree.InternalTreeLogic;
+import org.neo4j.index.internal.gbptree.Layout;
+import org.neo4j.index.internal.gbptree.StructurePropagation;
+import org.neo4j.index.internal.gbptree.TreeNode;
+import org.neo4j.index.internal.gbptree.ValueMergers;
 import org.neo4j.io.pagecache.CursorException;
 import org.neo4j.io.pagecache.PageCursor;
 
@@ -30,9 +37,9 @@
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 
-import static org.neo4j.index.gbptree.ConsistencyChecker.assertNoCrashOrBrokenPointerInGSPP;
-import static org.neo4j.index.gbptree.GenSafePointer.MIN_GENERATION;
-import static org.neo4j.index.gbptree.PageCursorUtil.goTo;
+import static org.neo4j.index.internal.gbptree.ConsistencyChecker.assertNoCrashOrBrokenPointerInGSPP;
+import static org.neo4j.index.internal.gbptree.GenSafePointer.MIN_GENERATION;
+import static org.neo4j.index.internal.gbptree.PageCursorUtil.goTo;
 
 public class ConsistencyCheckerTest
 {
diff --git a/community/index/src/test/java/org/neo4j/index/gbptree/FormatCompatibilityTest.java b/community/index/src/test/java/org/neo4j/index/internal/gbptree/FormatCompatibilityTest.java
similarity index 95%
rename from community/index/src/test/java/org/neo4j/index/gbptree/FormatCompatibilityTest.java
rename to community/index/src/test/java/org/neo4j/index/internal/gbptree/FormatCompatibilityTest.java
index 4462fab40b8b5..dbf3abcceb64a 100644
--- a/community/index/src/test/java/org/neo4j/index/gbptree/FormatCompatibilityTest.java
+++ b/community/index/src/test/java/org/neo4j/index/internal/gbptree/FormatCompatibilityTest.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import org.apache.commons.lang3.mutable.MutableLong;
 import org.junit.Rule;
@@ -36,8 +36,9 @@
 import java.util.zip.ZipOutputStream;
 
 import org.neo4j.cursor.RawCursor;
-import org.neo4j.index.Hit;
-import org.neo4j.index.IndexWriter;
+import org.neo4j.index.internal.gbptree.GBPTree;
+import org.neo4j.index.internal.gbptree.Hit;
+import org.neo4j.index.internal.gbptree.MetadataMismatchException;
 import org.neo4j.io.pagecache.IOLimiter;
 import org.neo4j.io.pagecache.PageCache;
 import org.neo4j.test.rule.PageCacheRule;
@@ -53,7 +54,7 @@
 
 import static java.lang.String.format;
 
-import static org.neo4j.index.gbptree.GBPTree.NO_MONITOR;
+import static org.neo4j.index.internal.gbptree.GBPTree.NO_MONITOR;
 import static org.neo4j.test.rule.PageCacheRule.config;
 
 /**
@@ -183,7 +184,7 @@ private void createAndZipTree( File storeFile ) throws IOException
             int batchSize = KEY_COUNT / 10;
             for ( int i = 0, key = 0; i < 10; i++ )
             {
-                try ( IndexWriter<MutableLong,MutableLong> writer = tree.writer() )
+                try ( Writer<MutableLong,MutableLong> writer = tree.writer() )
                 {
                     for ( int j = 0; j < batchSize; j++, key++ )
                     {
diff --git a/community/index/src/test/java/org/neo4j/index/gbptree/FreeListIdProviderTest.java b/community/index/src/test/java/org/neo4j/index/internal/gbptree/FreeListIdProviderTest.java
similarity index 96%
rename from community/index/src/test/java/org/neo4j/index/gbptree/FreeListIdProviderTest.java
rename to community/index/src/test/java/org/neo4j/index/internal/gbptree/FreeListIdProviderTest.java
index 303935523fc86..b66d64e914c88 100644
--- a/community/index/src/test/java/org/neo4j/index/gbptree/FreeListIdProviderTest.java
+++ b/community/index/src/test/java/org/neo4j/index/internal/gbptree/FreeListIdProviderTest.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -30,7 +30,9 @@
 
 import org.neo4j.collection.primitive.Primitive;
 import org.neo4j.collection.primitive.PrimitiveLongSet;
-import org.neo4j.index.gbptree.FreeListIdProvider.Monitor;
+import org.neo4j.index.internal.gbptree.FreeListIdProvider;
+import org.neo4j.index.internal.gbptree.GenSafePointer;
+import org.neo4j.index.internal.gbptree.FreeListIdProvider.Monitor;
 import org.neo4j.io.pagecache.PageCursor;
 import org.neo4j.io.pagecache.PagedFile;
 import org.neo4j.test.rule.RandomRule;
@@ -42,7 +44,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import static org.neo4j.index.gbptree.FreeListIdProvider.NO_MONITOR;
+import static org.neo4j.index.internal.gbptree.FreeListIdProvider.NO_MONITOR;
 
 public class FreeListIdProviderTest
 {
diff --git a/community/index/src/test/java/org/neo4j/index/gbptree/FreelistNodeTest.java b/community/index/src/test/java/org/neo4j/index/internal/gbptree/FreelistNodeTest.java
similarity index 94%
rename from community/index/src/test/java/org/neo4j/index/gbptree/FreelistNodeTest.java
rename to community/index/src/test/java/org/neo4j/index/internal/gbptree/FreelistNodeTest.java
index 1faa28ba0b351..9c47216167a51 100644
--- a/community/index/src/test/java/org/neo4j/index/gbptree/FreelistNodeTest.java
+++ b/community/index/src/test/java/org/neo4j/index/internal/gbptree/FreelistNodeTest.java
@@ -17,10 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import org.junit.Test;
 
+import org.neo4j.index.internal.gbptree.FreelistNode;
+import org.neo4j.index.internal.gbptree.GenSafePointer;
+import org.neo4j.index.internal.gbptree.PageCursorUtil;
+import org.neo4j.index.internal.gbptree.TreeNode;
 import org.neo4j.io.pagecache.PageCursor;
 
 import static org.junit.Assert.assertEquals;
diff --git a/community/index/src/test/java/org/neo4j/index/gbptree/GBPTreeIT.java b/community/index/src/test/java/org/neo4j/index/internal/gbptree/GBPTreeIT.java
similarity index 99%
rename from community/index/src/test/java/org/neo4j/index/gbptree/GBPTreeIT.java
rename to community/index/src/test/java/org/neo4j/index/internal/gbptree/GBPTreeIT.java
index 639d0b59e6feb..e7595c85552cc 100644
--- a/community/index/src/test/java/org/neo4j/index/gbptree/GBPTreeIT.java
+++ b/community/index/src/test/java/org/neo4j/index/internal/gbptree/GBPTreeIT.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import org.apache.commons.lang3.mutable.MutableLong;
 import org.junit.After;
@@ -40,6 +40,10 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 import org.neo4j.cursor.RawCursor;
+import org.neo4j.index.internal.gbptree.GBPTree;
+import org.neo4j.index.internal.gbptree.Hit;
+import org.neo4j.index.internal.gbptree.Layout;
+import org.neo4j.index.internal.gbptree.Writer;
 import org.neo4j.io.pagecache.IOLimiter;
 import org.neo4j.io.pagecache.PageCache;
 import org.neo4j.test.rule.PageCacheRule;
@@ -55,7 +59,7 @@
 import static org.junit.Assert.fail;
 import static org.junit.rules.RuleChain.outerRule;
 
-import static org.neo4j.index.gbptree.GBPTree.NO_MONITOR;
+import static org.neo4j.index.internal.gbptree.GBPTree.NO_MONITOR;
 import static org.neo4j.test.rule.PageCacheRule.config;
 
 public class GBPTreeIT
diff --git a/community/index/src/test/java/org/neo4j/index/gbptree/GBPTreeRecoveryTest.java b/community/index/src/test/java/org/neo4j/index/internal/gbptree/GBPTreeRecoveryTest.java
similarity index 97%
rename from community/index/src/test/java/org/neo4j/index/gbptree/GBPTreeRecoveryTest.java
rename to community/index/src/test/java/org/neo4j/index/internal/gbptree/GBPTreeRecoveryTest.java
index e22b14b2aa4c5..194b7d63ef096 100644
--- a/community/index/src/test/java/org/neo4j/index/gbptree/GBPTreeRecoveryTest.java
+++ b/community/index/src/test/java/org/neo4j/index/internal/gbptree/GBPTreeRecoveryTest.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import org.apache.commons.lang3.mutable.MutableLong;
 import org.junit.Rule;
@@ -33,6 +33,9 @@
 import java.util.stream.Collectors;
 
 import org.neo4j.cursor.RawCursor;
+import org.neo4j.index.internal.gbptree.GBPTree;
+import org.neo4j.index.internal.gbptree.Hit;
+import org.neo4j.index.internal.gbptree.Writer;
 import org.neo4j.io.pagecache.PageCache;
 import org.neo4j.test.rule.PageCacheRule;
 import org.neo4j.test.rule.RandomRule;
@@ -44,8 +47,8 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.rules.RuleChain.outerRule;
 
-import static org.neo4j.index.gbptree.GBPTree.NO_MONITOR;
-import static org.neo4j.index.gbptree.ThrowingRunnable.throwing;
+import static org.neo4j.index.internal.gbptree.ThrowingRunnable.throwing;
+import static org.neo4j.index.internal.gbptree.GBPTree.NO_MONITOR;
 import static org.neo4j.io.pagecache.IOLimiter.unlimited;
 import static org.neo4j.test.rule.PageCacheRule.config;
 
diff --git a/community/index/src/test/java/org/neo4j/index/gbptree/GBPTreeTest.java b/community/index/src/test/java/org/neo4j/index/internal/gbptree/GBPTreeTest.java
similarity index 97%
rename from community/index/src/test/java/org/neo4j/index/gbptree/GBPTreeTest.java
rename to community/index/src/test/java/org/neo4j/index/internal/gbptree/GBPTreeTest.java
index 60c2f2461ed11..88a2c88271ef0 100644
--- a/community/index/src/test/java/org/neo4j/index/gbptree/GBPTreeTest.java
+++ b/community/index/src/test/java/org/neo4j/index/internal/gbptree/GBPTreeTest.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import org.apache.commons.lang3.mutable.MutableLong;
 import org.junit.After;
@@ -36,7 +36,13 @@
 import org.neo4j.collection.primitive.PrimitiveLongCollections;
 import org.neo4j.collection.primitive.PrimitiveLongSet;
 import org.neo4j.cursor.RawCursor;
-import org.neo4j.index.gbptree.GBPTree.Monitor;
+import org.neo4j.index.internal.gbptree.GBPTree;
+import org.neo4j.index.internal.gbptree.Hit;
+import org.neo4j.index.internal.gbptree.IdSpace;
+import org.neo4j.index.internal.gbptree.Layout;
+import org.neo4j.index.internal.gbptree.MetadataMismatchException;
+import org.neo4j.index.internal.gbptree.Writer;
+import org.neo4j.index.internal.gbptree.GBPTree.Monitor;
 import org.neo4j.io.pagecache.IOLimiter;
 import org.neo4j.io.pagecache.PageCache;
 import org.neo4j.io.pagecache.PageCursor;
@@ -55,8 +61,8 @@
 import static org.junit.Assert.fail;
 import static org.junit.rules.RuleChain.outerRule;
 
-import static org.neo4j.index.gbptree.GBPTree.NO_MONITOR;
-import static org.neo4j.index.gbptree.ThrowingRunnable.throwing;
+import static org.neo4j.index.internal.gbptree.ThrowingRunnable.throwing;
+import static org.neo4j.index.internal.gbptree.GBPTree.NO_MONITOR;
 import static org.neo4j.test.rule.PageCacheRule.config;
 
 public class GBPTreeTest
diff --git a/community/index/src/test/java/org/neo4j/index/gbptree/GenSafePointerPairAdditionalTest.java b/community/index/src/test/java/org/neo4j/index/internal/gbptree/GenSafePointerPairAdditionalTest.java
similarity index 84%
rename from community/index/src/test/java/org/neo4j/index/gbptree/GenSafePointerPairAdditionalTest.java
rename to community/index/src/test/java/org/neo4j/index/internal/gbptree/GenSafePointerPairAdditionalTest.java
index e4ca5ab29c9a1..ffd0e9970a000 100644
--- a/community/index/src/test/java/org/neo4j/index/gbptree/GenSafePointerPairAdditionalTest.java
+++ b/community/index/src/test/java/org/neo4j/index/internal/gbptree/GenSafePointerPairAdditionalTest.java
@@ -17,16 +17,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import org.junit.Test;
 
 import static org.junit.Assert.fail;
 
-import static org.neo4j.index.gbptree.GenSafePointer.MIN_GENERATION;
-import static org.neo4j.index.gbptree.GenSafePointerPair.MAX_GEN_OFFSET_MASK;
-import static org.neo4j.index.gbptree.GenSafePointerPair.read;
-import static org.neo4j.index.gbptree.GenSafePointerPair.write;
+import static org.neo4j.index.internal.gbptree.GenSafePointer.MIN_GENERATION;
+import static org.neo4j.index.internal.gbptree.GenSafePointerPair.MAX_GEN_OFFSET_MASK;
+import static org.neo4j.index.internal.gbptree.GenSafePointerPair.read;
+import static org.neo4j.index.internal.gbptree.GenSafePointerPair.write;
 import static org.neo4j.io.ByteUnit.kibiBytes;
 
 public class GenSafePointerPairAdditionalTest
diff --git a/community/index/src/test/java/org/neo4j/index/gbptree/GenSafePointerPairTest.java b/community/index/src/test/java/org/neo4j/index/internal/gbptree/GenSafePointerPairTest.java
similarity index 95%
rename from community/index/src/test/java/org/neo4j/index/gbptree/GenSafePointerPairTest.java
rename to community/index/src/test/java/org/neo4j/index/internal/gbptree/GenSafePointerPairTest.java
index 0886d09abb117..f5b10d8f08642 100644
--- a/community/index/src/test/java/org/neo4j/index/gbptree/GenSafePointerPairTest.java
+++ b/community/index/src/test/java/org/neo4j/index/internal/gbptree/GenSafePointerPairTest.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -28,6 +28,8 @@
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.neo4j.index.internal.gbptree.GenSafePointer;
+import org.neo4j.index.internal.gbptree.GenSafePointerPair;
 import org.neo4j.io.pagecache.PageCursor;
 
 import static org.hamcrest.CoreMatchers.containsString;
@@ -36,17 +38,18 @@
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
-import static org.neo4j.index.gbptree.GenSafePointerPair.GEN_COMPARISON_MASK;
-import static org.neo4j.index.gbptree.GenSafePointerPair.NO_LOGICAL_POS;
-import static org.neo4j.index.gbptree.GenSafePointerPair.FLAG_READ;
-import static org.neo4j.index.gbptree.GenSafePointerPair.READ_OR_WRITE_MASK;
-import static org.neo4j.index.gbptree.GenSafePointerPair.SHIFT_STATE_A;
-import static org.neo4j.index.gbptree.GenSafePointerPair.SHIFT_STATE_B;
-import static org.neo4j.index.gbptree.GenSafePointerPair.FLAG_WRITE;
-import static org.neo4j.index.gbptree.GenSafePointerPair.failureDescription;
-import static org.neo4j.index.gbptree.GenSafePointerPair.isRead;
-import static org.neo4j.index.gbptree.GenSafePointerPair.pointerStateFromResult;
-import static org.neo4j.index.gbptree.GenSafePointerPair.pointerStateName;
+
+import static org.neo4j.index.internal.gbptree.GenSafePointerPair.FLAG_READ;
+import static org.neo4j.index.internal.gbptree.GenSafePointerPair.FLAG_WRITE;
+import static org.neo4j.index.internal.gbptree.GenSafePointerPair.GEN_COMPARISON_MASK;
+import static org.neo4j.index.internal.gbptree.GenSafePointerPair.NO_LOGICAL_POS;
+import static org.neo4j.index.internal.gbptree.GenSafePointerPair.READ_OR_WRITE_MASK;
+import static org.neo4j.index.internal.gbptree.GenSafePointerPair.SHIFT_STATE_A;
+import static org.neo4j.index.internal.gbptree.GenSafePointerPair.SHIFT_STATE_B;
+import static org.neo4j.index.internal.gbptree.GenSafePointerPair.failureDescription;
+import static org.neo4j.index.internal.gbptree.GenSafePointerPair.isRead;
+import static org.neo4j.index.internal.gbptree.GenSafePointerPair.pointerStateFromResult;
+import static org.neo4j.index.internal.gbptree.GenSafePointerPair.pointerStateName;
 
 @RunWith( Parameterized.class )
 public class GenSafePointerPairTest
diff --git a/community/index/src/test/java/org/neo4j/index/gbptree/GenSafePointerTest.java b/community/index/src/test/java/org/neo4j/index/internal/gbptree/GenSafePointerTest.java
similarity index 98%
rename from community/index/src/test/java/org/neo4j/index/gbptree/GenSafePointerTest.java
rename to community/index/src/test/java/org/neo4j/index/internal/gbptree/GenSafePointerTest.java
index 5cff025603a17..468a8b00ef287 100644
--- a/community/index/src/test/java/org/neo4j/index/gbptree/GenSafePointerTest.java
+++ b/community/index/src/test/java/org/neo4j/index/internal/gbptree/GenSafePointerTest.java
@@ -17,11 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import org.junit.Rule;
 import org.junit.Test;
 
+import org.neo4j.index.internal.gbptree.GenSafePointer;
 import org.neo4j.io.pagecache.PageCursor;
 import org.neo4j.test.rule.RandomRule;
 
diff --git a/community/index/src/test/java/org/neo4j/index/gbptree/GenerationTest.java b/community/index/src/test/java/org/neo4j/index/internal/gbptree/GenerationTest.java
similarity index 91%
rename from community/index/src/test/java/org/neo4j/index/gbptree/GenerationTest.java
rename to community/index/src/test/java/org/neo4j/index/internal/gbptree/GenerationTest.java
index 197de466318dc..e527bf58f4ec6 100644
--- a/community/index/src/test/java/org/neo4j/index/gbptree/GenerationTest.java
+++ b/community/index/src/test/java/org/neo4j/index/internal/gbptree/GenerationTest.java
@@ -17,10 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import org.junit.Test;
 
+import org.neo4j.index.internal.gbptree.GenSafePointer;
+import org.neo4j.index.internal.gbptree.Generation;
+
 import static org.junit.Assert.assertEquals;
 
 public class GenerationTest
diff --git a/community/index/src/test/java/org/neo4j/index/gbptree/InternalTreeLogicTest.java b/community/index/src/test/java/org/neo4j/index/internal/gbptree/InternalTreeLogicTest.java
similarity index 97%
rename from community/index/src/test/java/org/neo4j/index/gbptree/InternalTreeLogicTest.java
rename to community/index/src/test/java/org/neo4j/index/internal/gbptree/InternalTreeLogicTest.java
index 5910648c2121c..e614a029d836a 100644
--- a/community/index/src/test/java/org/neo4j/index/gbptree/InternalTreeLogicTest.java
+++ b/community/index/src/test/java/org/neo4j/index/internal/gbptree/InternalTreeLogicTest.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import org.apache.commons.lang3.mutable.MutableLong;
 import org.junit.Before;
@@ -31,6 +31,18 @@
 import java.util.Collection;
 import java.util.List;
 
+import org.neo4j.index.internal.gbptree.ConsistencyChecker;
+import org.neo4j.index.internal.gbptree.GenSafePointer;
+import org.neo4j.index.internal.gbptree.InternalTreeLogic;
+import org.neo4j.index.internal.gbptree.KeySearch;
+import org.neo4j.index.internal.gbptree.Layout;
+import org.neo4j.index.internal.gbptree.PageCursorUtil;
+import org.neo4j.index.internal.gbptree.RightmostInChain;
+import org.neo4j.index.internal.gbptree.StructurePropagation;
+import org.neo4j.index.internal.gbptree.TreeNode;
+import org.neo4j.index.internal.gbptree.TreePrinter;
+import org.neo4j.index.internal.gbptree.ValueMerger;
+import org.neo4j.index.internal.gbptree.ValueMergers;
 import org.neo4j.io.pagecache.PageCursor;
 import org.neo4j.test.rule.RandomRule;
 import static org.hamcrest.CoreMatchers.is;
@@ -42,9 +54,9 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assume.assumeTrue;
 
-import static org.neo4j.index.gbptree.ConsistencyChecker.assertNoCrashOrBrokenPointerInGSPP;
-import static org.neo4j.index.gbptree.GenSafePointerPair.pointer;
-import static org.neo4j.index.gbptree.ValueMergers.overwrite;
+import static org.neo4j.index.internal.gbptree.ConsistencyChecker.assertNoCrashOrBrokenPointerInGSPP;
+import static org.neo4j.index.internal.gbptree.GenSafePointerPair.pointer;
+import static org.neo4j.index.internal.gbptree.ValueMergers.overwrite;
 
 @RunWith( Parameterized.class )
 public class InternalTreeLogicTest
diff --git a/community/index/src/test/java/org/neo4j/index/gbptree/KeySearchTest.java b/community/index/src/test/java/org/neo4j/index/internal/gbptree/KeySearchTest.java
similarity index 97%
rename from community/index/src/test/java/org/neo4j/index/gbptree/KeySearchTest.java
rename to community/index/src/test/java/org/neo4j/index/internal/gbptree/KeySearchTest.java
index bf03185a83ff4..e0af8c5eca99c 100644
--- a/community/index/src/test/java/org/neo4j/index/gbptree/KeySearchTest.java
+++ b/community/index/src/test/java/org/neo4j/index/internal/gbptree/KeySearchTest.java
@@ -17,20 +17,23 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import org.apache.commons.lang3.mutable.MutableLong;
 import org.junit.Rule;
 import org.junit.Test;
 
+import org.neo4j.index.internal.gbptree.KeySearch;
+import org.neo4j.index.internal.gbptree.Layout;
+import org.neo4j.index.internal.gbptree.TreeNode;
 import org.neo4j.io.pagecache.PageCursor;
 import org.neo4j.test.rule.RandomRule;
 
 import static org.apache.commons.lang3.ArrayUtils.contains;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.neo4j.index.gbptree.ByteArrayPageCursor.wrap;
-import static org.neo4j.index.gbptree.KeySearch.search;
+import static org.neo4j.index.internal.gbptree.ByteArrayPageCursor.wrap;
+import static org.neo4j.index.internal.gbptree.KeySearch.search;
 
 public class KeySearchTest
 {
diff --git a/community/index/src/test/java/org/neo4j/index/gbptree/LayoutTest.java b/community/index/src/test/java/org/neo4j/index/internal/gbptree/LayoutTest.java
similarity index 95%
rename from community/index/src/test/java/org/neo4j/index/gbptree/LayoutTest.java
rename to community/index/src/test/java/org/neo4j/index/internal/gbptree/LayoutTest.java
index bd11abc083382..758afe00bf1e3 100644
--- a/community/index/src/test/java/org/neo4j/index/gbptree/LayoutTest.java
+++ b/community/index/src/test/java/org/neo4j/index/internal/gbptree/LayoutTest.java
@@ -17,10 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import org.junit.Test;
 
+import org.neo4j.index.internal.gbptree.Layout;
+
 import static org.junit.Assert.*;
 
 public class LayoutTest
diff --git a/community/index/src/test/java/org/neo4j/index/gbptree/PageAwareByteArrayCursor.java b/community/index/src/test/java/org/neo4j/index/internal/gbptree/PageAwareByteArrayCursor.java
similarity index 98%
rename from community/index/src/test/java/org/neo4j/index/gbptree/PageAwareByteArrayCursor.java
rename to community/index/src/test/java/org/neo4j/index/internal/gbptree/PageAwareByteArrayCursor.java
index 62d9f4540c340..ad1d3073da286 100644
--- a/community/index/src/test/java/org/neo4j/index/gbptree/PageAwareByteArrayCursor.java
+++ b/community/index/src/test/java/org/neo4j/index/internal/gbptree/PageAwareByteArrayCursor.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import java.io.File;
 import java.io.IOException;
@@ -27,7 +27,7 @@
 import org.neo4j.io.pagecache.CursorException;
 import org.neo4j.io.pagecache.PageCursor;
 
-import static org.neo4j.index.gbptree.ByteArrayPageCursor.*;
+import static org.neo4j.index.internal.gbptree.ByteArrayPageCursor.wrap;
 
 class PageAwareByteArrayCursor extends PageCursor
 {
diff --git a/community/index/src/test/java/org/neo4j/index/gbptree/PageCursorUtilTest.java b/community/index/src/test/java/org/neo4j/index/internal/gbptree/PageCursorUtilTest.java
similarity index 93%
rename from community/index/src/test/java/org/neo4j/index/gbptree/PageCursorUtilTest.java
rename to community/index/src/test/java/org/neo4j/index/internal/gbptree/PageCursorUtilTest.java
index 8e3939d690160..9dca98a4836fb 100644
--- a/community/index/src/test/java/org/neo4j/index/gbptree/PageCursorUtilTest.java
+++ b/community/index/src/test/java/org/neo4j/index/internal/gbptree/PageCursorUtilTest.java
@@ -17,10 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import org.junit.Rule;
 import org.junit.Test;
+
+import org.neo4j.index.internal.gbptree.PageCursorUtil;
 import org.neo4j.io.pagecache.PageCursor;
 import org.neo4j.test.rule.RandomRule;
 
@@ -28,7 +30,7 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import static org.neo4j.index.gbptree.PageCursorUtil._6B_MASK;
+import static org.neo4j.index.internal.gbptree.PageCursorUtil._6B_MASK;
 
 public class PageCursorUtilTest
 {
diff --git a/community/index/src/test/java/org/neo4j/index/gbptree/PointerCheckingTest.java b/community/index/src/test/java/org/neo4j/index/internal/gbptree/PointerCheckingTest.java
similarity index 88%
rename from community/index/src/test/java/org/neo4j/index/gbptree/PointerCheckingTest.java
rename to community/index/src/test/java/org/neo4j/index/internal/gbptree/PointerCheckingTest.java
index e748600488751..a492ca405442d 100644
--- a/community/index/src/test/java/org/neo4j/index/gbptree/PointerCheckingTest.java
+++ b/community/index/src/test/java/org/neo4j/index/internal/gbptree/PointerCheckingTest.java
@@ -17,18 +17,24 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import org.junit.Test;
 
+import org.neo4j.index.internal.gbptree.GenSafePointer;
+import org.neo4j.index.internal.gbptree.GenSafePointerPair;
+import org.neo4j.index.internal.gbptree.IdSpace;
+import org.neo4j.index.internal.gbptree.PointerChecking;
+import org.neo4j.index.internal.gbptree.TreeInconsistencyException;
+import org.neo4j.index.internal.gbptree.TreeNode;
 import org.neo4j.io.pagecache.PageCursor;
 
 import static org.junit.Assert.fail;
 
-import static org.neo4j.index.gbptree.GenSafePointerPair.NO_LOGICAL_POS;
-import static org.neo4j.index.gbptree.GenSafePointerPair.read;
-import static org.neo4j.index.gbptree.GenSafePointerPair.write;
-import static org.neo4j.index.gbptree.PageCursorUtil.put6BLong;
+import static org.neo4j.index.internal.gbptree.GenSafePointerPair.NO_LOGICAL_POS;
+import static org.neo4j.index.internal.gbptree.GenSafePointerPair.read;
+import static org.neo4j.index.internal.gbptree.GenSafePointerPair.write;
+import static org.neo4j.index.internal.gbptree.PageCursorUtil.put6BLong;
 
 public class PointerCheckingTest
 {
diff --git a/community/index/src/test/java/org/neo4j/index/gbptree/SeekCursorTest.java b/community/index/src/test/java/org/neo4j/index/internal/gbptree/SeekCursorTest.java
similarity index 98%
rename from community/index/src/test/java/org/neo4j/index/gbptree/SeekCursorTest.java
rename to community/index/src/test/java/org/neo4j/index/internal/gbptree/SeekCursorTest.java
index 799a3740a8d95..c3ad86fbdf7df 100644
--- a/community/index/src/test/java/org/neo4j/index/gbptree/SeekCursorTest.java
+++ b/community/index/src/test/java/org/neo4j/index/internal/gbptree/SeekCursorTest.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import org.apache.commons.lang3.mutable.MutableBoolean;
 import org.apache.commons.lang3.mutable.MutableLong;
@@ -32,6 +32,18 @@
 import java.util.function.LongSupplier;
 import java.util.function.Supplier;
 
+import org.neo4j.index.internal.gbptree.GenSafePointer;
+import org.neo4j.index.internal.gbptree.GenSafePointerPair;
+import org.neo4j.index.internal.gbptree.Generation;
+import org.neo4j.index.internal.gbptree.Hit;
+import org.neo4j.index.internal.gbptree.InternalTreeLogic;
+import org.neo4j.index.internal.gbptree.Layout;
+import org.neo4j.index.internal.gbptree.PageCursorUtil;
+import org.neo4j.index.internal.gbptree.Root;
+import org.neo4j.index.internal.gbptree.SeekCursor;
+import org.neo4j.index.internal.gbptree.StructurePropagation;
+import org.neo4j.index.internal.gbptree.TreeInconsistencyException;
+import org.neo4j.index.internal.gbptree.TreeNode;
 import org.neo4j.io.pagecache.PageCursor;
 import org.neo4j.io.pagecache.impl.DelegatingPageCursor;
 
@@ -42,8 +54,8 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import static org.neo4j.index.gbptree.GenSafePointerPair.pointer;
-import static org.neo4j.index.gbptree.ValueMergers.overwrite;
+import static org.neo4j.index.internal.gbptree.GenSafePointerPair.pointer;
+import static org.neo4j.index.internal.gbptree.ValueMergers.overwrite;
 
 public class SeekCursorTest
 {
diff --git a/community/index/src/test/java/org/neo4j/index/gbptree/SimpleIdProvider.java b/community/index/src/test/java/org/neo4j/index/internal/gbptree/SimpleIdProvider.java
similarity index 92%
rename from community/index/src/test/java/org/neo4j/index/gbptree/SimpleIdProvider.java
rename to community/index/src/test/java/org/neo4j/index/internal/gbptree/SimpleIdProvider.java
index 8ef8847a64f51..df7b1045d398d 100644
--- a/community/index/src/test/java/org/neo4j/index/gbptree/SimpleIdProvider.java
+++ b/community/index/src/test/java/org/neo4j/index/internal/gbptree/SimpleIdProvider.java
@@ -17,13 +17,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import org.apache.commons.lang3.tuple.Pair;
 
 import java.util.LinkedList;
 import java.util.Queue;
 
+import org.neo4j.index.internal.gbptree.IdProvider;
+import org.neo4j.index.internal.gbptree.IdSpace;
+
 class SimpleIdProvider implements IdProvider
 {
     private final Queue<Pair<Long,Long>> releasedIds = new LinkedList<>();
diff --git a/community/index/src/test/java/org/neo4j/index/gbptree/SimpleLongLayout.java b/community/index/src/test/java/org/neo4j/index/internal/gbptree/SimpleLongLayout.java
similarity index 97%
rename from community/index/src/test/java/org/neo4j/index/gbptree/SimpleLongLayout.java
rename to community/index/src/test/java/org/neo4j/index/internal/gbptree/SimpleLongLayout.java
index e0c35a3beb6a5..68ab4706758f1 100644
--- a/community/index/src/test/java/org/neo4j/index/gbptree/SimpleLongLayout.java
+++ b/community/index/src/test/java/org/neo4j/index/internal/gbptree/SimpleLongLayout.java
@@ -17,10 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import org.apache.commons.lang3.mutable.MutableLong;
 
+import org.neo4j.index.internal.gbptree.Layout;
 import org.neo4j.io.pagecache.PageCursor;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
diff --git a/community/index/src/test/java/org/neo4j/index/gbptree/TestPageCursor.java b/community/index/src/test/java/org/neo4j/index/internal/gbptree/TestPageCursor.java
similarity index 97%
rename from community/index/src/test/java/org/neo4j/index/gbptree/TestPageCursor.java
rename to community/index/src/test/java/org/neo4j/index/internal/gbptree/TestPageCursor.java
index 913a3a12575a9..d9c39d3fceab8 100644
--- a/community/index/src/test/java/org/neo4j/index/gbptree/TestPageCursor.java
+++ b/community/index/src/test/java/org/neo4j/index/internal/gbptree/TestPageCursor.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import java.io.IOException;
 
diff --git a/community/index/src/test/java/org/neo4j/index/gbptree/ThrowingRunnable.java b/community/index/src/test/java/org/neo4j/index/internal/gbptree/ThrowingRunnable.java
similarity index 96%
rename from community/index/src/test/java/org/neo4j/index/gbptree/ThrowingRunnable.java
rename to community/index/src/test/java/org/neo4j/index/internal/gbptree/ThrowingRunnable.java
index 11eba523d4b4f..d9269d253d73f 100644
--- a/community/index/src/test/java/org/neo4j/index/gbptree/ThrowingRunnable.java
+++ b/community/index/src/test/java/org/neo4j/index/internal/gbptree/ThrowingRunnable.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 interface ThrowingRunnable
 {
diff --git a/community/index/src/test/java/org/neo4j/index/gbptree/TreeNodeTest.java b/community/index/src/test/java/org/neo4j/index/internal/gbptree/TreeNodeTest.java
similarity index 97%
rename from community/index/src/test/java/org/neo4j/index/gbptree/TreeNodeTest.java
rename to community/index/src/test/java/org/neo4j/index/internal/gbptree/TreeNodeTest.java
index 2a463ab57cbd8..7bb722407398d 100644
--- a/community/index/src/test/java/org/neo4j/index/gbptree/TreeNodeTest.java
+++ b/community/index/src/test/java/org/neo4j/index/internal/gbptree/TreeNodeTest.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import org.apache.commons.lang3.mutable.MutableLong;
 import org.junit.Before;
@@ -26,6 +26,11 @@
 
 import java.io.IOException;
 
+import org.neo4j.index.internal.gbptree.GenSafePointer;
+import org.neo4j.index.internal.gbptree.GenSafePointerPair;
+import org.neo4j.index.internal.gbptree.Layout;
+import org.neo4j.index.internal.gbptree.MetadataMismatchException;
+import org.neo4j.index.internal.gbptree.TreeNode;
 import org.neo4j.io.pagecache.PageCursor;
 import org.neo4j.test.rule.RandomRule;
 
@@ -33,9 +38,10 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-import static org.neo4j.index.gbptree.GenSafePointerPair.pointer;
-import static org.neo4j.index.gbptree.GenSafePointerPair.resultIsFromSlotA;
-import static org.neo4j.index.gbptree.TreeNode.NO_NODE_FLAG;
+
+import static org.neo4j.index.internal.gbptree.GenSafePointerPair.pointer;
+import static org.neo4j.index.internal.gbptree.GenSafePointerPair.resultIsFromSlotA;
+import static org.neo4j.index.internal.gbptree.TreeNode.NO_NODE_FLAG;
 
 public class TreeNodeTest
 {
diff --git a/community/index/src/test/java/org/neo4j/index/gbptree/TreeStatePairTest.java b/community/index/src/test/java/org/neo4j/index/internal/gbptree/TreeStatePairTest.java
similarity index 97%
rename from community/index/src/test/java/org/neo4j/index/gbptree/TreeStatePairTest.java
rename to community/index/src/test/java/org/neo4j/index/internal/gbptree/TreeStatePairTest.java
index d8712a447400d..1870eece4c190 100644
--- a/community/index/src/test/java/org/neo4j/index/gbptree/TreeStatePairTest.java
+++ b/community/index/src/test/java/org/neo4j/index/internal/gbptree/TreeStatePairTest.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import org.apache.commons.lang3.tuple.Pair;
 import org.junit.Test;
@@ -28,6 +28,9 @@
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.neo4j.index.internal.gbptree.TreeInconsistencyException;
+import org.neo4j.index.internal.gbptree.TreeState;
+import org.neo4j.index.internal.gbptree.TreeStatePair;
 import org.neo4j.io.pagecache.PageCursor;
 
 import static org.junit.Assert.assertSame;
diff --git a/community/index/src/test/java/org/neo4j/index/gbptree/TreeStateTest.java b/community/index/src/test/java/org/neo4j/index/internal/gbptree/TreeStateTest.java
similarity index 96%
rename from community/index/src/test/java/org/neo4j/index/gbptree/TreeStateTest.java
rename to community/index/src/test/java/org/neo4j/index/internal/gbptree/TreeStateTest.java
index f73b4489a88ff..6c54458ceee9e 100644
--- a/community/index/src/test/java/org/neo4j/index/gbptree/TreeStateTest.java
+++ b/community/index/src/test/java/org/neo4j/index/internal/gbptree/TreeStateTest.java
@@ -17,13 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import org.junit.Before;
 import org.junit.Test;
 
 import java.io.IOException;
 
+import org.neo4j.index.internal.gbptree.GenSafePointer;
+import org.neo4j.index.internal.gbptree.TreeState;
 import org.neo4j.io.pagecache.PageCursor;
 
 import static org.junit.Assert.assertEquals;