diff --git a/ext/build/README.txt b/ext/toolchain/README.txt
similarity index 100%
rename from ext/build/README.txt
rename to ext/toolchain/README.txt
diff --git a/ext/build/__init__.py b/ext/toolchain/__init__.py
similarity index 95%
rename from ext/build/__init__.py
rename to ext/toolchain/__init__.py
index 690cbcf1..3ae99e74 100644
--- a/ext/build/__init__.py
+++ b/ext/toolchain/__init__.py
@@ -13,5 +13,3 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from build import generators
diff --git a/ext/build/toolchain.py b/ext/toolchain/commands.py
similarity index 100%
rename from ext/build/toolchain.py
rename to ext/toolchain/commands.py
diff --git a/ext/build/ftputil.py b/ext/toolchain/ftputil.py
similarity index 100%
rename from ext/build/ftputil.py
rename to ext/toolchain/ftputil.py
diff --git a/ext/build/generators.py b/ext/toolchain/generators.py
similarity index 100%
rename from ext/build/generators.py
rename to ext/toolchain/generators.py