diff --git a/src/main/java/org/jline/reader/LineReaderBuilder.java b/src/main/java/org/jline/reader/LineReaderBuilder.java
index 4bd94c400..3628d6885 100644
--- a/src/main/java/org/jline/reader/LineReaderBuilder.java
+++ b/src/main/java/org/jline/reader/LineReaderBuilder.java
@@ -12,7 +12,7 @@
 import java.util.Map;
 
 import org.jline.reader.impl.LineReaderImpl;
-import org.jline.reader.impl.history.history.MemoryHistory;
+import org.jline.reader.impl.history.MemoryHistory;
 import org.jline.terminal.Terminal;
 
 public final class LineReaderBuilder {
diff --git a/src/main/java/org/jline/reader/impl/LineReaderImpl.java b/src/main/java/org/jline/reader/impl/LineReaderImpl.java
index b7757de4a..7ec5dd54f 100644
--- a/src/main/java/org/jline/reader/impl/LineReaderImpl.java
+++ b/src/main/java/org/jline/reader/impl/LineReaderImpl.java
@@ -57,7 +57,7 @@
 import org.jline.reader.SyntaxError;
 import org.jline.reader.UserInterruptException;
 import org.jline.reader.Widget;
-import org.jline.reader.impl.history.history.MemoryHistory;
+import org.jline.reader.impl.history.MemoryHistory;
 import org.jline.terminal.Attributes;
 import org.jline.terminal.Attributes.ControlChar;
 import org.jline.terminal.Size;
diff --git a/src/main/java/org/jline/reader/impl/history/history/FileHistory.java b/src/main/java/org/jline/reader/impl/history/FileHistory.java
similarity index 98%
rename from src/main/java/org/jline/reader/impl/history/history/FileHistory.java
rename to src/main/java/org/jline/reader/impl/history/FileHistory.java
index a6660b6ab..7d685048f 100644
--- a/src/main/java/org/jline/reader/impl/history/history/FileHistory.java
+++ b/src/main/java/org/jline/reader/impl/history/FileHistory.java
@@ -6,7 +6,7 @@
  *
  * http://www.opensource.org/licenses/bsd-license.php
  */
-package org.jline.reader.impl.history.history;
+package org.jline.reader.impl.history;
 
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
@@ -105,4 +105,4 @@ public void clear() {
             Log.warn("Failed to delete history file: ", file);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/jline/reader/impl/history/history/MemoryHistory.java b/src/main/java/org/jline/reader/impl/history/MemoryHistory.java
similarity index 99%
rename from src/main/java/org/jline/reader/impl/history/history/MemoryHistory.java
rename to src/main/java/org/jline/reader/impl/history/MemoryHistory.java
index fc01fc6dd..3120e72ca 100644
--- a/src/main/java/org/jline/reader/impl/history/history/MemoryHistory.java
+++ b/src/main/java/org/jline/reader/impl/history/MemoryHistory.java
@@ -6,7 +6,7 @@
  *
  * http://www.opensource.org/licenses/bsd-license.php
  */
-package org.jline.reader.impl.history.history;
+package org.jline.reader.impl.history;
 
 import java.io.IOException;
 import java.util.Iterator;
diff --git a/src/main/java/org/jline/reader/impl/history/history/package-info.java b/src/main/java/org/jline/reader/impl/history/package-info.java
similarity index 86%
rename from src/main/java/org/jline/reader/impl/history/history/package-info.java
rename to src/main/java/org/jline/reader/impl/history/package-info.java
index 3b92032ad..80ba8c30a 100644
--- a/src/main/java/org/jline/reader/impl/history/history/package-info.java
+++ b/src/main/java/org/jline/reader/impl/history/package-info.java
@@ -11,4 +11,4 @@
  *
  * @since 3.0
  */
-package org.jline.reader.impl.history.history;
\ No newline at end of file
+package org.jline.reader.impl.history;
diff --git a/src/test/java/org/jline/reader/history/FileHistoryTest.java b/src/test/java/org/jline/reader/history/FileHistoryTest.java
index 26b35f3a8..872a0a620 100644
--- a/src/test/java/org/jline/reader/history/FileHistoryTest.java
+++ b/src/test/java/org/jline/reader/history/FileHistoryTest.java
@@ -11,7 +11,7 @@
 import java.io.File;
 import java.io.IOException;
 
-import org.jline.reader.impl.history.history.FileHistory;
+import org.jline.reader.impl.history.FileHistory;
 import org.junit.Test;
 
 /**
diff --git a/src/test/java/org/jline/reader/history/MemoryHistoryTest.java b/src/test/java/org/jline/reader/history/MemoryHistoryTest.java
index 05fde5f73..6886ff70a 100644
--- a/src/test/java/org/jline/reader/history/MemoryHistoryTest.java
+++ b/src/test/java/org/jline/reader/history/MemoryHistoryTest.java
@@ -9,7 +9,7 @@
 package org.jline.reader.history;
 
 import org.jline.reader.History;
-import org.jline.reader.impl.history.history.MemoryHistory;
+import org.jline.reader.impl.history.MemoryHistory;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/src/test/java/org/jline/reader/impl/HistorySearchTest.java b/src/test/java/org/jline/reader/impl/HistorySearchTest.java
index 74a23cc4b..fb866ed58 100644
--- a/src/test/java/org/jline/reader/impl/HistorySearchTest.java
+++ b/src/test/java/org/jline/reader/impl/HistorySearchTest.java
@@ -2,7 +2,7 @@
 
 import java.io.ByteArrayInputStream;
 
-import org.jline.reader.impl.history.history.MemoryHistory;
+import org.jline.reader.impl.history.MemoryHistory;
 import org.junit.Test;
 
 import static org.jline.keymap.KeyMap.translate;
diff --git a/src/test/java/org/jline/reader/impl/TerminalReaderTest.java b/src/test/java/org/jline/reader/impl/TerminalReaderTest.java
index a1edd37f8..f5f3d5d4e 100644
--- a/src/test/java/org/jline/reader/impl/TerminalReaderTest.java
+++ b/src/test/java/org/jline/reader/impl/TerminalReaderTest.java
@@ -19,7 +19,7 @@
 import org.jline.reader.History;
 import org.jline.reader.Reference;
 import org.jline.reader.Widget;
-import org.jline.reader.impl.history.history.MemoryHistory;
+import org.jline.reader.impl.history.MemoryHistory;
 import org.jline.utils.Curses;
 import org.jline.utils.InfoCmp.Capability;
 import org.junit.Before;