diff --git a/akka-http-core/src/main/scala/akka/parboiled2/Base64Parsing.scala b/akka-http-core/src/main/scala/akka/http/model/parser/Base64Parsing.scala
similarity index 97%
rename from akka-http-core/src/main/scala/akka/parboiled2/Base64Parsing.scala
rename to akka-http-core/src/main/scala/akka/http/model/parser/Base64Parsing.scala
index 15083e649c..60334c578a 100644
--- a/akka-http-core/src/main/scala/akka/parboiled2/Base64Parsing.scala
+++ b/akka-http-core/src/main/scala/akka/http/model/parser/Base64Parsing.scala
@@ -14,8 +14,10 @@
  * limitations under the License.
  */
 
-package akka.parboiled2
+package akka.http.model
+package parser
 
+import akka.parboiled2._
 import akka.parboiled2.util.Base64
 
 /**
diff --git a/akka-http-core/src/main/scala/akka/parboiled2/StringBuilding.scala b/akka-http-core/src/main/scala/akka/http/model/parser/StringBuilding.scala
similarity index 96%
rename from akka-http-core/src/main/scala/akka/parboiled2/StringBuilding.scala
rename to akka-http-core/src/main/scala/akka/http/model/parser/StringBuilding.scala
index 821a182226..60b1c9ca5a 100644
--- a/akka-http-core/src/main/scala/akka/parboiled2/StringBuilding.scala
+++ b/akka-http-core/src/main/scala/akka/http/model/parser/StringBuilding.scala
@@ -13,8 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package akka.http.model
+package parser
 
-package akka.parboiled2
+import akka.parboiled2._
 
 /**
  * For certain high-performance use-cases it is better to construct Strings