diff --git a/fmt/adx.c b/src/fmt/adx.c
similarity index 100%
rename from fmt/adx.c
rename to src/fmt/adx.c
diff --git a/fmt/adx.h b/src/fmt/adx.h
similarity index 100%
rename from fmt/adx.h
rename to src/fmt/adx.h
diff --git a/fmt/interleave.c b/src/fmt/interleave.c
similarity index 100%
rename from fmt/interleave.c
rename to src/fmt/interleave.c
diff --git a/fmt/interleave.h b/src/fmt/interleave.h
similarity index 100%
rename from fmt/interleave.h
rename to src/fmt/interleave.h
diff --git a/streamfile.c b/src/streamfile.c
similarity index 100%
rename from streamfile.c
rename to src/streamfile.c
diff --git a/streamfile.h b/src/streamfile.h
similarity index 100%
rename from streamfile.h
rename to src/streamfile.h
diff --git a/streamtypes.h b/src/streamtypes.h
similarity index 100%
rename from streamtypes.h
rename to src/streamtypes.h
diff --git a/util.c b/src/util.c
similarity index 100%
rename from util.c
rename to src/util.c
diff --git a/util.h b/src/util.h
similarity index 100%
rename from util.h
rename to src/util.h
diff --git a/vgmstream.c b/src/vgmstream.c
similarity index 100%
rename from vgmstream.c
rename to src/vgmstream.c
diff --git a/vgmstream.h b/src/vgmstream.h
similarity index 100%
rename from vgmstream.h
rename to src/vgmstream.h