diff --git a/Makefile.in b/Makefile.in
index 5eae80d..87e6c7c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -54,9 +54,9 @@ COMMON_OBJS = \
 	src/common/pa_debugprint.o \
 	src/common/pa_front.o \
 	src/common/pa_process.o \
-	src/common/pa_skeleton.o \
 	src/common/pa_stream.o \
-	src/common/pa_trace.o
+	src/common/pa_trace.o \
+	src/hostapi/skeleton/pa_hostapi_skeleton.o
 
 TESTS = \
 	bin/paqa_devs \
diff --git a/bindings/cpp/build/vc6/devs_example.dsp b/bindings/cpp/build/vc6/devs_example.dsp
index af26847..e980573 100644
--- a/bindings/cpp/build/vc6/devs_example.dsp
+++ b/bindings/cpp/build/vc6/devs_example.dsp
@@ -121,7 +121,7 @@ SOURCE=..\..\..\..\src\common\pa_process.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\src\common\pa_skeleton.c
+SOURCE=..\..\..\..\src\hostapi\skeleton\pa_hostapi_skeleton.c
 # End Source File
 # Begin Source File
 
diff --git a/bindings/cpp/build/vc6/sine_example.dsp b/bindings/cpp/build/vc6/sine_example.dsp
index 2539cbd..4e7bba1 100644
--- a/bindings/cpp/build/vc6/sine_example.dsp
+++ b/bindings/cpp/build/vc6/sine_example.dsp
@@ -193,7 +193,7 @@ SOURCE=..\..\..\..\src\common\pa_process.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\src\common\pa_skeleton.c
+SOURCE=..\..\..\..\src\hostapi\skeleton\pa_hostapi_skeleton.c
 # End Source File
 # Begin Source File
 
diff --git a/bindings/cpp/build/vc7_1/devs_example.vcproj b/bindings/cpp/build/vc7_1/devs_example.vcproj
index fc065f8..d32cf7d 100644
--- a/bindings/cpp/build/vc7_1/devs_example.vcproj
+++ b/bindings/cpp/build/vc7_1/devs_example.vcproj
@@ -146,7 +146,7 @@
 				RelativePath="..\..\..\..\src\common\pa_process.c">
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\common\pa_skeleton.c">
+				RelativePath="..\..\..\..\src\hostapi\skeleton\pa_hostapi_skeleton.c">
 			</File>
 			<File
 				RelativePath="..\..\..\..\src\common\pa_stream.c">
diff --git a/bindings/cpp/build/vc7_1/sine_example.vcproj b/bindings/cpp/build/vc7_1/sine_example.vcproj
index b1c7b62..f50458d 100644
--- a/bindings/cpp/build/vc7_1/sine_example.vcproj
+++ b/bindings/cpp/build/vc7_1/sine_example.vcproj
@@ -218,7 +218,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\common\pa_skeleton.c">
+				RelativePath="..\..\..\..\src\hostapi\skeleton\pa_hostapi_skeleton.c">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
diff --git a/build/dev-cpp/Makefile-dll b/build/dev-cpp/Makefile-dll
index 856af63..b9f5005 100644
--- a/build/dev-cpp/Makefile-dll
+++ b/build/dev-cpp/Makefile-dll
@@ -5,11 +5,11 @@ CPP  = g++.exe
 CC   = gcc.exe
 WINDRES = windres.exe
 RES  = 
