diff --git a/tests/test-files/Alien.tap b/tests/test-files/linuxcnc/Alien.tap similarity index 100% rename from tests/test-files/Alien.tap rename to tests/test-files/linuxcnc/Alien.tap diff --git a/tests/test-files/Chucks Deer (V-Carve) {3}.tap b/tests/test-files/linuxcnc/Chucks Deer (V-Carve) {3}.tap similarity index 100% rename from tests/test-files/Chucks Deer (V-Carve) {3}.tap rename to tests/test-files/linuxcnc/Chucks Deer (V-Carve) {3}.tap diff --git a/tests/test-files/Circular Pocket.tap b/tests/test-files/linuxcnc/Circular Pocket.tap similarity index 100% rename from tests/test-files/Circular Pocket.tap rename to tests/test-files/linuxcnc/Circular Pocket.tap diff --git a/tests/test-files/Clamp.nc b/tests/test-files/linuxcnc/Clamp.nc similarity index 100% rename from tests/test-files/Clamp.nc rename to tests/test-files/linuxcnc/Clamp.nc diff --git a/tests/test-files/Colt.tap b/tests/test-files/linuxcnc/Colt.tap similarity index 100% rename from tests/test-files/Colt.tap rename to tests/test-files/linuxcnc/Colt.tap diff --git a/tests/test-files/Cross2.tap b/tests/test-files/linuxcnc/Cross2.tap similarity index 100% rename from tests/test-files/Cross2.tap rename to tests/test-files/linuxcnc/Cross2.tap diff --git a/tests/test-files/DB25.tap b/tests/test-files/linuxcnc/DB25.tap similarity index 100% rename from tests/test-files/DB25.tap rename to tests/test-files/linuxcnc/DB25.tap diff --git a/tests/test-files/Disc3.tap b/tests/test-files/linuxcnc/Disc3.tap similarity index 100% rename from tests/test-files/Disc3.tap rename to tests/test-files/linuxcnc/Disc3.tap diff --git a/tests/test-files/Heart.tap b/tests/test-files/linuxcnc/Heart.tap similarity index 100% rename from tests/test-files/Heart.tap rename to tests/test-files/linuxcnc/Heart.tap diff --git a/tests/test-files/Horse.tap b/tests/test-files/linuxcnc/Horse.tap similarity index 100% rename from tests/test-files/Horse.tap rename to tests/test-files/linuxcnc/Horse.tap diff --git a/tests/test-files/Horse2.tap b/tests/test-files/linuxcnc/Horse2.tap similarity index 100% rename from tests/test-files/Horse2.tap rename to tests/test-files/linuxcnc/Horse2.tap diff --git a/tests/test-files/Letter A (V-Carve).tap b/tests/test-files/linuxcnc/Letter A (V-Carve).tap similarity index 100% rename from tests/test-files/Letter A (V-Carve).tap rename to tests/test-files/linuxcnc/Letter A (V-Carve).tap diff --git a/tests/test-files/Mach3 write.tap b/tests/test-files/linuxcnc/Mach3 write.tap similarity index 100% rename from tests/test-files/Mach3 write.tap rename to tests/test-files/linuxcnc/Mach3 write.tap diff --git a/tests/test-files/Mach4 write.tap b/tests/test-files/linuxcnc/Mach4 write.tap similarity index 100% rename from tests/test-files/Mach4 write.tap rename to tests/test-files/linuxcnc/Mach4 write.tap diff --git a/tests/test-files/Scorpion.tap b/tests/test-files/linuxcnc/Scorpion.tap similarity index 100% rename from tests/test-files/Scorpion.tap rename to tests/test-files/linuxcnc/Scorpion.tap diff --git a/tests/test-files/Skull2.tap b/tests/test-files/linuxcnc/Skull2.tap similarity index 100% rename from tests/test-files/Skull2.tap rename to tests/test-files/linuxcnc/Skull2.tap diff --git a/tests/test-files/Smiley face.tap b/tests/test-files/linuxcnc/Smiley face.tap similarity index 100% rename from tests/test-files/Smiley face.tap rename to tests/test-files/linuxcnc/Smiley face.tap diff --git a/tests/test-files/Smiley001.nc b/tests/test-files/linuxcnc/Smiley001.nc similarity index 100% rename from tests/test-files/Smiley001.nc rename to tests/test-files/linuxcnc/Smiley001.nc diff --git a/tests/test-files/Smiley002.nc b/tests/test-files/linuxcnc/Smiley002.nc similarity index 100% rename from tests/test-files/Smiley002.nc rename to tests/test-files/linuxcnc/Smiley002.nc diff --git a/tests/test-files/Snow White.tap b/tests/test-files/linuxcnc/Snow White.tap similarity index 100% rename from tests/test-files/Snow White.tap rename to tests/test-files/linuxcnc/Snow White.tap diff --git a/tests/test-files/Star Trek.tap b/tests/test-files/linuxcnc/Star Trek.tap similarity index 100% rename from tests/test-files/Star Trek.tap rename to tests/test-files/linuxcnc/Star Trek.tap diff --git a/tests/test-files/Trispokedovetiles(laser).tap b/tests/test-files/linuxcnc/Trispokedovetiles(laser).tap similarity index 100% rename from tests/test-files/Trispokedovetiles(laser).tap rename to tests/test-files/linuxcnc/Trispokedovetiles(laser).tap diff --git a/tests/test-files/Tweakie's CNC Cube.nc b/tests/test-files/linuxcnc/Tweakie's CNC Cube.nc similarity index 100% rename from tests/test-files/Tweakie's CNC Cube.nc rename to tests/test-files/linuxcnc/Tweakie's CNC Cube.nc diff --git a/tests/test-files/Tweakie's CNC Cube2.nc b/tests/test-files/linuxcnc/Tweakie's CNC Cube2.nc similarity index 100% rename from tests/test-files/Tweakie's CNC Cube2.nc rename to tests/test-files/linuxcnc/Tweakie's CNC Cube2.nc diff --git a/tests/test-files/plug6a.tap b/tests/test-files/linuxcnc/plug6a.tap similarity index 100% rename from tests/test-files/plug6a.tap rename to tests/test-files/linuxcnc/plug6a.tap diff --git a/tests/test-files/random-sample-1.gcode b/tests/test-files/linuxcnc/random-sample-1.gcode similarity index 100% rename from tests/test-files/random-sample-1.gcode rename to tests/test-files/linuxcnc/random-sample-1.gcode diff --git a/tests/test-files/unsupported/Chucks Deer (V-Carve) {3}.tap b/tests/test-files/linuxcnc/unsupported/Chucks Deer (V-Carve) {3}.tap similarity index 100% rename from tests/test-files/unsupported/Chucks Deer (V-Carve) {3}.tap rename to tests/test-files/linuxcnc/unsupported/Chucks Deer (V-Carve) {3}.tap diff --git a/tests/test-files/unsupported/Circular Pocket.tap b/tests/test-files/linuxcnc/unsupported/Circular Pocket.tap similarity index 100% rename from tests/test-files/unsupported/Circular Pocket.tap rename to tests/test-files/linuxcnc/unsupported/Circular Pocket.tap diff --git a/tests/test-files/unsupported/Colt.tap b/tests/test-files/linuxcnc/unsupported/Colt.tap similarity index 100% rename from tests/test-files/unsupported/Colt.tap rename to tests/test-files/linuxcnc/unsupported/Colt.tap diff --git a/tests/test-files/unsupported/Cross2.tap b/tests/test-files/linuxcnc/unsupported/Cross2.tap similarity index 100% rename from tests/test-files/unsupported/Cross2.tap rename to tests/test-files/linuxcnc/unsupported/Cross2.tap diff --git a/tests/test-files/unsupported/DB25.tap b/tests/test-files/linuxcnc/unsupported/DB25.tap similarity index 100% rename from tests/test-files/unsupported/DB25.tap rename to tests/test-files/linuxcnc/unsupported/DB25.tap diff --git a/tests/test-files/unsupported/Disc3.tap b/tests/test-files/linuxcnc/unsupported/Disc3.tap similarity index 100% rename from tests/test-files/unsupported/Disc3.tap rename to tests/test-files/linuxcnc/unsupported/Disc3.tap diff --git a/tests/test-files/unsupported/Horse.tap b/tests/test-files/linuxcnc/unsupported/Horse.tap similarity index 100% rename from tests/test-files/unsupported/Horse.tap rename to tests/test-files/linuxcnc/unsupported/Horse.tap diff --git a/tests/test-files/unsupported/Horse2.tap b/tests/test-files/linuxcnc/unsupported/Horse2.tap similarity index 100% rename from tests/test-files/unsupported/Horse2.tap rename to tests/test-files/linuxcnc/unsupported/Horse2.tap diff --git a/tests/test-files/unsupported/Mach3 write.tap b/tests/test-files/linuxcnc/unsupported/Mach3 write.tap similarity index 100% rename from tests/test-files/unsupported/Mach3 write.tap rename to tests/test-files/linuxcnc/unsupported/Mach3 write.tap diff --git a/tests/test-files/unsupported/Mach4 write.tap b/tests/test-files/linuxcnc/unsupported/Mach4 write.tap similarity index 100% rename from tests/test-files/unsupported/Mach4 write.tap rename to tests/test-files/linuxcnc/unsupported/Mach4 write.tap diff --git a/tests/test-files/unsupported/README.md b/tests/test-files/linuxcnc/unsupported/README.md similarity index 100% rename from tests/test-files/unsupported/README.md rename to tests/test-files/linuxcnc/unsupported/README.md diff --git a/tests/test-files/unsupported/Skull2.tap b/tests/test-files/linuxcnc/unsupported/Skull2.tap similarity index 100% rename from tests/test-files/unsupported/Skull2.tap rename to tests/test-files/linuxcnc/unsupported/Skull2.tap diff --git a/tests/test-files/unsupported/Snow White.tap b/tests/test-files/linuxcnc/unsupported/Snow White.tap similarity index 100% rename from tests/test-files/unsupported/Snow White.tap rename to tests/test-files/linuxcnc/unsupported/Snow White.tap diff --git a/tests/test-files/unsupported/Star Trek.tap b/tests/test-files/linuxcnc/unsupported/Star Trek.tap similarity index 100% rename from tests/test-files/unsupported/Star Trek.tap rename to tests/test-files/linuxcnc/unsupported/Star Trek.tap diff --git a/tests/test-files/unsupported/Trispokedovetiles(laser).tap b/tests/test-files/linuxcnc/unsupported/Trispokedovetiles(laser).tap similarity index 100% rename from tests/test-files/unsupported/Trispokedovetiles(laser).tap rename to tests/test-files/linuxcnc/unsupported/Trispokedovetiles(laser).tap diff --git a/tests/test-files/unsupported/plug6a.tap b/tests/test-files/linuxcnc/unsupported/plug6a.tap similarity index 100% rename from tests/test-files/unsupported/plug6a.tap rename to tests/test-files/linuxcnc/unsupported/plug6a.tap diff --git a/tests/test-files/vertical-slot.ngc b/tests/test-files/linuxcnc/vertical-slot.ngc similarity index 100% rename from tests/test-files/vertical-slot.ngc rename to tests/test-files/linuxcnc/vertical-slot.ngc