diff --git a/arch/ibm/decoder.cc b/arch/ibm/decoder.cc
index cb24f8976..bd71cc410 100644
--- a/arch/ibm/decoder.cc
+++ b/arch/ibm/decoder.cc
@@ -7,7 +7,7 @@
 #include "lib/decoders/fluxpattern.h"
 #include "lib/sector.h"
 #include "arch/ibm/ibm.pb.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/layout.h"
 #include <string.h>
 
diff --git a/arch/ibm/encoder.cc b/arch/ibm/encoder.cc
index 002da53e6..4215b32af 100644
--- a/arch/ibm/encoder.cc
+++ b/arch/ibm/encoder.cc
@@ -1,5 +1,5 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
+#include "lib/config/config.h"
 #include "lib/decoders/decoders.h"
 #include "lib/encoders/encoders.h"
 #include "ibm.h"
@@ -9,7 +9,7 @@
 #include "arch/ibm/ibm.pb.h"
 #include "lib/encoders/encoders.pb.h"
 #include "fmt/format.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/layout.h"
 #include <ctype.h>
 
diff --git a/arch/tartu/decoder.cc b/arch/tartu/decoder.cc
index 8da1507e4..a3403c277 100644
--- a/arch/tartu/decoder.cc
+++ b/arch/tartu/decoder.cc
@@ -1,5 +1,5 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
+#include "lib/config/config.h"
 #include "lib/decoders/decoders.h"
 #include "arch/tartu/tartu.h"
 #include "lib/core/crc.h"
diff --git a/arch/tartu/encoder.cc b/arch/tartu/encoder.cc
index 6f70168d6..dd49fbf9a 100644
--- a/arch/tartu/encoder.cc
+++ b/arch/tartu/encoder.cc
@@ -1,5 +1,5 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
+#include "lib/config/config.h"
 #include "lib/decoders/decoders.h"
 #include "lib/encoders/encoders.h"
 #include "arch/tartu/tartu.h"
diff --git a/build.py b/build.py
index 5fc03aea8..f492b2cfe 100644
--- a/build.py
+++ b/build.py
@@ -25,7 +25,6 @@
 cxxlibrary(
     name="lib",
     srcs=[
-        "./lib/config.cc",
         "./lib/decoders/decoders.cc",
         "./lib/decoders/fluxdecoder.cc",
         "./lib/decoders/fluxmapreader.cc",
@@ -33,7 +32,6 @@
         "./lib/decoders/fmmfm.cc",
         "./lib/encoders/encoders.cc",
         "./lib/fl2.cc",
-        "./lib/flags.cc",
         "./lib/fluxmap.cc",
         "./lib/fluxsink/a2rfluxsink.cc",
         "./lib/fluxsink/aufluxsink.cc",
@@ -83,7 +81,6 @@
         "./lib/layout.cc",
         "./lib/ldbs.cc",
         "./lib/logrenderer.cc",
-        "./lib/proto.cc",
         "./lib/readerwriter.cc",
         "./lib/sector.cc",
         "./lib/usb/applesauceusb.cc",
@@ -156,7 +153,6 @@
         "arch/c64/c64.h": "./arch/c64/c64.h",
         "arch/tartu/tartu.h": "./arch/tartu/tartu.h",
         "lib/a2r.h": "./lib/a2r.h",
-        "lib/config.h": "./lib/config.h",
         "lib/decoders/decoders.h": "./lib/decoders/decoders.h",
         "lib/decoders/fluxdecoder.h": "./lib/decoders/fluxdecoder.h",
         "lib/decoders/fluxmapreader.h": "./lib/decoders/fluxmapreader.h",
@@ -165,7 +161,6 @@
         "lib/encoders/encoders.h": "./lib/encoders/encoders.h",
         "lib/scp.h": "./lib/scp.h",
         "lib/fl2.h": "./lib/fl2.h",
-        "lib/flags.h": "./lib/flags.h",
         "lib/flux.h": "./lib/flux.h",
         "lib/fluxmap.h": "./lib/fluxmap.h",
         "lib/fluxsink/fluxsink.h": "./lib/fluxsink/fluxsink.h",
@@ -179,7 +174,6 @@
         "lib/imagewriter/imagewriter.h": "./lib/imagewriter/imagewriter.h",
         "lib/layout.h": "./lib/layout.h",
         "lib/ldbs.h": "./lib/ldbs.h",
-        "lib/proto.h": "./lib/proto.h",
         "lib/readerwriter.h": "./lib/readerwriter.h",
         "lib/sector.h": "./lib/sector.h",
         "lib/usb/applesauce.h": "./lib/usb/applesauce.h",
@@ -196,8 +190,8 @@
         "dep/hfsutils",
         "dep/libusbp",
         "dep/stb",
-        "lib+config_proto_lib",
         "lib/core",
+        "lib/config",
         "lib/fluxsource+proto_lib",
     ],
 )
diff --git a/lib/build.py b/lib/build.py
index a9bd9b462..925fa1c02 100644
--- a/lib/build.py
+++ b/lib/build.py
@@ -25,38 +25,3 @@
     srcs=[".+drive_proto"],
     deps=[".+common_proto_lib", "+fl2_proto_lib", ".+layout_proto_lib"],
 )
-
-proto(
-    name="config_proto",
-    srcs=["./config.proto"],
-    deps=[
-        ".+common_proto",
-        ".+layout_proto",
-        ".+drive_proto",
-        "+fl2_proto",
-        "lib/fluxsource+proto",
-        "lib/fluxsink+proto",
-        "lib/vfs+proto",
-        "lib/usb+proto",
-        "lib/encoders+proto",
-        "lib/decoders+proto",
-        "lib/imagereader+proto",
-        "lib/imagewriter+proto",
-    ],
-)
-
-protocc(
-    name="config_proto_lib",
-    srcs=[".+common_proto", ".+config_proto", "arch+proto", "+fl2_proto"],
-    deps=[
-        "lib/fluxsource+proto_lib",
-        "lib/fluxsink+proto_lib",
-        "lib/vfs+proto_lib",
-        "lib/usb+proto_lib",
-        "lib/encoders+proto_lib",
-        "lib/decoders+proto_lib",
-        "lib/imagereader+proto_lib",
-        "lib/imagewriter+proto_lib",
-        "lib+drive_proto_lib",
-    ],
-)
diff --git a/lib/config/build.py b/lib/config/build.py
new file mode 100644
index 000000000..aabd54a43
--- /dev/null
+++ b/lib/config/build.py
@@ -0,0 +1,56 @@
+from build.c import cxxlibrary
+from build.protobuf import proto, protocc
+
+proto(
+    name="proto",
+    srcs=["./config.proto"],
+    deps=[
+        "lib+common_proto",
+        "lib+layout_proto",
+        "lib+drive_proto",
+        "+fl2_proto",
+        "lib/fluxsource+proto",
+        "lib/fluxsink+proto",
+        "lib/vfs+proto",
+        "lib/usb+proto",
+        "lib/encoders+proto",
+        "lib/decoders+proto",
+        "lib/imagereader+proto",
+        "lib/imagewriter+proto",
+    ],
+)
+
+protocc(
+    name="proto_lib",
+    srcs=[".+proto", "arch+proto", "+fl2_proto"],
+    deps=[
+        "lib/fluxsource+proto_lib",
+        "lib/fluxsink+proto_lib",
+        "lib/vfs+proto_lib",
+        "lib/usb+proto_lib",
+        "lib/encoders+proto_lib",
+        "lib/decoders+proto_lib",
+        "lib/imagereader+proto_lib",
+        "lib/imagewriter+proto_lib",
+        "lib+drive_proto_lib",
+    ],
+)
+
+cxxlibrary(
+    name="config",
+    srcs=[
+        "./config.cc",
+        "./proto.cc",
+        "./flags.cc",
+    ],
+    hdrs={
+        "lib/config/config.h": "./config.h",
+        "lib/config/proto.h": "./proto.h",
+        "lib/config/flags.h": "./flags.h",
+    },
+    deps=[
+        "lib/core",
+        ".+proto_lib",
+        "+fmt_lib",
+    ],
+)
diff --git a/lib/config.cc b/lib/config/config.cc
similarity index 99%
rename from lib/config.cc
rename to lib/config/config.cc
index da8bd8f84..8a261b754 100644
--- a/lib/config.cc
+++ b/lib/config/config.cc
@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/proto.h"
+#include "lib/config/config.h"
+#include "lib/config/proto.h"
 #include "lib/core/logger.h"
 #include "lib/core/utils.h"
 #include <fstream>