-OBJ  = ./pa_skeleton.o ./pa_stream.o ./pa_trace.o ./pa_allocation.o ./pa_converters.o ./pa_cpuload.o ./pa_dither.o ./pa_front.o ./pa_process.o ./pa_asio.o ./pa_win_util.o ./pa_win_hostapis.o ./pa_win_ds.o ./dsound_wrapper.o ./pa_win_wmme.o ./iasiothiscallresolver.o $(RES)
-LINKOBJ  = ./pa_skeleton.o ./pa_stream.o ./pa_trace.o ./pa_allocation.o ./pa_converters.o ./pa_cpuload.o ./pa_dither.o ./pa_front.o ./pa_process.o ./pa_asio.o ./pa_win_util.o ./pa_win_hostapis.o ./pa_win_ds.o ./dsound_wrapper.o ./pa_win_wmme.o ./iasiothiscallresolver.o $(RES)
+OBJ  = ./pa_hostapi_skeleton.o ./pa_stream.o ./pa_trace.o ./pa_allocation.o ./pa_converters.o ./pa_cpuload.o ./pa_dither.o ./pa_front.o ./pa_process.o ./pa_asio.o ./pa_win_util.o ./pa_win_hostapis.o ./pa_win_ds.o ./dsound_wrapper.o ./pa_win_wmme.o ./iasiothiscallresolver.o $(RES)
+LINKOBJ  = ./pa_hostapi_skeleton.o ./pa_stream.o ./pa_trace.o ./pa_allocation.o ./pa_converters.o ./pa_cpuload.o ./pa_dither.o ./pa_front.o ./pa_process.o ./pa_asio.o ./pa_win_util.o ./pa_win_hostapis.o ./pa_win_ds.o ./dsound_wrapper.o ./pa_win_wmme.o ./iasiothiscallresolver.o $(RES)
 LIBS =  -L"C:/Dev-CPP/lib" -fmessage-length=0 --no-export-all-symbols --add-stdcall-alias ../../../asiosdk2/asiosdk2.a -lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -luuid -lodbc32 -lodbccp32 -lwinmm -O3 -s 
-INCS =  -I"C:/Dev-CPP/include"  -I"../../../asiosdk2"  -I"../../../asiosdk2/common"  -I"../../../asiosdk2/host"  -I"../../../asiosdk2/host/pc"  -I"../../pa_common" 
-CXXINCS =  -I"C:/Dev-CPP/include/c++"  -I"C:/Dev-CPP/include/c++/mingw32"  -I"C:/Dev-CPP/include/c++/backward"  -I"C:/Dev-CPP/include"  -I"../../../asiosdk2"  -I"../../../asiosdk2/common"  -I"../../../asiosdk2/host"  -I"../../../asiosdk2/host/pc"  -I"../../pa_common" 
+INCS =  -I"C:/Dev-CPP/include"  -I"../../../asiosdk2"  -I"../../../asiosdk2/common"  -I"../../../asiosdk2/host"  -I"../../../asiosdk2/host/pc"  -I"../../common" 
+CXXINCS =  -I"C:/Dev-CPP/include/c++"  -I"C:/Dev-CPP/include/c++/mingw32"  -I"C:/Dev-CPP/include/c++/backward"  -I"C:/Dev-CPP/include"  -I"../../../asiosdk2"  -I"../../../asiosdk2/common"  -I"../../../asiosdk2/host"  -I"../../../asiosdk2/host/pc"  -I"../../common" 
 BIN  = portaudio-dll.dll
 CXXFLAGS = $(CXXINCS)-O3   -fmessage-length=0 -Wall
 CFLAGS = $(INCS)-DBUILDING_DLL=1 -O3   -fmessage-length=0 -Wall
@@ -29,32 +29,32 @@ STATICLIB=libportaudio-dll.a
 $(BIN): $(LINKOBJ)
 	$(DLLWRAP) --output-def $(DEFFILE) --driver-name c++ --implib $(STATICLIB) $(LINKOBJ) $(LIBS) -o $(BIN)
 
-./pa_skeleton.o: ../../pa_common/pa_skeleton.c
-	$(CPP) -c ../../pa_common/pa_skeleton.c -o ./pa_skeleton.o $(CXXFLAGS)
+./pa_hostapi_skeleton.o: ../../hostapi/skeleton/pa_hostapi_skeleton.c
+	$(CPP) -c ../../hostapi/skeleton/pa_hostapi_skeleton.c -o ./pa_hostapi_skeleton.o $(CXXFLAGS)
 
-./pa_stream.o: ../../pa_common/pa_stream.c
-	$(CPP) -c ../../pa_common/pa_stream.c -o ./pa_stream.o $(CXXFLAGS)
+./pa_stream.o: ../../common/pa_stream.c
+	$(CPP) -c ../../common/pa_stream.c -o ./pa_stream.o $(CXXFLAGS)
 
-./pa_trace.o: ../../pa_common/pa_trace.c
-	$(CPP) -c ../../pa_common/pa_trace.c -o ./pa_trace.o $(CXXFLAGS)
+./pa_trace.o: ../../common/pa_trace.c
+	$(CPP) -c ../../common/pa_trace.c -o ./pa_trace.o $(CXXFLAGS)
 
