diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java b/maven-core/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java
index ad3363c1cd..397f0cef3b 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java
@@ -31,8 +31,8 @@ import org.apache.maven.building.Problem;
 import org.apache.maven.building.ProblemCollector;
 import org.apache.maven.building.ProblemCollectorFactory;
 import org.apache.maven.building.Source;
-import org.apache.maven.toolchain.building.io.ToolchainsParseException;
-import org.apache.maven.toolchain.building.io.ToolchainsReader;
+import org.apache.maven.toolchain.io.ToolchainsParseException;
+import org.apache.maven.toolchain.io.ToolchainsReader;
 import org.apache.maven.toolchain.merge.MavenToolchainMerger;
 import org.apache.maven.toolchain.model.PersistedToolchains;
 import org.apache.maven.toolchain.model.TrackableBase;
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/building/io/DefaultToolchainsReader.java b/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
similarity index 98%
rename from maven-core/src/main/java/org/apache/maven/toolchain/building/io/DefaultToolchainsReader.java
rename to maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
index 616fe60f47..f3f3dd74fc 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/building/io/DefaultToolchainsReader.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
@@ -1,4 +1,4 @@
-package org.apache.maven.toolchain.building.io;
+package org.apache.maven.toolchain.io;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/building/io/ToolchainsParseException.java b/maven-core/src/main/java/org/apache/maven/toolchain/io/ToolchainsParseException.java
similarity index 98%
rename from maven-core/src/main/java/org/apache/maven/toolchain/building/io/ToolchainsParseException.java
rename to maven-core/src/main/java/org/apache/maven/toolchain/io/ToolchainsParseException.java
index b35b3c7e81..9a5f96f3fc 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/building/io/ToolchainsParseException.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/io/ToolchainsParseException.java
@@ -1,4 +1,4 @@
-package org.apache.maven.toolchain.building.io;
+package org.apache.maven.toolchain.io;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/building/io/ToolchainsReader.java b/maven-core/src/main/java/org/apache/maven/toolchain/io/ToolchainsReader.java
similarity index 98%
rename from maven-core/src/main/java/org/apache/maven/toolchain/building/io/ToolchainsReader.java
rename to maven-core/src/main/java/org/apache/maven/toolchain/io/ToolchainsReader.java
index 850fdd3b94..f856f51b78 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/building/io/ToolchainsReader.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/io/ToolchainsReader.java
@@ -1,4 +1,4 @@
-package org.apache.maven.toolchain.building.io;
+package org.apache.maven.toolchain.io;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one