diff --git a/lib/config.h b/lib/config/config.h
similarity index 99%
rename from lib/config.h
rename to lib/config/config.h
index ce0a06b36..09c975bb5 100644
--- a/lib/config.h
+++ b/lib/config/config.h
@@ -3,7 +3,7 @@
 #ifdef __cplusplus
 
 #include <google/protobuf/message.h>
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include "lib/common.pb.h"
 
 class ConfigProto;
diff --git a/lib/config.proto b/lib/config/config.proto
similarity index 100%
rename from lib/config.proto
rename to lib/config/config.proto
diff --git a/lib/flags.cc b/lib/config/flags.cc
similarity index 98%
rename from lib/flags.cc
rename to lib/config/flags.cc
index ec6dfe17e..9528b90d7 100644
--- a/lib/flags.cc
+++ b/lib/config/flags.cc
@@ -1,11 +1,9 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
-#include "lib/proto.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
+#include "lib/config/proto.h"
 #include "lib/core/utils.h"
 #include "lib/core/logger.h"
-#include "lib/fluxsource/fluxsource.h"
-#include "lib/imagereader/imagereader.h"
 #include <google/protobuf/text_format.h>
 #include <regex>
 #include <fstream>
diff --git a/lib/flags.h b/lib/config/flags.h
similarity index 100%
rename from lib/flags.h
rename to lib/config/flags.h
diff --git a/lib/proto.cc b/lib/config/proto.cc
similarity index 99%
rename from lib/proto.cc
rename to lib/config/proto.cc
index 67ccc9b2f..1d258bda5 100644
--- a/lib/proto.cc
+++ b/lib/config/proto.cc
@@ -1,5 +1,5 @@
 #include "lib/core/globals.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/common.pb.h"
 #include <regex>
 