-./pa_allocation.o: ../../pa_common/pa_allocation.c
-	$(CPP) -c ../../pa_common/pa_allocation.c -o ./pa_allocation.o $(CXXFLAGS)
+./pa_allocation.o: ../../common/pa_allocation.c
+	$(CPP) -c ../../common/pa_allocation.c -o ./pa_allocation.o $(CXXFLAGS)
 
-./pa_converters.o: ../../pa_common/pa_converters.c
-	$(CPP) -c ../../pa_common/pa_converters.c -o ./pa_converters.o $(CXXFLAGS)
+./pa_converters.o: ../../common/pa_converters.c
+	$(CPP) -c ../../common/pa_converters.c -o ./pa_converters.o $(CXXFLAGS)
 
-./pa_cpuload.o: ../../pa_common/pa_cpuload.c
-	$(CPP) -c ../../pa_common/pa_cpuload.c -o ./pa_cpuload.o $(CXXFLAGS)
+./pa_cpuload.o: ../../common/pa_cpuload.c
+	$(CPP) -c ../../common/pa_cpuload.c -o ./pa_cpuload.o $(CXXFLAGS)
 
-./pa_dither.o: ../../pa_common/pa_dither.c
-	$(CPP) -c ../../pa_common/pa_dither.c -o ./pa_dither.o $(CXXFLAGS)
+./pa_dither.o: ../../common/pa_dither.c
+	$(CPP) -c ../../common/pa_dither.c -o ./pa_dither.o $(CXXFLAGS)
 
-./pa_front.o: ../../pa_common/pa_front.c
-	$(CPP) -c ../../pa_common/pa_front.c -o ./pa_front.o $(CXXFLAGS)
+./pa_front.o: ../../common/pa_front.c
+	$(CPP) -c ../../common/pa_front.c -o ./pa_front.o $(CXXFLAGS)
 
-./pa_process.o: ../../pa_common/pa_process.c
-	$(CPP) -c ../../pa_common/pa_process.c -o ./pa_process.o $(CXXFLAGS)
+./pa_process.o: ../../common/pa_process.c
+	$(CPP) -c ../../common/pa_process.c -o ./pa_process.o $(CXXFLAGS)
 
 ./pa_asio.o: ../../pa_asio/pa_asio.cpp
 	$(CPP) -c ../../pa_asio/pa_asio.cpp -o ./pa_asio.o $(CXXFLAGS)
diff --git a/build/dev-cpp/Makefile-static b/build/dev-cpp/Makefile-static
index 2a1647d..4d59d1b 100644
--- a/build/dev-cpp/Makefile-static
+++ b/build/dev-cpp/Makefile-static
@@ -5,11 +5,11 @@ CPP  = g++.exe
 CC   = gcc.exe
 WINDRES = windres.exe
 RES  = 
-OBJ  = ./pa_skeleton.o ./pa_stream.o ./pa_trace.o ./pa_allocation.o ./pa_converters.o ./pa_cpuload.o ./pa_dither.o ./pa_front.o ./pa_process.o ./pa_asio.o ./pa_win_util.o ./pa_win_hostapis.o ./pa_win_ds.o ./dsound_wrapper.o ./pa_win_wmme.o ./iasiothiscallresolver.o $(RES)
-LINKOBJ  = ./pa_skeleton.o ./pa_stream.o ./pa_trace.o ./pa_allocation.o ./pa_converters.o ./pa_cpuload.o ./pa_dither.o ./pa_front.o ./pa_process.o ./pa_asio.o ./pa_win_util.o ./pa_win_hostapis.o ./pa_win_ds.o ./dsound_wrapper.o ./pa_win_wmme.o ./iasiothiscallresolver.o $(RES)
+OBJ  = ./pa_hostapi_skeleton.o ./pa_stream.o ./pa_trace.o ./pa_allocation.o ./pa_converters.o ./pa_cpuload.o ./pa_dither.o ./pa_front.o ./pa_process.o ./pa_asio.o ./pa_win_util.o ./pa_win_hostapis.o ./pa_win_ds.o ./dsound_wrapper.o ./pa_win_wmme.o ./iasiothiscallresolver.o $(RES)
+LINKOBJ  = ./pa_hostapi_skeleton.o ./pa_stream.o ./pa_trace.o ./pa_allocation.o ./pa_converters.o ./pa_cpuload.o ./pa_dither.o ./pa_front.o ./pa_process.o ./pa_asio.o ./pa_win_util.o ./pa_win_hostapis.o ./pa_win_ds.o ./dsound_wrapper.o ./pa_win_wmme.o ./iasiothiscallresolver.o $(RES)
 LIBS =  -L"C:/Dev-CPP/lib" -fmessage-length=0 -O3 -s 
