diff --git a/Sources/swcomp/BZip2Command.swift b/Sources/swcomp/Archives/BZip2Command.swift
similarity index 100%
rename from Sources/swcomp/BZip2Command.swift
rename to Sources/swcomp/Archives/BZip2Command.swift
diff --git a/Sources/swcomp/GZipCommand.swift b/Sources/swcomp/Archives/GZipCommand.swift
similarity index 100%
rename from Sources/swcomp/GZipCommand.swift
rename to Sources/swcomp/Archives/GZipCommand.swift
diff --git a/Sources/swcomp/LZMACommand.swift b/Sources/swcomp/Archives/LZMACommand.swift
similarity index 100%
rename from Sources/swcomp/LZMACommand.swift
rename to Sources/swcomp/Archives/LZMACommand.swift
diff --git a/Sources/swcomp/XZCommand.swift b/Sources/swcomp/Archives/XZCommand.swift
similarity index 100%
rename from Sources/swcomp/XZCommand.swift
rename to Sources/swcomp/Archives/XZCommand.swift
diff --git a/Sources/swcomp/BenchmarkGroup.swift b/Sources/swcomp/Benchmarks/BenchmarkGroup.swift
similarity index 100%
rename from Sources/swcomp/BenchmarkGroup.swift
rename to Sources/swcomp/Benchmarks/BenchmarkGroup.swift
diff --git a/Sources/swcomp/7ZipCommand.swift b/Sources/swcomp/Containers/7ZipCommand.swift
similarity index 100%
rename from Sources/swcomp/7ZipCommand.swift
rename to Sources/swcomp/Containers/7ZipCommand.swift
diff --git a/Sources/swcomp/CommonFunctions.swift b/Sources/swcomp/Containers/CommonFunctions.swift
similarity index 100%
rename from Sources/swcomp/CommonFunctions.swift
rename to Sources/swcomp/Containers/CommonFunctions.swift
diff --git a/Sources/swcomp/ContainerCommand.swift b/Sources/swcomp/Containers/ContainerCommand.swift
similarity index 100%
rename from Sources/swcomp/ContainerCommand.swift
rename to Sources/swcomp/Containers/ContainerCommand.swift
diff --git a/Sources/swcomp/TarCommand.swift b/Sources/swcomp/Containers/TarCommand.swift
similarity index 100%
rename from Sources/swcomp/TarCommand.swift
rename to Sources/swcomp/Containers/TarCommand.swift
diff --git a/Sources/swcomp/ZipCommand.swift b/Sources/swcomp/Containers/ZipCommand.swift
similarity index 100%
rename from Sources/swcomp/ZipCommand.swift
rename to Sources/swcomp/Containers/ZipCommand.swift