diff --git a/lib/proto.h b/lib/config/proto.h
similarity index 97%
rename from lib/proto.h
rename to lib/config/proto.h
index 1e2715758..5809e03bb 100644
--- a/lib/proto.h
+++ b/lib/config/proto.h
@@ -3,7 +3,7 @@
 
 #include <google/protobuf/message.h>
 #include "lib/common.pb.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 
 class ProtoPathNotFoundException : public ErrorException
 {
diff --git a/lib/decoders/decoders.cc b/lib/decoders/decoders.cc
index c83e7ff37..f94061e61 100644
--- a/lib/decoders/decoders.cc
+++ b/lib/decoders/decoders.cc
@@ -1,7 +1,7 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/fluxmap.h"
-#include "lib/config.h"
+#include "lib/config/config.h"
 #include "lib/decoders/decoders.h"
 #include "lib/encoders/encoders.h"
 #include "arch/agat/agat.h"
diff --git a/lib/decoders/fluxmapreader.cc b/lib/decoders/fluxmapreader.cc
index 1ec1be798..eb3dcc4b9 100644
--- a/lib/decoders/fluxmapreader.cc
+++ b/lib/decoders/fluxmapreader.cc
@@ -1,9 +1,9 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
+#include "lib/config/config.h"
 #include "lib/fluxmap.h"
 #include "lib/decoders/fluxmapreader.h"
 #include "lib/decoders/fluxpattern.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "protocol.h"
 #include <numeric>
 #include <math.h>
diff --git a/lib/decoders/fluxmapreader.h b/lib/decoders/fluxmapreader.h
index 1f14bd68a..13e5ef433 100644
--- a/lib/decoders/fluxmapreader.h
+++ b/lib/decoders/fluxmapreader.h
@@ -2,7 +2,7 @@
 #define FLUXMAPREADER_H
 
 #include "lib/fluxmap.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "protocol.h"
 
 class DecoderProto;
diff --git a/lib/decoders/fluxpattern.cc b/lib/decoders/fluxpattern.cc
index 4836b54c0..7facf0b02 100644
--- a/lib/decoders/fluxpattern.cc
+++ b/lib/decoders/fluxpattern.cc
@@ -1,8 +1,8 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
+#include "lib/config/config.h"
 #include "lib/fluxmap.h"
 #include "lib/decoders/fluxpattern.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "protocol.h"
 #include <numeric>
 #include <math.h>
diff --git a/lib/decoders/fluxpattern.h b/lib/decoders/fluxpattern.h
index 262dfd997..c98c54249 100644
--- a/lib/decoders/fluxpattern.h
+++ b/lib/decoders/fluxpattern.h
@@ -2,7 +2,7 @@
 
 #include "lib/core/utils.h"
 #include "lib/fluxmap.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "protocol.h"
 
 class FluxMatcher;
diff --git a/lib/encoders/encoders.cc b/lib/encoders/encoders.cc
index c7ec5c3c0..ca5e73cb7 100644
--- a/lib/encoders/encoders.cc
+++ b/lib/encoders/encoders.cc
@@ -1,5 +1,5 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
+#include "lib/config/config.h"
 #include "lib/fluxmap.h"
 #include "lib/decoders/decoders.h"
 #include "lib/encoders/encoders.h"
@@ -16,7 +16,7 @@
 #include "arch/tids990/tids990.h"
 #include "arch/victor9k/victor9k.h"
 #include "lib/encoders/encoders.pb.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/layout.h"
 #include "lib/image.h"
 #include "protocol.h"
diff --git a/lib/fl2.cc b/lib/fl2.cc
index a418e2450..f3c0ed14b 100644
--- a/lib/fl2.cc
+++ b/lib/fl2.cc
@@ -1,5 +1,5 @@
 #include "lib/core/globals.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/fluxmap.h"
 #include "lib/fl2.pb.h"
 #include <fstream>
diff --git a/lib/fluxsink/a2rfluxsink.cc b/lib/fluxsink/a2rfluxsink.cc
index c658a6940..6ce328be4 100644
--- a/lib/fluxsink/a2rfluxsink.cc
+++ b/lib/fluxsink/a2rfluxsink.cc
@@ -1,5 +1,5 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/fluxmap.h"
 #include "lib/core/bytes.h"
 #include "protocol.h"
@@ -7,7 +7,7 @@
 #include "lib/decoders/fluxmapreader.h"
 #include "lib/fluxsink/fluxsink.pb.h"
 #include "lib/core/logger.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/fluxmap.h"
 #include "lib/layout.h"
 #include "lib/a2r.h"
diff --git a/lib/fluxsink/aufluxsink.cc b/lib/fluxsink/aufluxsink.cc
index e5303b57b..688b5a9a6 100644
--- a/lib/fluxsink/aufluxsink.cc
+++ b/lib/fluxsink/aufluxsink.cc
@@ -1,12 +1,12 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/fluxmap.h"
 #include "lib/core/bytes.h"
 #include "protocol.h"
 #include "lib/fluxsink/fluxsink.h"
 #include "lib/decoders/fluxmapreader.h"
 #include "lib/fluxsink/fluxsink.pb.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include <fstream>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/lib/fluxsink/fl2fluxsink.cc b/lib/fluxsink/fl2fluxsink.cc
index d3f4ca3a6..06aba3f21 100644
--- a/lib/fluxsink/fl2fluxsink.cc
+++ b/lib/fluxsink/fl2fluxsink.cc
@@ -1,13 +1,13 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "lib/fluxmap.h"
 #include "lib/core/bytes.h"
 #include "protocol.h"
 #include "lib/fluxsink/fluxsink.h"
 #include "lib/decoders/fluxmapreader.h"
 #include "lib/fluxsink/fluxsink.pb.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/fl2.pb.h"
 #include "lib/fl2.h"
 #include <fstream>
diff --git a/lib/fluxsink/fluxsink.cc b/lib/fluxsink/fluxsink.cc
index 3d5bab810..c8d844ba2 100644
--- a/lib/fluxsink/fluxsink.cc
+++ b/lib/fluxsink/fluxsink.cc
@@ -1,9 +1,9 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
-#include "lib/config.h"
+#include "lib/config/flags.h"
+#include "lib/config/config.h"
 #include "lib/fluxsink/fluxsink.h"
-#include "lib/config.pb.h"
-#include "lib/proto.h"
+#include "lib/config/config.pb.h"
+#include "lib/config/proto.h"
 #include "lib/core/utils.h"
 #include <regex>
 
diff --git a/lib/fluxsink/fluxsink.h b/lib/fluxsink/fluxsink.h
index d083a905c..ab12d9dd3 100644
--- a/lib/fluxsink/fluxsink.h
+++ b/lib/fluxsink/fluxsink.h
@@ -1,7 +1,7 @@
 #ifndef FLUXSINK_H
 #define FLUXSINK_H
 
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include <ostream>
 
 class Fluxmap;
diff --git a/lib/fluxsink/hardwarefluxsink.cc b/lib/fluxsink/hardwarefluxsink.cc
index c05e71d45..65916398e 100644
--- a/lib/fluxsink/hardwarefluxsink.cc
+++ b/lib/fluxsink/hardwarefluxsink.cc
@@ -1,9 +1,9 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "lib/fluxmap.h"
 #include "lib/core/logger.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/usb/usb.h"
 #include "lib/fluxsink/fluxsink.h"
 #include "lib/fluxsink/fluxsink.pb.h"
diff --git a/lib/fluxsink/scpfluxsink.cc b/lib/fluxsink/scpfluxsink.cc
index 89aa4980d..42a5a87a7 100644
--- a/lib/fluxsink/scpfluxsink.cc
+++ b/lib/fluxsink/scpfluxsink.cc
@@ -1,13 +1,13 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "lib/fluxmap.h"
 #include "lib/core/bytes.h"
 #include "protocol.h"
 #include "lib/fluxsink/fluxsink.h"
 #include "lib/decoders/fluxmapreader.h"
 #include "lib/fluxsink/fluxsink.pb.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/fluxmap.h"
 #include "lib/layout.h"
 #include "lib/scp.h"
diff --git a/lib/fluxsink/vcdfluxsink.cc b/lib/fluxsink/vcdfluxsink.cc
index 8485d74f4..1ef830eb2 100644
--- a/lib/fluxsink/vcdfluxsink.cc
+++ b/lib/fluxsink/vcdfluxsink.cc
@@ -1,12 +1,12 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/fluxmap.h"
 #include "lib/core/bytes.h"
 #include "protocol.h"
 #include "lib/fluxsink/fluxsink.h"
 #include "lib/decoders/fluxmapreader.h"
 #include "lib/fluxsink/fluxsink.pb.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include <fstream>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/lib/fluxsource/a2rfluxsource.cc b/lib/fluxsource/a2rfluxsource.cc
index 9ae51da32..f0b1a62bf 100644
--- a/lib/fluxsource/a2rfluxsource.cc
+++ b/lib/fluxsource/a2rfluxsource.cc
@@ -2,7 +2,7 @@
 #include "lib/fluxmap.h"
 #include "lib/fluxsource/fluxsource.pb.h"
 #include "lib/fluxsource/fluxsource.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include <fstream>
 
 struct A2Rv2Flux
diff --git a/lib/fluxsource/cwffluxsource.cc b/lib/fluxsource/cwffluxsource.cc
index 5ca86bea3..017d3c8fb 100644
--- a/lib/fluxsource/cwffluxsource.cc
+++ b/lib/fluxsource/cwffluxsource.cc
@@ -3,7 +3,7 @@
 #include "lib/fluxsource/fluxsource.pb.h"
 #include "lib/fluxsource/fluxsource.h"
 #include "lib/fluxsource/catweasel.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include <fstream>
 
 struct CwfHeader
diff --git a/lib/fluxsource/dmkfluxsource.cc b/lib/fluxsource/dmkfluxsource.cc
index d87c0b5d2..2518d9d87 100644
--- a/lib/fluxsource/dmkfluxsource.cc
+++ b/lib/fluxsource/dmkfluxsource.cc
@@ -3,7 +3,7 @@
 #include "lib/fluxsource/fluxsource.pb.h"
 #include "lib/fluxsource/fluxsource.h"
 #include "lib/fluxsource/catweasel.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/core/logger.h"
 #include <fstream>
 #include <filesystem>
diff --git a/lib/fluxsource/fl2fluxsource.cc b/lib/fluxsource/fl2fluxsource.cc
index eef62ebad..6ba05b440 100644
--- a/lib/fluxsource/fl2fluxsource.cc
+++ b/lib/fluxsource/fl2fluxsource.cc
@@ -3,7 +3,7 @@
 #include "lib/fluxsource/fluxsource.pb.h"
 #include "lib/fl2.pb.h"
 #include "lib/fluxsource/fluxsource.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/fl2.h"
 #include "lib/fluxmap.h"
 #include <fstream>
diff --git a/lib/fluxsource/fluxsource.cc b/lib/fluxsource/fluxsource.cc
index c0506b7ee..4fe8d9fdf 100644
--- a/lib/fluxsource/fluxsource.cc
+++ b/lib/fluxsource/fluxsource.cc
@@ -1,10 +1,10 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "lib/fluxsource/fluxsource.h"
 #include "lib/fluxmap.h"
-#include "lib/config.pb.h"
-#include "lib/proto.h"
+#include "lib/config/config.pb.h"
+#include "lib/config/proto.h"
 #include "lib/core/utils.h"
 
 std::unique_ptr<FluxSource> FluxSource::create(Config& config)
diff --git a/lib/fluxsource/fluxsource.h b/lib/fluxsource/fluxsource.h
index 53d2a1eb2..20f8515fe 100644
--- a/lib/fluxsource/fluxsource.h
+++ b/lib/fluxsource/fluxsource.h
@@ -1,8 +1,8 @@
 #ifndef FLUXSOURCE_H
 #define FLUXSOURCE_H
 
-#include "lib/flags.h"
-#include "lib/config.pb.h"
+#include "lib/config/flags.h"
+#include "lib/config/config.pb.h"
 
 class A2rFluxSourceProto;
 class CwfFluxSourceProto;
diff --git a/lib/fluxsource/hardwarefluxsource.cc b/lib/fluxsource/hardwarefluxsource.cc
index 7c119ba3f..b998533a4 100644
--- a/lib/fluxsource/hardwarefluxsource.cc
+++ b/lib/fluxsource/hardwarefluxsource.cc
@@ -1,9 +1,9 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "lib/fluxmap.h"
 #include "lib/core/logger.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/usb/usb.h"
 #include "lib/fluxsource/fluxsource.h"
 #include "lib/fluxsource/fluxsource.pb.h"
diff --git a/lib/fluxsource/scpfluxsource.cc b/lib/fluxsource/scpfluxsource.cc
index b9c4d8f14..a835337c7 100644
--- a/lib/fluxsource/scpfluxsource.cc
+++ b/lib/fluxsource/scpfluxsource.cc
@@ -5,7 +5,7 @@
 #include "lib/core/utils.h"
 #include "lib/fluxsource/fluxsource.h"
 #include "lib/scp.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/core/logger.h"
 #include <fstream>
 
diff --git a/lib/globals.h b/lib/globals.h
index 96f8f0d68..b8c880928 100644
--- a/lib/globals.h
+++ b/lib/globals.h
@@ -67,6 +67,6 @@ struct overloaded : Ts...
 template <class... Ts>
 overloaded(Ts...) -> overloaded<Ts...>;
 
-#include "lib/config.h"
+#include "lib/config/config.h"
 
 #endif
diff --git a/lib/imagereader/d64imagereader.cc b/lib/imagereader/d64imagereader.cc
index 13e90f0fa..efe2f71ed 100644
--- a/lib/imagereader/d64imagereader.cc
+++ b/lib/imagereader/d64imagereader.cc
@@ -1,10 +1,10 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
 #include "lib/core/logger.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include <algorithm>
 #include <iostream>
 #include <fstream>
diff --git a/lib/imagereader/d88imagereader.cc b/lib/imagereader/d88imagereader.cc
index 4e2d911ac..ebce7a1d2 100644
--- a/lib/imagereader/d88imagereader.cc
+++ b/lib/imagereader/d88imagereader.cc
@@ -1,11 +1,11 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/core/logger.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include <algorithm>
 #include <iostream>
 #include <fstream>
diff --git a/lib/imagereader/dimimagereader.cc b/lib/imagereader/dimimagereader.cc
index d5b2b4c58..c2ba6a26e 100644
--- a/lib/imagereader/dimimagereader.cc
+++ b/lib/imagereader/dimimagereader.cc
@@ -1,12 +1,12 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
 #include "lib/core/logger.h"
-#include "lib/proto.h"
-#include "lib/config.pb.h"
+#include "lib/config/proto.h"
+#include "lib/config/config.pb.h"
 #include <algorithm>
 #include <iostream>
 #include <fstream>
diff --git a/lib/imagereader/diskcopyimagereader.cc b/lib/imagereader/diskcopyimagereader.cc
index c92575e00..fdd693355 100644
--- a/lib/imagereader/diskcopyimagereader.cc
+++ b/lib/imagereader/diskcopyimagereader.cc
@@ -1,10 +1,10 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
 #include "lib/core/logger.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include <algorithm>
 #include <iostream>
 #include <fstream>
diff --git a/lib/imagereader/fdiimagereader.cc b/lib/imagereader/fdiimagereader.cc
index e856f3247..b2529f803 100644
--- a/lib/imagereader/fdiimagereader.cc
+++ b/lib/imagereader/fdiimagereader.cc
@@ -1,12 +1,12 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/core/logger.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include <algorithm>
 #include <iostream>
 #include <fstream>
diff --git a/lib/imagereader/imagereader.cc b/lib/imagereader/imagereader.cc
index c97c0fd09..b0240769e 100644
--- a/lib/imagereader/imagereader.cc
+++ b/lib/imagereader/imagereader.cc
@@ -1,13 +1,13 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/core/utils.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/image.h"
 #include "lib/layout.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include "lib/core/logger.h"
 #include <algorithm>
 #include <ctype.h>
diff --git a/lib/imagereader/imagereader.h b/lib/imagereader/imagereader.h
index 0199972a7..42ba489b1 100644
--- a/lib/imagereader/imagereader.h
+++ b/lib/imagereader/imagereader.h
@@ -2,7 +2,7 @@
 #define IMAGEREADER_H
 
 #include "lib/image.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 
 class ImageSpec;
 class ImageReaderProto;
diff --git a/lib/imagereader/imdimagereader.cc b/lib/imagereader/imdimagereader.cc
index da2e096ba..58efd031e 100644
--- a/lib/imagereader/imdimagereader.cc
+++ b/lib/imagereader/imdimagereader.cc
@@ -1,12 +1,12 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/core/logger.h"
 #include "lib/layout.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include <algorithm>
 #include <iostream>
 #include <fstream>
diff --git a/lib/imagereader/imgimagereader.cc b/lib/imagereader/imgimagereader.cc
index ac8888362..3333e6b70 100644
--- a/lib/imagereader/imgimagereader.cc
+++ b/lib/imagereader/imgimagereader.cc
@@ -1,13 +1,13 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
 #include "lib/core/logger.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include "lib/layout.pb.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/layout.h"
 #include <algorithm>
 #include <iostream>
diff --git a/lib/imagereader/jv3imagereader.cc b/lib/imagereader/jv3imagereader.cc
index de317c003..20f55de03 100644
--- a/lib/imagereader/jv3imagereader.cc
+++ b/lib/imagereader/jv3imagereader.cc
@@ -1,10 +1,10 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
 #include "lib/core/logger.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include <algorithm>
 #include <iostream>
 #include <fstream>
diff --git a/lib/imagereader/nfdimagereader.cc b/lib/imagereader/nfdimagereader.cc
index a7dc8b0f7..70864a6ca 100644
--- a/lib/imagereader/nfdimagereader.cc
+++ b/lib/imagereader/nfdimagereader.cc
@@ -1,11 +1,11 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/core/logger.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include <algorithm>
 #include <iostream>
 #include <fstream>
diff --git a/lib/imagereader/nsiimagereader.cc b/lib/imagereader/nsiimagereader.cc
index ce22a3233..2b00f7c1e 100644
--- a/lib/imagereader/nsiimagereader.cc
+++ b/lib/imagereader/nsiimagereader.cc
@@ -1,7 +1,7 @@
 /* Image reader for Northstar floppy disk images */
 
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
diff --git a/lib/imagereader/td0imagereader.cc b/lib/imagereader/td0imagereader.cc
index 26288ab67..47bef5f7f 100644
--- a/lib/imagereader/td0imagereader.cc
+++ b/lib/imagereader/td0imagereader.cc
@@ -1,11 +1,11 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/image.h"
 #include "lib/core/crc.h"
 #include "lib/core/logger.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include <algorithm>
 #include <iostream>
 #include <fstream>
diff --git a/lib/imagewriter/d64imagewriter.cc b/lib/imagewriter/d64imagewriter.cc
index 44dda2ef2..691632fc8 100644
--- a/lib/imagewriter/d64imagewriter.cc
+++ b/lib/imagewriter/d64imagewriter.cc
@@ -1,11 +1,11 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagewriter/imagewriter.h"
 #include "lib/image.h"
 #include "lib/ldbs.h"
 #include "lib/core/logger.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include <algorithm>
 #include <iostream>
 #include <fstream>
diff --git a/lib/imagewriter/d88imagewriter.cc b/lib/imagewriter/d88imagewriter.cc
index 7623caa82..84d0bc3c2 100644
--- a/lib/imagewriter/d88imagewriter.cc
+++ b/lib/imagewriter/d88imagewriter.cc
@@ -1,9 +1,9 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagewriter/imagewriter.h"
 #include "lib/image.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include "lib/layout.h"
 #include "lib/core/logger.h"
 #include <algorithm>
diff --git a/lib/imagewriter/diskcopyimagewriter.cc b/lib/imagewriter/diskcopyimagewriter.cc
index be2a1dcb1..60845ba5c 100644
--- a/lib/imagewriter/diskcopyimagewriter.cc
+++ b/lib/imagewriter/diskcopyimagewriter.cc
@@ -1,11 +1,11 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagewriter/imagewriter.h"
 #include "lib/ldbs.h"
 #include "lib/image.h"
 #include "lib/core/logger.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include <algorithm>
 #include <iostream>
 #include <fstream>
diff --git a/lib/imagewriter/imagewriter.cc b/lib/imagewriter/imagewriter.cc
index 2782a21fc..8f8e4f5e1 100644
--- a/lib/imagewriter/imagewriter.cc
+++ b/lib/imagewriter/imagewriter.cc
@@ -1,12 +1,12 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagewriter/imagewriter.h"
 #include "lib/image.h"
 #include "lib/core/utils.h"
-#include "lib/config.pb.h"
-#include "lib/proto.h"
+#include "lib/config/config.pb.h"
+#include "lib/config/proto.h"
 #include "lib/layout.h"
 #include "lib/core/logger.h"
 #include <iostream>
diff --git a/lib/imagewriter/imdimagewriter.cc b/lib/imagewriter/imdimagewriter.cc
index 07360f9a8..9e397de68 100644
--- a/lib/imagewriter/imdimagewriter.cc
+++ b/lib/imagewriter/imdimagewriter.cc
@@ -1,9 +1,9 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagewriter/imagewriter.h"
 #include "lib/image.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include "lib/layout.h"
 #include "lib/core/logger.h"
 #include <algorithm>
diff --git a/lib/imagewriter/imgimagewriter.cc b/lib/imagewriter/imgimagewriter.cc
index 5b4d26b54..4b37eb879 100644
--- a/lib/imagewriter/imgimagewriter.cc
+++ b/lib/imagewriter/imgimagewriter.cc
@@ -1,11 +1,11 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagewriter/imagewriter.h"
 #include "lib/image.h"
-#include "lib/proto.h"
-#include "lib/config.pb.h"
+#include "lib/config/proto.h"
+#include "lib/config/config.pb.h"
 #include "lib/layout.h"
 #include "lib/layout.pb.h"
 #include "lib/core/logger.h"
diff --git a/lib/imagewriter/ldbsimagewriter.cc b/lib/imagewriter/ldbsimagewriter.cc
index c24f92381..129b8f84b 100644
--- a/lib/imagewriter/ldbsimagewriter.cc
+++ b/lib/imagewriter/ldbsimagewriter.cc
@@ -1,11 +1,11 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagewriter/imagewriter.h"
 #include "lib/ldbs.h"
 #include "lib/image.h"
 #include "lib/core/logger.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include <algorithm>
 #include <iostream>
 #include <fstream>
diff --git a/lib/imagewriter/nsiimagewriter.cc b/lib/imagewriter/nsiimagewriter.cc
index 39893cd35..285ff0084 100644
--- a/lib/imagewriter/nsiimagewriter.cc
+++ b/lib/imagewriter/nsiimagewriter.cc
@@ -1,5 +1,5 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagewriter/imagewriter.h"
 #include "lib/decoders/decoders.h"
diff --git a/lib/imagewriter/rawimagewriter.cc b/lib/imagewriter/rawimagewriter.cc
index c1684f5ad..11b56e240 100644
--- a/lib/imagewriter/rawimagewriter.cc
+++ b/lib/imagewriter/rawimagewriter.cc
@@ -1,5 +1,5 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/sector.h"
 #include "lib/imagewriter/imagewriter.h"
 #include "lib/decoders/decoders.h"
diff --git a/lib/layout.cc b/lib/layout.cc
index b5dd5babf..b099632d0 100644
--- a/lib/layout.cc
+++ b/lib/layout.cc
@@ -1,7 +1,7 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
+#include "lib/config/config.h"
 #include "lib/layout.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/core/logger.h"
 #include "lib/fl2.h"
 
diff --git a/lib/readerwriter.cc b/lib/readerwriter.cc
index 36585756f..02fb462b9 100644
--- a/lib/readerwriter.cc
+++ b/lib/readerwriter.cc
@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "lib/fluxmap.h"
 #include "lib/readerwriter.h"
 #include "protocol.h"
@@ -16,8 +16,8 @@
 #include "lib/core/logger.h"
 #include "lib/layout.h"
 #include "lib/core/utils.h"
-#include "lib/config.pb.h"
-#include "lib/proto.h"
+#include "lib/config/config.pb.h"
+#include "lib/config/proto.h"
 #include <optional>
 
 enum ReadResult
diff --git a/lib/usb/usb.cc b/lib/usb/usb.cc
index 078aaa7bd..704c92c17 100644
--- a/lib/usb/usb.cc
+++ b/lib/usb/usb.cc
@@ -1,13 +1,13 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "usb.h"
 #include "libusbp_config.h"
 #include "libusbp.hpp"
 #include "protocol.h"
 #include "lib/fluxmap.h"
 #include "lib/core/bytes.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "usbfinder.h"
 #include "lib/core/logger.h"
 #include "applesauce.h"
diff --git a/lib/usb/usb.h b/lib/usb/usb.h
index bed57fcc3..52b218afb 100644
--- a/lib/usb/usb.h
+++ b/lib/usb/usb.h
@@ -2,7 +2,7 @@
 #define USB_H
 
 #include "lib/core/bytes.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 
 class Fluxmap;
 class GreaseweazleProto;
diff --git a/lib/usb/usbfinder.cc b/lib/usb/usbfinder.cc
index 067cab78b..d9c357e83 100644
--- a/lib/usb/usbfinder.cc
+++ b/lib/usb/usbfinder.cc
@@ -1,5 +1,5 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "usb.h"
 #include "lib/core/bytes.h"
 #include "usbfinder.h"
diff --git a/lib/vfs/acorndfs.cc b/lib/vfs/acorndfs.cc
index ab48735f0..73df8d7dc 100644
--- a/lib/vfs/acorndfs.cc
+++ b/lib/vfs/acorndfs.cc
@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
 #include "lib/vfs/vfs.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include "lib/core/utils.h"
 
 class AcornDfsFilesystem;
diff --git a/lib/vfs/amigaffs.cc b/lib/vfs/amigaffs.cc
index beec3674f..28d2464ae 100644
--- a/lib/vfs/amigaffs.cc
+++ b/lib/vfs/amigaffs.cc
@@ -1,8 +1,8 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
+#include "lib/config/config.h"
 #include "lib/vfs/vfs.h"
-#include "lib/config.pb.h"
-#include "lib/proto.h"
+#include "lib/config/config.pb.h"
+#include "lib/config/proto.h"
 #include "lib/layout.h"
 #include "lib/core/logger.h"
 
diff --git a/lib/vfs/appledos.cc b/lib/vfs/appledos.cc
index 536a5bda9..4397f5c72 100644
--- a/lib/vfs/appledos.cc
+++ b/lib/vfs/appledos.cc
@@ -1,7 +1,7 @@
 #include "lib/core/globals.h"
 #include "lib/vfs/vfs.h"
 #include "lib/core/utils.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 
 /* This is described here:
  * http://fileformats.archiveteam.org/wiki/Apple_DOS_file_system
diff --git a/lib/vfs/brother120fs.cc b/lib/vfs/brother120fs.cc
index 59925c987..1347f9441 100644
--- a/lib/vfs/brother120fs.cc
+++ b/lib/vfs/brother120fs.cc
@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
 #include "lib/vfs/vfs.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 
 /* Number of sectors on a 120kB disk. */
 static constexpr int SECTOR_COUNT = 468;
diff --git a/lib/vfs/cbmfs.cc b/lib/vfs/cbmfs.cc
index d17701bbe..5ac64fb64 100644
--- a/lib/vfs/cbmfs.cc
+++ b/lib/vfs/cbmfs.cc
@@ -1,8 +1,8 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
+#include "lib/config/config.h"
 #include "lib/vfs/vfs.h"
-#include "lib/config.pb.h"
-#include "lib/proto.h"
+#include "lib/config/config.pb.h"
+#include "lib/config/proto.h"
 #include "lib/core/utils.h"
 
 enum
diff --git a/lib/vfs/cpmfs.cc b/lib/vfs/cpmfs.cc
index fb7c67cd9..17c99e2d0 100644
--- a/lib/vfs/cpmfs.cc
+++ b/lib/vfs/cpmfs.cc
@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
 #include "lib/vfs/vfs.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include "fmt/format.h"
 #include <regex>
 
diff --git a/lib/vfs/fatfs.cc b/lib/vfs/fatfs.cc
index c9826af5d..57a591595 100644
--- a/lib/vfs/fatfs.cc
+++ b/lib/vfs/fatfs.cc
@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
 #include "lib/vfs/vfs.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include "lib/core/utils.h"
 
 extern "C"
diff --git a/lib/vfs/fluxsectorinterface.cc b/lib/vfs/fluxsectorinterface.cc
index c4ad096c8..1eff8bf9a 100644
--- a/lib/vfs/fluxsectorinterface.cc
+++ b/lib/vfs/fluxsectorinterface.cc
@@ -5,7 +5,7 @@
 #include "lib/decoders/decoders.h"
 #include "lib/fluxsource/fluxsource.h"
 #include "lib/layout.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 
 class FluxSectorInterface : public SectorInterface
 {
diff --git a/lib/vfs/lif.cc b/lib/vfs/lif.cc
index 2d89d22d2..cb71ac2d8 100644
--- a/lib/vfs/lif.cc
+++ b/lib/vfs/lif.cc
@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
 #include "lib/vfs/vfs.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include "lib/core/utils.h"
 #include <iomanip>
 
diff --git a/lib/vfs/machfs.cc b/lib/vfs/machfs.cc
index 9dc11e574..568c2f93a 100644
--- a/lib/vfs/machfs.cc
+++ b/lib/vfs/machfs.cc
@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
 #include "lib/vfs/vfs.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include "lib/vfs/applesingle.h"
 #include "lib/core/utils.h"
 
diff --git a/lib/vfs/microdos.cc b/lib/vfs/microdos.cc
index d95bddc98..2f3631304 100644
--- a/lib/vfs/microdos.cc
+++ b/lib/vfs/microdos.cc
@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
 #include "lib/vfs/vfs.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include "lib/core/utils.h"
 #include "fmt/format.h"
 
diff --git a/lib/vfs/philefs.cc b/lib/vfs/philefs.cc
index 78e22fda1..f320ce66f 100644
--- a/lib/vfs/philefs.cc
+++ b/lib/vfs/philefs.cc
@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
 #include "lib/vfs/vfs.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include "lib/core/utils.h"
 
 /* Root block:
diff --git a/lib/vfs/prodos.cc b/lib/vfs/prodos.cc
index 70b0b9d7f..9dc4c322a 100644
--- a/lib/vfs/prodos.cc
+++ b/lib/vfs/prodos.cc
@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
 #include "lib/vfs/vfs.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 
 /* This is described here:
  * http://fileformats.archiveteam.org/wiki/ProDOS_file_system
diff --git a/lib/vfs/roland.cc b/lib/vfs/roland.cc
index 97222155a..a0ab03a5f 100644
--- a/lib/vfs/roland.cc
+++ b/lib/vfs/roland.cc
@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
 #include "lib/vfs/vfs.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include "lib/core/utils.h"
 #include <regex>
 
diff --git a/lib/vfs/smaky6fs.cc b/lib/vfs/smaky6fs.cc
index fca3d61ff..1036b6751 100644
--- a/lib/vfs/smaky6fs.cc
+++ b/lib/vfs/smaky6fs.cc
@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
 #include "lib/vfs/vfs.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include "lib/core/utils.h"
 
 /* A directory entry looks like:
diff --git a/lib/vfs/vfs.cc b/lib/vfs/vfs.cc
index 5af6d9e30..0d0b82980 100644
--- a/lib/vfs/vfs.cc
+++ b/lib/vfs/vfs.cc
@@ -1,7 +1,7 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
+#include "lib/config/config.h"
 #include "vfs.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/layout.pb.h"
 #include "lib/layout.h"
 #include "lib/image.h"
@@ -13,7 +13,7 @@
 #include "lib/fluxsink/fluxsink.h"
 #include "lib/decoders/decoders.h"
 #include "lib/encoders/encoders.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include "lib/core/utils.h"
 
 Path::Path(const std::vector<std::string> other):
diff --git a/lib/vfs/zdos.cc b/lib/vfs/zdos.cc
index 3a7aba73d..0541e006f 100644
--- a/lib/vfs/zdos.cc
+++ b/lib/vfs/zdos.cc
@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
 #include "lib/vfs/vfs.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include "lib/layout.h"
 #include <iomanip>
 
diff --git a/scripts/build.py b/scripts/build.py
index ce72164fc..7154ddc75 100644
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -12,7 +12,7 @@ def protoencode_single(self, name, srcs: Targets, proto, symbol):
             srcs=["scripts/protoencode.cc"],
             cflags=["-DPROTO=" + proto],
             deps=[
-                "lib+config_proto_lib",
+                "lib/config+proto_lib",
                 "lib/fluxsource+proto_lib",
                 "lib/fluxsink+proto_lib",
                 "tests+test_proto_lib",
@@ -62,7 +62,7 @@ def protoencode(self, name, proto, srcs: TargetsMap, symbol):
     srcs=["./mkdoc.cc"],
     deps=[
         "src/formats",
-        "lib+config_proto_lib",
+        "lib/config+proto_lib",
         "lib/fluxsource+proto_lib",
         "lib/fluxsink+proto_lib",
         "+lib",
@@ -76,7 +76,7 @@ def protoencode(self, name, proto, srcs: TargetsMap, symbol):
     srcs=["./mkdocindex.cc"],
     deps=[
         "src/formats",
-        "lib+config_proto_lib",
+        "lib/config+proto_lib",
         "lib/fluxsource+proto_lib",
         "lib/fluxsink+proto_lib",
         "+lib",
diff --git a/scripts/mkdoc.cc b/scripts/mkdoc.cc
index a26ecf9a1..37823e4c5 100644
--- a/scripts/mkdoc.cc
+++ b/scripts/mkdoc.cc
@@ -1,6 +1,6 @@
 #include "lib/globals.h"
-#include "lib/proto.h"
-#include "lib/flags.h"
+#include "lib/config/proto.h"
+#include "lib/config/flags.h"
 #include "fmt/format.h"
 
 extern const std::map<std::string, const ConfigProto*> formats;
diff --git a/scripts/mkdocindex.cc b/scripts/mkdocindex.cc
index bdf767a07..4f8d94992 100644
--- a/scripts/mkdocindex.cc
+++ b/scripts/mkdocindex.cc
@@ -1,6 +1,6 @@
 #include "lib/globals.h"
-#include "lib/proto.h"
-#include "lib/flags.h"
+#include "lib/config/proto.h"
+#include "lib/config/flags.h"
 #include "fmt/format.h"
 
 extern const std::map<std::string, const ConfigProto*> formats;
diff --git a/scripts/protoencode.cc b/scripts/protoencode.cc
index 12e4ebe91..556f425e0 100644
--- a/scripts/protoencode.cc
+++ b/scripts/protoencode.cc
@@ -4,7 +4,7 @@
 #include <fstream>
 #include "fmt/format.h"
 #include "tests/testproto.pb.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include <sstream>
 #include <locale>
 
@@ -124,7 +124,7 @@ int main(int argc, const char* argv[])
     auto name = argv[3];
 
     output << "#include \"lib/globals.h\"\n"
-           << "#include \"lib/proto.h\"\n"
+           << "#include \"lib/config/proto.h\"\n"
            << "#include <string_view>\n"
            << "static const uint8_t " << name << "_rawData[] = {";
 
diff --git a/src/build.py b/src/build.py
index 955cd66ed..df10f8660 100644
--- a/src/build.py
+++ b/src/build.py
@@ -44,7 +44,7 @@
         "+lib",
         "lib/core",
         "lib/vfs",
-        "lib+config_proto_lib",
+        "lib/config",
         "lib/fluxsource+proto_lib",
         "src/formats",
     ],
diff --git a/src/fe-analysedriveresponse.cc b/src/fe-analysedriveresponse.cc
index 2293dbe18..829a86606 100644
--- a/src/fe-analysedriveresponse.cc
+++ b/src/fe-analysedriveresponse.cc
@@ -1,13 +1,13 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "lib/usb/usb.h"
 #include "lib/core/bitmap.h"
 #include "lib/fluxmap.h"
 #include "lib/decoders/fluxmapreader.h"
 #include "lib/readerwriter.h"
 #include "protocol.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/fluxsink/fluxsink.h"
 #include "agg2d.h"
 #include "stb_image_write.h"
diff --git a/src/fe-analyselayout.cc b/src/fe-analyselayout.cc
index fc0f9a174..d4d64c19e 100644
--- a/src/fe-analyselayout.cc
+++ b/src/fe-analyselayout.cc
@@ -1,7 +1,7 @@
 #define _USE_MATH_DEFINES
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "lib/core/bitmap.h"
 #include "lib/fluxmap.h"
 #include "lib/sector.h"
diff --git a/src/fe-format.cc b/src/fe-format.cc
index ad714ea24..172ef99f7 100644
--- a/src/fe-format.cc
+++ b/src/fe-format.cc
@@ -1,8 +1,8 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/fluxmap.h"
 #include "lib/sector.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/readerwriter.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/imagewriter/imagewriter.h"
diff --git a/src/fe-getdiskinfo.cc b/src/fe-getdiskinfo.cc
index ef7be7ffc..bfdc82e44 100644
--- a/src/fe-getdiskinfo.cc
+++ b/src/fe-getdiskinfo.cc
@@ -1,8 +1,8 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/fluxmap.h"
 #include "lib/sector.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/readerwriter.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/imagewriter/imagewriter.h"
diff --git a/src/fe-getfile.cc b/src/fe-getfile.cc
index b9bd23420..567c11f9a 100644
--- a/src/fe-getfile.cc
+++ b/src/fe-getfile.cc
@@ -1,8 +1,8 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/fluxmap.h"
 #include "lib/sector.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/readerwriter.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/imagewriter/imagewriter.h"
diff --git a/src/fe-getfileinfo.cc b/src/fe-getfileinfo.cc
index c9567fc7a..3416acf83 100644
--- a/src/fe-getfileinfo.cc
+++ b/src/fe-getfileinfo.cc
@@ -1,8 +1,8 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/fluxmap.h"
 #include "lib/sector.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/readerwriter.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/imagewriter/imagewriter.h"
diff --git a/src/fe-inspect.cc b/src/fe-inspect.cc
index c6621eb4d..af9ba5a46 100644
--- a/src/fe-inspect.cc
+++ b/src/fe-inspect.cc
@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "lib/readerwriter.h"
 #include "lib/fluxmap.h"
 #include "lib/decoders/fluxmapreader.h"
@@ -10,7 +10,7 @@
 #include "protocol.h"
 #include "lib/decoders/rawbits.h"
 #include "lib/sector.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 
 static FlagGroup flags;
 
diff --git a/src/fe-ls.cc b/src/fe-ls.cc
index 52b5373b7..2c2899067 100644
--- a/src/fe-ls.cc
+++ b/src/fe-ls.cc
@@ -1,8 +1,8 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/fluxmap.h"
 #include "lib/sector.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/readerwriter.h"
 #include "lib/decoders/decoders.h"
 #include "lib/fluxsource/fluxsource.h"
diff --git a/src/fe-merge.cc b/src/fe-merge.cc
index 0c915dcb8..4cb9174a8 100644
--- a/src/fe-merge.cc
+++ b/src/fe-merge.cc
@@ -1,8 +1,8 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/fluxmap.h"
 #include "lib/sector.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/flux.h"
 #include "lib/fl2.h"
 #include "lib/fl2.pb.h"
diff --git a/src/fe-mkdir.cc b/src/fe-mkdir.cc
index 27dbdbd1c..fe824ba26 100644
--- a/src/fe-mkdir.cc
+++ b/src/fe-mkdir.cc
@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
-#include "lib/proto.h"
+#include "lib/config/flags.h"
+#include "lib/config/proto.h"
 #include "fluxengine.h"
 #include "lib/vfs/vfs.h"
 #include "lib/core/utils.h"
diff --git a/src/fe-mv.cc b/src/fe-mv.cc
index 5a8d45cc5..2907c3a2b 100644
--- a/src/fe-mv.cc
+++ b/src/fe-mv.cc
@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
-#include "lib/proto.h"
+#include "lib/config/flags.h"
+#include "lib/config/proto.h"
 #include "fluxengine.h"
 #include "lib/vfs/vfs.h"
 #include "lib/core/utils.h"
diff --git a/src/fe-putfile.cc b/src/fe-putfile.cc
index 3846448c6..d07b4c2ea 100644
--- a/src/fe-putfile.cc
+++ b/src/fe-putfile.cc
@@ -1,8 +1,8 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/fluxmap.h"
 #include "lib/sector.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/readerwriter.h"
 #include "lib/imagereader/imagereader.h"
 #include "lib/imagewriter/imagewriter.h"
diff --git a/src/fe-rawread.cc b/src/fe-rawread.cc
index 72ab0d652..0be078a26 100644
--- a/src/fe-rawread.cc
+++ b/src/fe-rawread.cc
@@ -1,11 +1,11 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "lib/readerwriter.h"
 #include "lib/fluxmap.h"
 #include "lib/decoders/decoders.h"
 #include "lib/sector.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/fluxsink/fluxsink.h"
 #include "lib/fluxsource/fluxsource.h"
 #include "lib/imagewriter/imagewriter.h"
diff --git a/src/fe-rawwrite.cc b/src/fe-rawwrite.cc
index e374a8ba0..825be0e27 100644
--- a/src/fe-rawwrite.cc
+++ b/src/fe-rawwrite.cc
@@ -1,10 +1,10 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "lib/readerwriter.h"
 #include "lib/fluxmap.h"
 #include "lib/sector.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/fluxsource/fluxsource.h"
 #include "lib/fluxsink/fluxsink.h"
 #include "fluxengine.h"
diff --git a/src/fe-read.cc b/src/fe-read.cc
index 7d51a7400..1d4e8b55c 100644
--- a/src/fe-read.cc
+++ b/src/fe-read.cc
@@ -1,11 +1,11 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "lib/readerwriter.h"
 #include "lib/fluxmap.h"
 #include "lib/decoders/decoders.h"
 #include "lib/sector.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/fluxsource/fluxsource.h"
 #include "lib/fluxsink/fluxsink.h"
 #include "lib/imagewriter/imagewriter.h"
diff --git a/src/fe-rm.cc b/src/fe-rm.cc
index dec3229fe..3bcff7cf7 100644
--- a/src/fe-rm.cc
+++ b/src/fe-rm.cc
@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
-#include "lib/proto.h"
+#include "lib/config/flags.h"
+#include "lib/config/proto.h"
 #include "fluxengine.h"
 #include "lib/vfs/vfs.h"
 #include "lib/core/utils.h"
diff --git a/src/fe-rpm.cc b/src/fe-rpm.cc
index 2fd4c45f7..f54c294fa 100644
--- a/src/fe-rpm.cc
+++ b/src/fe-rpm.cc
@@ -1,10 +1,10 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "lib/usb/usb.h"
 #include "lib/fluxsource/fluxsource.h"
 #include "protocol.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 
 static FlagGroup flags;
 
diff --git a/src/fe-seek.cc b/src/fe-seek.cc
index 5ffd161d3..8f933716f 100644
--- a/src/fe-seek.cc
+++ b/src/fe-seek.cc
@@ -1,9 +1,9 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "lib/usb/usb.h"
 #include "lib/fluxsource/fluxsource.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "protocol.h"
 
 static FlagGroup flags;
diff --git a/src/fe-testbandwidth.cc b/src/fe-testbandwidth.cc
index 7d0618a39..99b58e85a 100644
--- a/src/fe-testbandwidth.cc
+++ b/src/fe-testbandwidth.cc
@@ -1,5 +1,5 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/usb/usb.h"
 
 static FlagGroup flags;
diff --git a/src/fe-testdevices.cc b/src/fe-testdevices.cc
index 373d525b5..25b60920f 100644
--- a/src/fe-testdevices.cc
+++ b/src/fe-testdevices.cc
@@ -1,5 +1,5 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/usb/usbfinder.h"
 #include "fmt/format.h"
 
diff --git a/src/fe-testvoltages.cc b/src/fe-testvoltages.cc
index b50073839..7c91c3bd2 100644
--- a/src/fe-testvoltages.cc
+++ b/src/fe-testvoltages.cc
@@ -1,5 +1,5 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/usb/usb.h"
 #include "protocol.h"
 
diff --git a/src/fe-write.cc b/src/fe-write.cc
index b3dca6d6e..a34a6c873 100644
--- a/src/fe-write.cc
+++ b/src/fe-write.cc
@@ -1,12 +1,12 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "lib/readerwriter.h"
 #include "lib/fluxmap.h"
 #include "lib/decoders/decoders.h"
 #include "lib/encoders/encoders.h"
 #include "lib/sector.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/fluxsink/fluxsink.h"
 #include "lib/fluxsource/fluxsource.h"
 #include "arch/brother/brother.h"
diff --git a/src/fileutils.cc b/src/fileutils.cc
index 921910e58..1553459ee 100644
--- a/src/fileutils.cc
+++ b/src/fileutils.cc
@@ -1,9 +1,9 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "lib/fluxmap.h"
 #include "lib/sector.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/readerwriter.h"
 #include "lib/fluxsource/fluxsource.h"
 #include "lib/fluxsink/fluxsink.h"
diff --git a/src/fluxengine.cc b/src/fluxengine.cc
index 566889986..b75731eda 100644
--- a/src/fluxengine.cc
+++ b/src/fluxengine.cc
@@ -1,5 +1,5 @@
 #include "lib/core/globals.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "fmt/format.h"
 
 typedef int command_cb(int agrc, const char* argv[]);
diff --git a/src/formats/build.py b/src/formats/build.py
index f63d562c0..30b6e3503 100644
--- a/src/formats/build.py
+++ b/src/formats/build.py
@@ -62,7 +62,7 @@
 cxxlibrary(
     name="formats",
     srcs=[".+formats_cc", ".+table_cc"],
-    deps=["+lib", "lib+config_proto_lib"],
+    deps=["+lib", "lib/config+proto_lib"],
 )
 
 export(
diff --git a/src/gui/build.py b/src/gui/build.py
index 6a50898ee..8aa338908 100644
--- a/src/gui/build.py
+++ b/src/gui/build.py
@@ -66,7 +66,7 @@
         "+lib",
         "lib/core",
         "lib/vfs",
-        "lib+config_proto_lib",
+        "lib/config",
         "lib/fluxsource+proto_lib",
         "src/formats",
         "src/gui/drivetypes",
diff --git a/src/gui/context.cc b/src/gui/context.cc
index 55a42afcb..13fec69c4 100644
--- a/src/gui/context.cc
+++ b/src/gui/context.cc
@@ -5,7 +5,7 @@
 #include <lib/imagewriter/imagewriter.h>
 #include <lib/decoders/decoders.h>
 #include <lib/encoders/encoders.h>
-#include <lib/config.h>
+#include <lib/config/config.h>
 #include "context.h"
 #include "gui.h"
 
diff --git a/src/gui/explorerpanel.cc b/src/gui/explorerpanel.cc
index d9542cc6c..edf04d162 100644
--- a/src/gui/explorerpanel.cc
+++ b/src/gui/explorerpanel.cc
@@ -1,9 +1,9 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
+#include "lib/config/config.h"
 #include "lib/fluxmap.h"
 #include "lib/fluxsource/fluxsource.h"
 #include "lib/decoders/decoders.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "gui.h"
 #include "layout.h"
 #include "jobqueue.h"
diff --git a/src/gui/idlepanel.cc b/src/gui/idlepanel.cc
index 0a0c0638f..672753413 100644
--- a/src/gui/idlepanel.cc
+++ b/src/gui/idlepanel.cc
@@ -1,10 +1,10 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
+#include "lib/config/config.h"
 #include "gui.h"
 #include "lib/fluxmap.h"
 #include "lib/usb/usbfinder.h"
-#include "lib/proto.h"
-#include "lib/flags.h"
+#include "lib/config/proto.h"
+#include "lib/config/flags.h"
 #include "lib/core/utils.h"
 #include "lib/fluxsource/fluxsource.h"
 #include "lib/fluxsink/fluxsink.h"
diff --git a/src/gui/imagerpanel.cc b/src/gui/imagerpanel.cc
index 160afad20..7280e05d7 100644
--- a/src/gui/imagerpanel.cc
+++ b/src/gui/imagerpanel.cc
@@ -1,5 +1,5 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
+#include "lib/config/config.h"
 #include "lib/fluxmap.h"
 #include "lib/fluxsource/fluxsource.h"
 #include "lib/fluxsink/fluxsink.h"
@@ -7,7 +7,7 @@
 #include "lib/imagewriter/imagewriter.h"
 #include "lib/encoders/encoders.h"
 #include "lib/decoders/decoders.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/readerwriter.h"
 #include "gui.h"
 #include "lib/layout.h"
diff --git a/src/gui/mainwindow.cc b/src/gui/mainwindow.cc
index 5c55c5875..4aa2e85d9 100644
--- a/src/gui/mainwindow.cc
+++ b/src/gui/mainwindow.cc
@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/proto.h"
+#include "lib/config/config.h"
+#include "lib/config/proto.h"
 #include "gui.h"
 #include "lib/core/logger.h"
 #include "lib/readerwriter.h"
diff --git a/src/readibm.h b/src/readibm.h
index 9bdfb33fb..d7b71e7da 100644
--- a/src/readibm.h
+++ b/src/readibm.h
@@ -1,7 +1,7 @@
 #ifndef READIBM_H
 #define READIBM_H
 
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "dataspec.h"
 
 extern IntFlag sectorIdBase;
diff --git a/tests/build.py b/tests/build.py
index eee064e89..907ebcbe0 100644
--- a/tests/build.py
+++ b/tests/build.py
@@ -8,7 +8,7 @@
 proto(name="test_proto", srcs=["./testproto.proto"], deps=["lib+common_proto"])
 
 protocc(
-    name="test_proto_lib", srcs=[".+test_proto"], deps=["lib+config_proto_lib"]
+    name="test_proto_lib", srcs=[".+test_proto"], deps=["lib/config+proto_lib"]
 )
 
 tests = [
@@ -68,7 +68,7 @@
                     "dep/libusbp",
                     "dep/snowhouse",
                     "dep/stb",
-                    "lib+config_proto_lib",
+                    "lib/config",
                     "src/formats",
                 ],
             ),
@@ -97,7 +97,7 @@
                     "dep/snowhouse",
                     "dep/stb",
                     "arch+proto_lib",
-                    "lib+config_proto_lib",
+                    "lib/config",
                     "src/formats",
                 ]
                 + ([".+test_proto_lib"] if n == "options" else [])
diff --git a/tests/configs.cc b/tests/configs.cc
index 8d4c86918..90b8b141f 100644
--- a/tests/configs.cc
+++ b/tests/configs.cc
@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
-#include "lib/proto.h"
-#include "lib/flags.h"
+#include "lib/config/proto.h"
+#include "lib/config/flags.h"
 #include "lib/core/bytes.h"
 #include "fmt/format.h"
 
diff --git a/tests/cpmfs.cc b/tests/cpmfs.cc
index 9df8cdedc..071e89009 100644
--- a/tests/cpmfs.cc
+++ b/tests/cpmfs.cc
@@ -1,10 +1,10 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
+#include "lib/config/config.h"
 #include "lib/vfs/vfs.h"
 #include "lib/vfs/sectorinterface.h"
 #include "lib/vfs/vfs.pb.h"
 #include "lib/image.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/sector.h"
 #include "snowhouse/snowhouse.h"
 #include <google/protobuf/text_format.h>
diff --git a/tests/flags.cc b/tests/flags.cc
index 5dc5bcee8..161e7f8db 100644
--- a/tests/flags.cc
+++ b/tests/flags.cc
@@ -1,5 +1,5 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include <assert.h>
 
 static void testDefaultIntValue()
diff --git a/tests/layout.cc b/tests/layout.cc
index 34faa314f..86b4bb62d 100644
--- a/tests/layout.cc
+++ b/tests/layout.cc
@@ -1,8 +1,8 @@
 #include "lib/core/globals.h"
 #include "lib/core/bytes.h"
-#include "lib/config.h"
-#include "lib/config.pb.h"
-#include "lib/proto.h"
+#include "lib/config/config.h"
+#include "lib/config/config.pb.h"
+#include "lib/config/proto.h"
 #include "lib/layout.h"
 #include "snowhouse/snowhouse.h"
 #include <google/protobuf/text_format.h>
diff --git a/tests/options.cc b/tests/options.cc
index 47d80221e..547e90215 100644
--- a/tests/options.cc
+++ b/tests/options.cc
@@ -1,9 +1,9 @@
 #include "lib/core/globals.h"
 #include "lib/core/bytes.h"
-#include "lib/config.h"
+#include "lib/config/config.h"
 #include "tests/testproto.pb.h"
-#include "lib/config.pb.h"
-#include "lib/proto.h"
+#include "lib/config/config.pb.h"
+#include "lib/config/proto.h"
 #include "snowhouse/snowhouse.h"
 #include <google/protobuf/text_format.h>
 #include <assert.h>
diff --git a/tests/proto.cc b/tests/proto.cc
index 2e69645e4..ecb536eaa 100644
--- a/tests/proto.cc
+++ b/tests/proto.cc
@@ -1,8 +1,8 @@
 #include "lib/core/globals.h"
 #include "lib/core/bytes.h"
 #include "tests/testproto.pb.h"
-#include "lib/config.pb.h"
-#include "lib/proto.h"
+#include "lib/config/config.pb.h"
+#include "lib/config/proto.h"
 #include "snowhouse/snowhouse.h"
 #include <google/protobuf/text_format.h>
 #include <assert.h>
diff --git a/tests/vfs.cc b/tests/vfs.cc
index 3c524c0c0..27df49dc3 100644
--- a/tests/vfs.cc
+++ b/tests/vfs.cc
@@ -1,5 +1,5 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
+#include "lib/config/config.h"
 #include "lib/vfs/vfs.h"
 #include "snowhouse/snowhouse.h"
 
diff --git a/tools/build.py b/tools/build.py
index adc555235..e855ed998 100644
--- a/tools/build.py
+++ b/tools/build.py
@@ -11,7 +11,7 @@
     deps=[
         "+lib",
         "lib/core",
-        "lib+config_proto_lib",
+        "lib/config+proto_lib",
         "lib/fluxsource+proto_lib",
         "+fmt_lib",
         "+z_lib",
@@ -25,7 +25,7 @@
     deps=[
         "+lib",
         "lib/core",
-        "lib+config_proto_lib",
+        "lib/config+proto_lib",
         "lib/fluxsource+proto_lib",
         "+fmt_lib",
         "+z_lib",
@@ -45,7 +45,7 @@
         "+sqlite3_lib",
         "+z_lib",
         "dep/libusbp",
-        "lib+config_proto_lib",
+        "lib/config+proto_lib",
         "lib/fluxsource+proto_lib",
         "src/formats",
         "lib/core",