-INCS =  -I"C:/Dev-CPP/include"  -I"../../../asiosdk2"  -I"../../../asiosdk2/common"  -I"../../../asiosdk2/host"  -I"../../../asiosdk2/host/pc"  -I"../../pa_common" 
-CXXINCS =  -I"C:/Dev-CPP/include/c++"  -I"C:/Dev-CPP/include/c++/mingw32"  -I"C:/Dev-CPP/include/c++/backward"  -I"C:/Dev-CPP/include"  -I"../../../asiosdk2"  -I"../../../asiosdk2/common"  -I"../../../asiosdk2/host"  -I"../../../asiosdk2/host/pc"  -I"../../pa_common" 
+INCS =  -I"C:/Dev-CPP/include"  -I"../../../asiosdk2"  -I"../../../asiosdk2/common"  -I"../../../asiosdk2/host"  -I"../../../asiosdk2/host/pc"  -I"../../common" 
+CXXINCS =  -I"C:/Dev-CPP/include/c++"  -I"C:/Dev-CPP/include/c++/mingw32"  -I"C:/Dev-CPP/include/c++/backward"  -I"C:/Dev-CPP/include"  -I"../../../asiosdk2"  -I"../../../asiosdk2/common"  -I"../../../asiosdk2/host"  -I"../../../asiosdk2/host/pc"  -I"../../common" 
 BIN  = portaudio-static.a
 CXXFLAGS = $(CXXINCS)-O3   -fmessage-length=0 -Wall
 CFLAGS = $(INCS)-O3   -fmessage-length=0 -Wall
@@ -26,32 +26,32 @@ $(BIN): $(LINKOBJ)
 	ar r $(BIN) $(LINKOBJ)
 	ranlib $(BIN)
 
-./pa_skeleton.o: ../../pa_common/pa_skeleton.c
-	$(CPP) -c ../../pa_common/pa_skeleton.c -o ./pa_skeleton.o $(CXXFLAGS)
+./pa_hostapi_skeleton.o: ../../hostapi/skeleton/pa_hostapi_skeleton.c
+	$(CPP) -c ../../hostapi/skeleton/pa_hostapi_skeleton.c -o ./pa_hostapi_skeleton.o $(CXXFLAGS)
 
-./pa_stream.o: ../../pa_common/pa_stream.c
-	$(CPP) -c ../../pa_common/pa_stream.c -o ./pa_stream.o $(CXXFLAGS)
+./pa_stream.o: ../../common/pa_stream.c
+	$(CPP) -c ../../common/pa_stream.c -o ./pa_stream.o $(CXXFLAGS)
 
-./pa_trace.o: ../../pa_common/pa_trace.c
-	$(CPP) -c ../../pa_common/pa_trace.c -o ./pa_trace.o $(CXXFLAGS)
+./pa_trace.o: ../../common/pa_trace.c
+	$(CPP) -c ../../common/pa_trace.c -o ./pa_trace.o $(CXXFLAGS)
 
-./pa_allocation.o: ../../pa_common/pa_allocation.c
-	$(CPP) -c ../../pa_common/pa_allocation.c -o ./pa_allocation.o $(CXXFLAGS)
+./pa_allocation.o: ../../common/pa_allocation.c
+	$(CPP) -c ../../common/pa_allocation.c -o ./pa_allocation.o $(CXXFLAGS)
 
-./pa_converters.o: ../../pa_common/pa_converters.c
-	$(CPP) -c ../../pa_common/pa_converters.c -o ./pa_converters.o $(CXXFLAGS)
+./pa_converters.o: ../../common/pa_converters.c
+	$(CPP) -c ../../common/pa_converters.c -o ./pa_converters.o $(CXXFLAGS)
 
