diff --git a/audiotest/audiotest/Makefile b/player/Makefile
similarity index 100%
rename from audiotest/audiotest/Makefile
rename to player/Makefile
diff --git a/audiotest/audiotest/apple2-asm-hgr.cfg b/player/apple2-asm-hgr.cfg
similarity index 100%
rename from audiotest/audiotest/apple2-asm-hgr.cfg
rename to player/apple2-asm-hgr.cfg
diff --git a/audiotest/audiotest/main.s b/player/main.s
similarity index 100%
rename from audiotest/audiotest/main.s
rename to player/main.s
diff --git a/audiotest/audiotest/make/AppleCommander.jar b/player/make/AppleCommander.jar
similarity index 100%
rename from audiotest/audiotest/make/AppleCommander.jar
rename to player/make/AppleCommander.jar
diff --git a/audiotest/audiotest/make/DevApple.vii b/player/make/DevApple.vii
similarity index 100%
rename from audiotest/audiotest/make/DevApple.vii
rename to player/make/DevApple.vii
diff --git a/audiotest/audiotest/make/V2Make.scpt b/player/make/V2Make.scpt
similarity index 100%
rename from audiotest/audiotest/make/V2Make.scpt
rename to player/make/V2Make.scpt
diff --git a/audiotest/audiotest/make/bastokenizer-tools-bt-0.2.0.jar b/player/make/bastokenizer-tools-bt-0.2.0.jar
similarity index 100%
rename from audiotest/audiotest/make/bastokenizer-tools-bt-0.2.0.jar
rename to player/make/bastokenizer-tools-bt-0.2.0.jar
diff --git a/audiotest/audiotest/make/bt b/player/make/bt
similarity index 100%
rename from audiotest/audiotest/make/bt
rename to player/make/bt
diff --git a/audiotest/audiotest/make/createDiskImage b/player/make/createDiskImage
similarity index 100%
rename from audiotest/audiotest/make/createDiskImage
rename to player/make/createDiskImage
diff --git a/audiotest/audiotest/make/dos33_template.dsk b/player/make/dos33_template.dsk
similarity index 100%
rename from audiotest/audiotest/make/dos33_template.dsk
rename to player/make/dos33_template.dsk
diff --git a/audiotest/audiotest/make/errorFilter.sh b/player/make/errorFilter.sh
similarity index 100%
rename from audiotest/audiotest/make/errorFilter.sh
rename to player/make/errorFilter.sh
diff --git a/audiotest/audiotest/make/head.mk b/player/make/head.mk
similarity index 100%
rename from audiotest/audiotest/make/head.mk
rename to player/make/head.mk
diff --git a/audiotest/audiotest/make/prodos_template.dsk b/player/make/prodos_template.dsk
similarity index 100%
rename from audiotest/audiotest/make/prodos_template.dsk
rename to player/make/prodos_template.dsk
diff --git a/audiotest/audiotest/make/tail.mk b/player/make/tail.mk
similarity index 100%
rename from audiotest/audiotest/make/tail.mk
rename to player/make/tail.mk