-./pa_cpuload.o: ../../pa_common/pa_cpuload.c
-	$(CPP) -c ../../pa_common/pa_cpuload.c -o ./pa_cpuload.o $(CXXFLAGS)
+./pa_cpuload.o: ../../common/pa_cpuload.c
+	$(CPP) -c ../../common/pa_cpuload.c -o ./pa_cpuload.o $(CXXFLAGS)
 
-./pa_dither.o: ../../pa_common/pa_dither.c
-	$(CPP) -c ../../pa_common/pa_dither.c -o ./pa_dither.o $(CXXFLAGS)
+./pa_dither.o: ../../common/pa_dither.c
+	$(CPP) -c ../../common/pa_dither.c -o ./pa_dither.o $(CXXFLAGS)
 
-./pa_front.o: ../../pa_common/pa_front.c
-	$(CPP) -c ../../pa_common/pa_front.c -o ./pa_front.o $(CXXFLAGS)
+./pa_front.o: ../../common/pa_front.c
+	$(CPP) -c ../../common/pa_front.c -o ./pa_front.o $(CXXFLAGS)
 
-./pa_process.o: ../../pa_common/pa_process.c
-	$(CPP) -c ../../pa_common/pa_process.c -o ./pa_process.o $(CXXFLAGS)
+./pa_process.o: ../../common/pa_process.c
+	$(CPP) -c ../../common/pa_process.c -o ./pa_process.o $(CXXFLAGS)
 
 ./pa_asio.o: ../../pa_asio/pa_asio.cpp
 	$(CPP) -c ../../pa_asio/pa_asio.cpp -o ./pa_asio.o $(CXXFLAGS)
diff --git a/build/dev-cpp/portaudio-dll.dev b/build/dev-cpp/portaudio-dll.dev
index 086e109..0dddf3d 100644
--- a/build/dev-cpp/portaudio-dll.dev
+++ b/build/dev-cpp/portaudio-dll.dev
@@ -5,7 +5,7 @@ UnitCount=16
 Type=3
 Ver=1
 ObjFiles=
-Includes=..\..\..\asiosdk2;..\..\..\asiosdk2\common;..\..\..\asiosdk2\host;..\..\..\asiosdk2\host\pc;..\..\pa_common
+Includes=..\..\..\asiosdk2;..\..\..\asiosdk2\common;..\..\..\asiosdk2\host;..\..\..\asiosdk2\host\pc;..\..\common
 Libs=
 PrivateResource=
 ResourceIncludes=
@@ -30,17 +30,17 @@ UseCustomMakefile=0
 CustomMakefile=
 
 [Unit1]
-FileName=..\..\pa_common\pa_skeleton.c
+FileName=..\..\hostapi\skeleton\pa_hostapi_skeleton.c
 CompileCpp=1
 Folder=portaudio
 Compile=1
 Link=1
 Priority=1000
 OverrideBuildCmd=0
-BuildCmd=$(CC) -c pa_skeleton.c -o ./pa_skeleton.o $(CFLAGS)
+BuildCmd=$(CC) -c pa_hostapi_skeleton.c -o ./pa_hostapi_skeleton.o $(CFLAGS)
 
 [Unit2]
-FileName=..\..\pa_common\pa_stream.c
+FileName=..\..\common\pa_stream.c
 CompileCpp=1
 Folder=portaudio
 Compile=1
@@ -50,7 +50,7 @@ OverrideBuildCmd=0
 BuildCmd=$(CC) -c pa_stream.c -o ./pa_stream.o $(CFLAGS)
 
 [Unit3]
-FileName=..\..\pa_common\pa_trace.c
+FileName=..\..\common\pa_trace.c
 CompileCpp=1
 Folder=portaudio
 Compile=1
@@ -60,7 +60,7 @@ OverrideBuildCmd=0
 BuildCmd=$(CC) -c pa_trace.c -o ./pa_trace.o $(CFLAGS)
 
 [Unit4]
-FileName=..\..\pa_common\pa_allocation.c
+FileName=..\..\common\pa_allocation.c
 CompileCpp=1
 Folder=portaudio
 Compile=1
@@ -70,7 +70,7 @@ OverrideBuildCmd=0
 BuildCmd=$(CC) -c pa_allocation.c -o ./pa_allocation.o $(CFLAGS)
 
 [Unit5]
-FileName=..\..\pa_common\pa_converters.c
+FileName=..\..\common\pa_converters.c
 CompileCpp=1
 Folder=portaudio
 Compile=1
@@ -80,7 +80,7 @@ OverrideBuildCmd=0
 BuildCmd=$(CC) -c pa_converters.c -o ./pa_converters.o $(CFLAGS)
 
 [Unit6]
-FileName=..\..\pa_common\pa_cpuload.c
+FileName=..\..\common\pa_cpuload.c
 CompileCpp=1
 Folder=portaudio
 Compile=1
@@ -90,7 +90,7 @@ OverrideBuildCmd=0
 BuildCmd=$(CC) -c pa_cpuload.c -o ./pa_cpuload.o $(CFLAGS)
 
 [Unit7]
-FileName=..\..\pa_common\pa_dither.c
+FileName=..\..\common\pa_dither.c
 CompileCpp=1
 Folder=portaudio
 Compile=1
@@ -100,7 +100,7 @@ OverrideBuildCmd=0
 BuildCmd=$(CC) -c pa_dither.c -o ./pa_dither.o $(CFLAGS)
 
 [Unit8]
-FileName=..\..\pa_common\pa_front.c
+FileName=..\..\common\pa_front.c
 CompileCpp=1
 Folder=portaudio
 Compile=1
@@ -110,7 +110,7 @@ OverrideBuildCmd=0
 BuildCmd=$(CC) -c pa_front.c -o ./pa_front.o $(CFLAGS)
 
 [Unit9]
-FileName=..\..\pa_common\pa_process.c
+FileName=..\..\common\pa_process.c
 CompileCpp=1
 Folder=portaudio
 Compile=1
diff --git a/build/dev-cpp/portaudio-static.dev b/build/dev-cpp/portaudio-static.dev
index 2aae584..2c76d33 100644
--- a/build/dev-cpp/portaudio-static.dev
+++ b/build/dev-cpp/portaudio-static.dev
@@ -5,7 +5,7 @@ UnitCount=16
 Type=2
 Ver=1
 ObjFiles=
-Includes=..\..\..\asiosdk2;..\..\..\asiosdk2\common;..\..\..\asiosdk2\host;..\..\..\asiosdk2\host\pc;..\..\pa_common
+Includes=..\..\..\asiosdk2;..\..\..\asiosdk2\common;..\..\..\asiosdk2\host;..\..\..\asiosdk2\host\pc;..\..\common
 Libs=
 PrivateResource=
 ResourceIncludes=
@@ -30,17 +30,17 @@ UseCustomMakefile=0
 CustomMakefile=
 
 [Unit1]
-FileName=..\..\pa_common\pa_skeleton.c
+FileName=..\..\hostapi\skeleton\pa_hostapi_skeleton.c
 CompileCpp=1
 Folder=portaudio
 Compile=1
 Link=1
 Priority=1000
 OverrideBuildCmd=0
-BuildCmd=$(CC) -c pa_skeleton.c -o ./pa_skeleton.o $(CFLAGS)
+BuildCmd=$(CC) -c pa_hostapi_skeleton.c -o ./pa_hostapi_skeleton.o $(CFLAGS)
 
 [Unit2]
-FileName=..\..\pa_common\pa_stream.c
+FileName=..\..\common\pa_stream.c
 CompileCpp=1
 Folder=portaudio
 Compile=1
@@ -50,7 +50,7 @@ OverrideBuildCmd=0
 BuildCmd=$(CC) -c pa_stream.c -o ./pa_stream.o $(CFLAGS)
 
 [Unit3]
-FileName=..\..\pa_common\pa_trace.c
+FileName=..\..\common\pa_trace.c
 CompileCpp=1
 Folder=portaudio
 Compile=1
@@ -60,7 +60,7 @@ OverrideBuildCmd=0
 BuildCmd=$(CC) -c pa_trace.c -o ./pa_trace.o $(CFLAGS)
 
 [Unit4]
-FileName=..\..\pa_common\pa_allocation.c
+FileName=..\..\common\pa_allocation.c
 CompileCpp=1
 Folder=portaudio
 Compile=1
@@ -70,7 +70,7 @@ OverrideBuildCmd=0
 BuildCmd=$(CC) -c pa_allocation.c -o ./pa_allocation.o $(CFLAGS)
 
 [Unit5]
-FileName=..\..\pa_common\pa_converters.c
+FileName=..\..\common\pa_converters.c
 CompileCpp=1
 Folder=portaudio
 Compile=1
@@ -80,7 +80,7 @@ OverrideBuildCmd=0
 BuildCmd=$(CC) -c pa_converters.c -o ./pa_converters.o $(CFLAGS)
 
 [Unit6]
-FileName=..\..\pa_common\pa_cpuload.c
+FileName=..\..\common\pa_cpuload.c
 CompileCpp=1
 Folder=portaudio
 Compile=1
@@ -90,7 +90,7 @@ OverrideBuildCmd=0
 BuildCmd=$(CC) -c pa_cpuload.c -o ./pa_cpuload.o $(CFLAGS)
 
 [Unit7]
-FileName=..\..\pa_common\pa_dither.c
+FileName=..\..\common\pa_dither.c
 CompileCpp=1
 Folder=portaudio
 Compile=1
@@ -100,7 +100,7 @@ OverrideBuildCmd=0
 BuildCmd=$(CC) -c pa_dither.c -o ./pa_dither.o $(CFLAGS)
 
 [Unit8]
-FileName=..\..\pa_common\pa_front.c
+FileName=..\..\common\pa_front.c
 CompileCpp=1
 Folder=portaudio
 Compile=1
@@ -110,7 +110,7 @@ OverrideBuildCmd=0
 BuildCmd=$(CC) -c pa_front.c -o ./pa_front.o $(CFLAGS)
 
 [Unit9]
-FileName=..\..\pa_common\pa_process.c
+FileName=..\..\common\pa_process.c
 CompileCpp=1
 Folder=portaudio
 Compile=1
diff --git a/build/msvc/portaudio.dsp b/build/msvc/portaudio.dsp
index bb2ce45..9a1bb2d 100644
--- a/build/msvc/portaudio.dsp
+++ b/build/msvc/portaudio.dsp
@@ -129,7 +129,7 @@ SOURCE=..\..\src\common\pa_ringbuffer.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\common\pa_skeleton.c
+SOURCE=..\..\src\hostapi\skeleton\pa_hostapi_skeleton.c
 # End Source File
 # Begin Source File
 
diff --git a/build/msvc/portaudio.vcproj b/build/msvc/portaudio.vcproj
index 10d68e2..d7e18f3 100644
--- a/build/msvc/portaudio.vcproj
+++ b/build/msvc/portaudio.vcproj
@@ -737,7 +737,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\src\common\pa_skeleton.c"
+					RelativePath="..\..\src\hostapi\skeleton\pa_hostapi_skeleton.c"
 					>
 					<FileConfiguration
 						Name="Release|Win32"
diff --git a/src/SConscript b/src/SConscript
index 3c92aad..5cc9152 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -161,7 +161,8 @@ env = conf.Finish()
 
 # PA infrastructure
 CommonSources = [os.path.join("common", f) for f in "pa_allocation.c pa_converters.c pa_cpuload.c pa_dither.c pa_front.c \
-        pa_process.c pa_skeleton.c pa_stream.c pa_trace.c pa_debugprint.c pa_ringbuffer.c".split()]
+        pa_process.c pa_stream.c pa_trace.c pa_debugprint.c pa_ringbuffer.c".split()]
+CommonSources.append(os.path.join("hostapi", "skeleton", "pa_hostapi_skeleton.c"))
 
 # Host APIs implementations
 ImplSources = []
diff --git a/src/hostapi/skeleton/README.txt b/src/hostapi/skeleton/README.txt
new file mode 100644
index 0000000..39d4c8d
--- /dev/null
+++ b/src/hostapi/skeleton/README.txt
@@ -0,0 +1 @@
+pa_hostapi_skeleton.c provides a starting point for implementing support for a new host API with PortAudio. The idea is that you copy it to a new directory inside /hostapi and start editing.
\ No newline at end of file
diff --git a/src/common/pa_skeleton.c b/src/hostapi/skeleton/pa_hostapi_skeleton.c
similarity index 100%
rename from src/common/pa_skeleton.c
rename to src/hostapi/skeleton/pa_hostapi_skeleton.c