diff --git a/.gitignore b/.gitignore index 53cd3d892..82d2a36aa 100644 --- a/.gitignore +++ b/.gitignore @@ -8,9 +8,9 @@ aclocal.m4 configure -vs2015/sdlnet/Makefile.in -vs2015/sdlnet/aclocal.m4 -vs2015/sdlnet/configure +vs/sdlnet/Makefile.in +vs/sdlnet/aclocal.m4 +vs/sdlnet/configure # User-specific files *.suo @@ -37,7 +37,7 @@ bld/ [Oo]bj/ [Ll]og/ -# Visual Studio 2015 cache/options directory +# Visual Studio cache/options directory .vs/ # Uncomment if you have tasks that create the project's static files in wwwroot #wwwroot/ @@ -347,52 +347,52 @@ Makefile doxygen doxygen/* -vs2015/sdl/linux-host -vs2015/sdl/linux-host/* +vs/sdl/linux-host +vs/sdl/linux-host/* -vs2015/sdl/linux-build -vs2015/sdl/linux-build/* +vs/sdl/linux-build +vs/sdl/linux-build/* -vs2015/sdl/include/SDL_config.h +vs/sdl/include/SDL_config.h -vs2015/zlib/linux-host -vs2015/zlib/linux-host/* +vs/zlib/linux-host +vs/zlib/linux-host/* -vs2015/zlib/linux-build -vs2015/zlib/linux-build/* +vs/zlib/linux-build +vs/zlib/linux-build/* -vs2015/libpng/linux-host -vs2015/libpng/linux-host/* +vs/libpng/linux-host +vs/libpng/linux-host/* -vs2015/libpng/linux-build -vs2015/libpng/linux-build/* +vs/libpng/linux-build +vs/libpng/linux-build/* -/vs2015/libpdcurses/wincon/xmas.exe -/vs2015/libpdcurses/wincon/worm.exe -/vs2015/libpdcurses/wincon/tuidemo.exe -/vs2015/libpdcurses/wincon/testcurs.exe -/vs2015/libpdcurses/wincon/rain.exe -/vs2015/libpdcurses/wincon/ptest.exe -/vs2015/libpdcurses/wincon/pdcurses.lib -/vs2015/libpdcurses/wincon/ozdemo.exe -/vs2015/libpdcurses/wincon/firework.exe -/vs2015/libpdcurses/wincon/xmas.exe -/vs2015/libpdcurses/wincon/worm.exe -/vs2015/libpdcurses/wincon/tuidemo.exe -/vs2015/libpdcurses/wincon/testcurs.exe -/vs2015/libpdcurses/wincon/rain.exe -/vs2015/libpdcurses/wincon/ptest.exe -/vs2015/libpdcurses/wincon/pdcurses.lib -/vs2015/libpdcurses/wincon/ozdemo.exe -/vs2015/libpdcurses/wincon/firework.exe -/vs2015/libpdcurses/wincon/xmas.exe -/vs2015/libpdcurses/wincon/worm.exe -/vs2015/libpdcurses/wincon/tuidemo.exe -/vs2015/libpdcurses/wincon/testcurs.exe -/vs2015/libpdcurses/wincon/rain.exe -/vs2015/libpdcurses/wincon/ptest.exe -/vs2015/libpdcurses/wincon/pdcurses.lib -/vs2015/libpdcurses/wincon/ozdemo.exe -/vs2015/libpdcurses/wincon/firework.exe +/vs/libpdcurses/wincon/xmas.exe +/vs/libpdcurses/wincon/worm.exe +/vs/libpdcurses/wincon/tuidemo.exe +/vs/libpdcurses/wincon/testcurs.exe +/vs/libpdcurses/wincon/rain.exe +/vs/libpdcurses/wincon/ptest.exe +/vs/libpdcurses/wincon/pdcurses.lib +/vs/libpdcurses/wincon/ozdemo.exe +/vs/libpdcurses/wincon/firework.exe +/vs/libpdcurses/wincon/xmas.exe +/vs/libpdcurses/wincon/worm.exe +/vs/libpdcurses/wincon/tuidemo.exe +/vs/libpdcurses/wincon/testcurs.exe +/vs/libpdcurses/wincon/rain.exe +/vs/libpdcurses/wincon/ptest.exe +/vs/libpdcurses/wincon/pdcurses.lib +/vs/libpdcurses/wincon/ozdemo.exe +/vs/libpdcurses/wincon/firework.exe +/vs/libpdcurses/wincon/xmas.exe +/vs/libpdcurses/wincon/worm.exe +/vs/libpdcurses/wincon/tuidemo.exe +/vs/libpdcurses/wincon/testcurs.exe +/vs/libpdcurses/wincon/rain.exe +/vs/libpdcurses/wincon/ptest.exe +/vs/libpdcurses/wincon/pdcurses.lib +/vs/libpdcurses/wincon/ozdemo.exe +/vs/libpdcurses/wincon/firework.exe .vscode/settings.json -vs2015/freetype/objs +vs/freetype/objs diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index 2703e9f09..5a77e2bd6 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -19,13 +19,13 @@ "${workspaceFolder}/src/hardware/snd_pc98/sound/getsnd", "${workspaceFolder}/src/hardware/snd_pc98/x11", "${workspaceFolder}/src/mt32", - "${workspaceFolder}/vs2015", - "${workspaceFolder}/vs2015/libpdcurses", - "${workspaceFolder}/vs2015/libpng", - "${workspaceFolder}/vs2015/pcap", - "${workspaceFolder}/vs2015/sdl/include", - "${workspaceFolder}/vs2015/sdlnet", - "${workspaceFolder}/vs2015/zlib" + "${workspaceFolder}/vs", + "${workspaceFolder}/vs/libpdcurses", + "${workspaceFolder}/vs/libpng", + "${workspaceFolder}/vs/pcap", + "${workspaceFolder}/vs/sdl/include", + "${workspaceFolder}/vs/sdlnet", + "${workspaceFolder}/vs/zlib" ], "defines": [ "_DEBUG", @@ -59,13 +59,13 @@ "${workspaceFolder}/src/hardware/snd_pc98/sound/getsnd", "${workspaceFolder}/src/hardware/snd_pc98/x11", "${workspaceFolder}/src/mt32", - "${workspaceFolder}/vs2015", - "${workspaceFolder}/vs2015/libpdcurses", - "${workspaceFolder}/vs2015/libpng", - "${workspaceFolder}/vs2015/pcap", - "${workspaceFolder}/vs2015/sdl/include", - "${workspaceFolder}/vs2015/sdlnet", - "${workspaceFolder}/vs2015/zlib" + "${workspaceFolder}/vs", + "${workspaceFolder}/vs/libpdcurses", + "${workspaceFolder}/vs/libpng", + "${workspaceFolder}/vs/pcap", + "${workspaceFolder}/vs/sdl/include", + "${workspaceFolder}/vs/sdlnet", + "${workspaceFolder}/vs/zlib" ], "defines": [ "_MBCS", @@ -98,13 +98,13 @@ "${workspaceFolder}/src/hardware/snd_pc98/sound/getsnd", "${workspaceFolder}/src/hardware/snd_pc98/x11", "${workspaceFolder}/src/mt32", - "${workspaceFolder}/vs2015", - "${workspaceFolder}/vs2015/libpdcurses", - "${workspaceFolder}/vs2015/libpng", - "${workspaceFolder}/vs2015/pcap", - "${workspaceFolder}/vs2015/sdl2/include", - "${workspaceFolder}/vs2015/sdlnet", - "${workspaceFolder}/vs2015/zlib" + "${workspaceFolder}/vs", + "${workspaceFolder}/vs/libpdcurses", + "${workspaceFolder}/vs/libpng", + "${workspaceFolder}/vs/pcap", + "${workspaceFolder}/vs/sdl2/include", + "${workspaceFolder}/vs/sdlnet", + "${workspaceFolder}/vs/zlib" ], "defines": [ "_DEBUG", @@ -138,13 +138,13 @@ "${workspaceFolder}/src/hardware/snd_pc98/sound/getsnd", "${workspaceFolder}/src/hardware/snd_pc98/x11", "${workspaceFolder}/src/mt32", - "${workspaceFolder}/vs2015", - "${workspaceFolder}/vs2015/libpdcurses", - "${workspaceFolder}/vs2015/libpng", - "${workspaceFolder}/vs2015/pcap", - "${workspaceFolder}/vs2015/sdl2/include", - "${workspaceFolder}/vs2015/sdlnet", - "${workspaceFolder}/vs2015/zlib" + "${workspaceFolder}/vs", + "${workspaceFolder}/vs/libpdcurses", + "${workspaceFolder}/vs/libpng", + "${workspaceFolder}/vs/pcap", + "${workspaceFolder}/vs/sdl2/include", + "${workspaceFolder}/vs/sdlnet", + "${workspaceFolder}/vs/zlib" ], "defines": [ "_MBCS", @@ -178,13 +178,13 @@ "${workspaceFolder}/src/hardware/snd_pc98/x11", "${workspaceFolder}/src/hardware/opl3duoboard", "${workspaceFolder}/src/mt32", - "${workspaceFolder}/vs2015", - "${workspaceFolder}/vs2015/libpdcurses", - "${workspaceFolder}/vs2015/libpng", - "${workspaceFolder}/vs2015/pcap", - "${workspaceFolder}/vs2015/sdl/include", - "${workspaceFolder}/vs2015/sdlnet", - "${workspaceFolder}/vs2015/zlib" + "${workspaceFolder}/vs", + "${workspaceFolder}/vs/libpdcurses", + "${workspaceFolder}/vs/libpng", + "${workspaceFolder}/vs/pcap", + "${workspaceFolder}/vs/sdl/include", + "${workspaceFolder}/vs/sdlnet", + "${workspaceFolder}/vs/zlib" ], "defines": [ "_DEBUG", @@ -219,13 +219,13 @@ "${workspaceFolder}/src/hardware/snd_pc98/x11", "${workspaceFolder}/src/hardware/opl3duoboard", "${workspaceFolder}/src/mt32", - "${workspaceFolder}/vs2015", - "${workspaceFolder}/vs2015/libpdcurses", - "${workspaceFolder}/vs2015/libpng", - "${workspaceFolder}/vs2015/pcap", - "${workspaceFolder}/vs2015/sdl/include", - "${workspaceFolder}/vs2015/sdlnet", - "${workspaceFolder}/vs2015/zlib" + "${workspaceFolder}/vs", + "${workspaceFolder}/vs/libpdcurses", + "${workspaceFolder}/vs/libpng", + "${workspaceFolder}/vs/pcap", + "${workspaceFolder}/vs/sdl/include", + "${workspaceFolder}/vs/sdlnet", + "${workspaceFolder}/vs/zlib" ], "defines": [ "_DEBUG", diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 09b647f97..fa07ff4e5 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -12,7 +12,7 @@ "/p:Configuration=Debug", "/p:Platform=Win32", "/t:build", - "vs2015/dosbox-x.sln" + "vs/dosbox-x.sln" ], "group": { "kind": "build", @@ -32,7 +32,7 @@ "/p:Configuration=Debug", "/p:Platform=x64", "/t:build", - "vs2015/dosbox-x.sln" + "vs/dosbox-x.sln" ], "group": "build", "presentation": { @@ -49,7 +49,7 @@ "/p:Configuration=Release", "/p:Platform=Win32", "/t:build", - "vs2015/dosbox-x.sln" + "vs/dosbox-x.sln" ], "group": "build", "presentation": { @@ -66,7 +66,7 @@ "/p:Configuration=Release", "/p:Platform=x64", "/t:build", - "vs2015/dosbox-x.sln" + "vs/dosbox-x.sln" ], "group": "build", "presentation": { @@ -83,7 +83,7 @@ "/p:Configuration='Debug SDL2'", "/p:Platform=Win32", "/t:build", - "vs2015/dosbox-x.sln" + "vs/dosbox-x.sln" ], "group": "build", "presentation": { @@ -100,7 +100,7 @@ "/p:Configuration='Debug SDL2'", "/p:Platform=x64", "/t:build", - "vs2015/dosbox-x.sln" + "vs/dosbox-x.sln" ], "group": "build", "presentation": { @@ -117,7 +117,7 @@ "/p:Configuration='Release SDL2'", "/p:Platform=Win32", "/t:build", - "vs2015/dosbox-x.sln" + "vs/dosbox-x.sln" ], "group": "build", "presentation": { @@ -134,7 +134,7 @@ "/p:Configuration='Release SDL2'", "/p:Platform=x64", "/t:build", - "vs2015/dosbox-x.sln" + "vs/dosbox-x.sln" ], "group": "build", "presentation": { diff --git a/BUILD.md b/BUILD.md index 93418ca53..774d7d372 100644 --- a/BUILD.md +++ b/BUILD.md @@ -161,7 +161,7 @@ Compiling the source code using Visual Studio (Windows) You can build the source code with Visual Studio (2015, 2017, 2019). The executables will work on 32-bit and 64-bit Windows Vista or higher. -Use the ```./vs2015/dosbox-x.sln``` "solution" file and build the source code. +Use the ```./vs/dosbox-x.sln``` "solution" file and build the source code. You will need the DirectX 2010 SDK for Direct3D9 support. By default the targeted platform is v142 (Visual Studio 2019). diff --git a/README.development-in-Windows b/README.development-in-Windows index 9e02be60b..efcedde2d 100644 --- a/README.development-in-Windows +++ b/README.development-in-Windows @@ -49,7 +49,7 @@ Setting up the environment from scratch - download the DirectX SDK (June 2010) from https://www.microsoft.com/en-us/download/details.aspx?id=6812 - launch the installer and follow the instructions - if you encounter error S1023 during installation, follow the instructions at https://support.microsoft.com/en-us/help/2728613/s1023-error-when-you-install-the-directx-sdk-june-2010 -- open the DOSBox-X Visual Studio solution located in 'vs2015' folder of the repository +- open the DOSBox-X Visual Studio solution located in 'vs' folder of the repository - for debugging, you might want to change 'Working Directory' default value of $(ProjectDir) to $(TargetDir) Note that Visual Studio must be closed prior installing the DirectX SDK, else it won't pick up environment variables set by the DirectX SDK and this will result in building errors. diff --git a/README.keyboard-layout-handling b/README.keyboard-layout-handling index e45d4f96b..f023ce5cf 100644 --- a/README.keyboard-layout-handling +++ b/README.keyboard-layout-handling @@ -21,7 +21,7 @@ https://dosbox-x.com/wiki Below is the source code that handles the keyboard layouts. VK_* mapping in SDL1 (Windows): -- vs2015/sdl/src/video/windib/SDL_dibevents.c: DIB_InitOSKeymapPriv() +- vs/sdl/src/video/windib/SDL_dibevents.c: DIB_InitOSKeymapPriv() DOSBox-X keyboard layout enum: - include/keymap.h (DKM_*) constants diff --git a/acinclude.m4 b/acinclude.m4 index 1b1bd3a27..329ed6bb1 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -27,9 +27,9 @@ AC_ARG_ENABLE(sdl2, [ --enable-sdl2 Enable SDL 2.x], fi fi - if test -x vs2015/sdl2/linux-host/bin/sdl2-config ; then - SDL2_CONFIG=vs2015/sdl2/linux-host/bin/sdl2-config - PATH=vs2015/sdl2/linux-host/bin:$PATH + if test -x vs/sdl2/linux-host/bin/sdl2-config ; then + SDL2_CONFIG=vs/sdl2/linux-host/bin/sdl2-config + PATH=vs/sdl2/linux-host/bin:$PATH fi AC_PATH_PROG(SDL2_CONFIG, sdl2-config, no) @@ -82,9 +82,9 @@ AC_ARG_ENABLE(sdl, [ --enable-sdl Enable SDL 1.x], fi fi - if test -x vs2015/sdl/linux-host/bin/sdl-config ; then - SDL_CONFIG=vs2015/sdl/linux-host/bin/sdl-config - PATH=vs2015/sdl/linux-host/bin:$PATH + if test -x vs/sdl/linux-host/bin/sdl-config ; then + SDL_CONFIG=vs/sdl/linux-host/bin/sdl-config + PATH=vs/sdl/linux-host/bin:$PATH fi AC_PATH_PROG(SDL_CONFIG, sdl-config, no) diff --git a/appveyor.yml b/appveyor.yml index 6183d4b2e..0b1842fbb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,15 +17,15 @@ platform: configuration: Release build: - project: vs2015\dosbox-x.sln + project: vs\dosbox-x.sln after_build: - ps : >- $shortHash = $env:APPVEYOR_REPO_COMMIT.Substring(0, 7); - 7z a dosbox-x-windows-$shortHash.zip C:\projects\dosbox-x\vs2015\..\bin\x64\Release\changelog.txt; - 7z a dosbox-x-windows-$shortHash.zip C:\projects\dosbox-x\vs2015\..\bin\x64\Release\dosbox-x.reference.conf; - 7z a dosbox-x-windows-$shortHash.zip C:\projects\dosbox-x\vs2015\..\bin\x64\Release\dosbox-x.exe; - 7z a dosbox-x-windows-$shortHash.zip C:\projects\dosbox-x\vs2015\..\bin\x64\Release\FREECG98.BMP; + 7z a dosbox-x-windows-$shortHash.zip C:\projects\dosbox-x\vs\..\bin\x64\Release\changelog.txt; + 7z a dosbox-x-windows-$shortHash.zip C:\projects\dosbox-x\vs\..\bin\x64\Release\dosbox-x.reference.conf; + 7z a dosbox-x-windows-$shortHash.zip C:\projects\dosbox-x\vs\..\bin\x64\Release\dosbox-x.exe; + 7z a dosbox-x-windows-$shortHash.zip C:\projects\dosbox-x\vs\..\bin\x64\Release\FREECG98.BMP; #---------------------------------# # artifacts configuration # diff --git a/build b/build index 85359c345..799dd0cfd 100755 --- a/build +++ b/build @@ -6,15 +6,15 @@ ./autogen.sh || exit 1 # fix -chmod +x vs2015/sdl/build-scripts/strip_fPIC.sh +chmod +x vs/sdl/build-scripts/strip_fPIC.sh # prefer to compile against our own copy of SDL 1.x echo Compiling our internal SDL 1.x -(cd vs2015/sdl && ./build-dosbox.sh) || exit 1 +(cd vs/sdl && ./build-dosbox.sh) || exit 1 # prefer to compile against our own copy of SDLnet 1.x echo Compiling our internal SDLnet 1.x -(cd vs2015/sdlnet && ./build-dosbox.sh) || exit 1 +(cd vs/sdlnet && ./build-dosbox.sh) || exit 1 # now compile ourself echo Compiling DOSBox-X diff --git a/build-debug b/build-debug index 8db6601e4..8c6693622 100755 --- a/build-debug +++ b/build-debug @@ -24,15 +24,15 @@ fi ./autogen.sh || exit 1 # fix -chmod +x vs2015/sdl/build-scripts/strip_fPIC.sh +chmod +x vs/sdl/build-scripts/strip_fPIC.sh # prefer to compile against our own copy of SDL 1.x echo Compiling our internal SDL 1.x -(cd vs2015/sdl && ./build-dosbox.sh) || exit 1 +(cd vs/sdl && ./build-dosbox.sh) || exit 1 # prefer to compile against our own copy of SDLnet 1.x echo Compiling our internal SDLnet 1.x -(cd vs2015/sdlnet && ./build-dosbox.sh) || exit 1 +(cd vs/sdlnet && ./build-dosbox.sh) || exit 1 # now compile ourself echo Compiling DOSBox-X diff --git a/build-debug-g3 b/build-debug-g3 index 100bc9ab4..28a4482b7 100755 --- a/build-debug-g3 +++ b/build-debug-g3 @@ -13,7 +13,7 @@ fi ./autogen.sh || exit 1 # fix -chmod +x vs2015/sdl/build-scripts/strip_fPIC.sh +chmod +x vs/sdl/build-scripts/strip_fPIC.sh chmod +x configure @@ -22,11 +22,11 @@ export CXXFLAGS="$CXXFLAGS -g3 -O0 -fno-inline -fno-omit-frame-pointer" # prefer to compile against our own copy of SDL 1.x echo Compiling our internal SDL 1.x -(cd vs2015/sdl && ./build-dosbox.sh) || exit 1 +(cd vs/sdl && ./build-dosbox.sh) || exit 1 # prefer to compile against our own copy of SDLnet 1.x echo Compiling our internal SDLnet 1.x -(cd vs2015/sdlnet && ./build-dosbox.sh) || exit 1 +(cd vs/sdlnet && ./build-dosbox.sh) || exit 1 # now compile ourself echo Compiling DOSBox-X diff --git a/build-debug-g3-sdl2 b/build-debug-g3-sdl2 index 18771f00c..3135b86a5 100755 --- a/build-debug-g3-sdl2 +++ b/build-debug-g3-sdl2 @@ -13,7 +13,7 @@ fi ./autogen.sh || exit 1 # fix -chmod +x vs2015/sdl/build-scripts/strip_fPIC.sh +chmod +x vs/sdl/build-scripts/strip_fPIC.sh chmod +x configure @@ -28,12 +28,12 @@ else fi if test -z "$x" ; then echo Compiling our internal SDL 2.x - (cd vs2015/sdl2 && ./build-dosbox.sh) || exit 1 + (cd vs/sdl2 && ./build-dosbox.sh) || exit 1 fi # prefer to compile against our own copy of SDLnet 1.x echo Compiling our internal SDLnet 1.x -(cd vs2015/sdlnet && ./build-dosbox.sh) || exit 1 +(cd vs/sdlnet && ./build-dosbox.sh) || exit 1 # NTS: --disable-dynamic-core is needed. the dynamic core doesn't work properly with the CFLAGS given above ./configure --enable-core-inline --enable-debug=heavy --prefix=/usr --disable-dynamic-core --enable-sdl2 "$@" || exit 1 diff --git a/build-debug-gcc-prof b/build-debug-gcc-prof index 0a32e5bbd..e04e030a5 100755 --- a/build-debug-gcc-prof +++ b/build-debug-gcc-prof @@ -17,15 +17,15 @@ export CFLAGS="$CFLAGS -pg -fprofile-arcs" export CXXFLAGS="$CXXFLAGS -pg -fprofile-arcs" # fix -chmod +x vs2015/sdl/build-scripts/strip_fPIC.sh +chmod +x vs/sdl/build-scripts/strip_fPIC.sh # prefer to compile against our own copy of SDL 1.x echo Compiling our internal SDL 1.x -(cd vs2015/sdl && ./build-dosbox.sh) || exit 1 +(cd vs/sdl && ./build-dosbox.sh) || exit 1 # prefer to compile against our own copy of SDLnet 1.x echo Compiling our internal SDLnet 1.x -(cd vs2015/sdlnet && ./build-dosbox.sh) || exit 1 +(cd vs/sdlnet && ./build-dosbox.sh) || exit 1 # now compile ourself echo Compiling DOSBox-X diff --git a/build-debug-macosx b/build-debug-macosx index 99359ee1d..4302c8191 100755 --- a/build-debug-macosx +++ b/build-debug-macosx @@ -10,23 +10,23 @@ top=`pwd` if test -z "$top" ; then exit 1; fi # fix -chmod +x vs2015/sdl/build-scripts/strip_fPIC.sh +chmod +x vs/sdl/build-scripts/strip_fPIC.sh # prefer to compile against our own copy of SDL 1.x echo Compiling our internal SDL 1.x -(cd vs2015/sdl && ./build-dosbox.sh) || exit 1 +(cd vs/sdl && ./build-dosbox.sh) || exit 1 # FIXME: SDLnet will compile a static library that targets a foreign architecture, # and then ld will complain about it???????? # prefer to compile against our own copy of SDLnet 1.x #echo Compiling our internal SDLnet 1.x -#(cd vs2015/sdlnet && ./build-dosbox.sh) || exit 1 +#(cd vs/sdlnet && ./build-dosbox.sh) || exit 1 # perfer to compile against our own zlib echo Compiling our internal zlib -(cd vs2015/zlib && ./build-dosbox.sh) || exit 1 -new="-I$top/vs2015/zlib/linux-host/include " -nld="-L$top/vs2015/zlib/linux-host/lib " +(cd vs/zlib && ./build-dosbox.sh) || exit 1 +new="-I$top/vs/zlib/linux-host/include " +nld="-L$top/vs/zlib/linux-host/lib " export CFLAGS="$new$CFLAGS -g3" export LDFLAGS="$nld$LDFLAGS -g3" export CPPFLAGS="$new$CPPFLAGS -g3" @@ -34,9 +34,9 @@ export CXXFLAGS="$new$CXXFLAGS -g3" # perfer to compile against our own libpng (comment this out to disable) echo Compiling our internal libpng -(cd vs2015/libpng && ./build-dosbox.sh) || exit 1 -new="-I$top/vs2015/libpng/linux-host/include " -nld="-L$top/vs2015/libpng/linux-host/lib " +(cd vs/libpng && ./build-dosbox.sh) || exit 1 +new="-I$top/vs/libpng/linux-host/include " +nld="-L$top/vs/libpng/linux-host/lib " export CFLAGS="$new$CFLAGS -g3" export LDFLAGS="$nld$LDFLAGS -g3" export CPPFLAGS="$new$CPPFLAGS -g3" @@ -44,9 +44,9 @@ export CXXFLAGS="$new$CXXFLAGS -g3" # perfer to compile against our own freetype echo Compiling our internal freetype -(cd vs2015/freetype && ./build-dosbox.sh) || exit 1 -new="-I$top/vs2015/freetype/linux-host/include/freetype2 " -nld="-L$top/vs2015/freetype/linux-host/lib -lfreetype " +(cd vs/freetype && ./build-dosbox.sh) || exit 1 +new="-I$top/vs/freetype/linux-host/include/freetype2 " +nld="-L$top/vs/freetype/linux-host/lib -lfreetype " export CFLAGS="$new$CFLAGS -g3 " export LDFLAGS="$nld$LDFLAGS -g3" export CPPFLAGS="$new$CPPFLAGS -g3 " diff --git a/build-debug-macosx-sdl2 b/build-debug-macosx-sdl2 index 6ef704960..bfd664c77 100755 --- a/build-debug-macosx-sdl2 +++ b/build-debug-macosx-sdl2 @@ -10,20 +10,20 @@ top=`pwd` if test -z "$top" ; then exit 1; fi # fix -chmod +x vs2015/sdl/build-scripts/strip_fPIC.sh +chmod +x vs/sdl/build-scripts/strip_fPIC.sh # prefer to compile against our own copy of SDL 2.x IF the system does not provide one #x=`which sdl2-config` #if test -z "$x" ; then echo Compiling our internal SDL 2.x - (cd vs2015/sdl2 && ./build-dosbox.sh) || exit 1 + (cd vs/sdl2 && ./build-dosbox.sh) || exit 1 #fi # perfer to compile against our own zlib echo Compiling our internal zlib -(cd vs2015/zlib && ./build-dosbox.sh) || exit 1 -new="-I$top/vs2015/zlib/linux-host/include " -nld="-L$top/vs2015/zlib/linux-host/lib " +(cd vs/zlib && ./build-dosbox.sh) || exit 1 +new="-I$top/vs/zlib/linux-host/include " +nld="-L$top/vs/zlib/linux-host/lib " export CFLAGS="$new$CFLAGS -g3" export LDFLAGS="$nld$LDFLAGS -g3" export CPPFLAGS="$new$CPPFLAGS -g3" @@ -31,9 +31,9 @@ export CXXFLAGS="$new$CXXFLAGS -g3" # perfer to compile against our own libpng (comment this out to disable) echo Compiling our internal libpng -(cd vs2015/libpng && ./build-dosbox.sh) || exit 1 -new="-I$top/vs2015/libpng/linux-host/include " -nld="-L$top/vs2015/libpng/linux-host/lib " +(cd vs/libpng && ./build-dosbox.sh) || exit 1 +new="-I$top/vs/libpng/linux-host/include " +nld="-L$top/vs/libpng/linux-host/lib " export CFLAGS="$new$CFLAGS -g3" export LDFLAGS="$nld$LDFLAGS -g3" export CPPFLAGS="$new$CPPFLAGS -g3" @@ -41,9 +41,9 @@ export CXXFLAGS="$new$CXXFLAGS -g3" # perfer to compile against our own freetype echo Compiling our internal freetype -(cd vs2015/freetype && ./build-dosbox.sh) || exit 1 -new="-I$top/vs2015/freetype/linux-host/include/freetype2 " -nld="-L$top/vs2015/freetype/linux-host/lib -lfreetype " +(cd vs/freetype && ./build-dosbox.sh) || exit 1 +new="-I$top/vs/freetype/linux-host/include/freetype2 " +nld="-L$top/vs/freetype/linux-host/lib -lfreetype " export CFLAGS="$new$CFLAGS -g3" export LDFLAGS="$nld$LDFLAGS -g3" export CPPFLAGS="$new$CPPFLAGS -g3" diff --git a/build-debug-sdl2 b/build-debug-sdl2 index 879c48f8a..5a2db24bc 100755 --- a/build-debug-sdl2 +++ b/build-debug-sdl2 @@ -15,7 +15,7 @@ fi ./autogen.sh || exit 1 # fix -chmod +x vs2015/sdl/build-scripts/strip_fPIC.sh +chmod +x vs/sdl/build-scripts/strip_fPIC.sh # prefer to compile against our own copy of SDL 2.x IF the system does not provide one if [[ "$no_host_sdl2" ]]; then @@ -25,12 +25,12 @@ else fi if test -z "$x" ; then echo Compiling our internal SDL 2.x - (cd vs2015/sdl2 && ./build-dosbox.sh) || exit 1 + (cd vs/sdl2 && ./build-dosbox.sh) || exit 1 fi # prefer to compile against our own copy of SDLnet 1.x echo Compiling our internal SDLnet 1.x -(cd vs2015/sdlnet && ./build-dosbox.sh) || exit 1 +(cd vs/sdlnet && ./build-dosbox.sh) || exit 1 chmod +x configure ./configure --enable-core-inline --enable-debug=heavy --prefix=/usr --enable-sdl2 "$@" $opt || exit 1 diff --git a/build-debug-with-clang b/build-debug-with-clang index f33d1ad72..a28b81e88 100755 --- a/build-debug-with-clang +++ b/build-debug-with-clang @@ -19,15 +19,15 @@ fi ./autogen.sh || exit 1 # fix -chmod +x vs2015/sdl/build-scripts/strip_fPIC.sh +chmod +x vs/sdl/build-scripts/strip_fPIC.sh # prefer to compile against our own copy of SDL 1.x echo Compiling our internal SDL 1.x -(cd vs2015/sdl && ./build-dosbox.sh) || exit 1 +(cd vs/sdl && ./build-dosbox.sh) || exit 1 # prefer to compile against our own copy of SDLnet 1.x echo Compiling our internal SDLnet 1.x -(cd vs2015/sdlnet && ./build-dosbox.sh) || exit 1 +(cd vs/sdlnet && ./build-dosbox.sh) || exit 1 # now compile ourself echo Compiling DOSBox-X diff --git a/build-emscripten-sdl2 b/build-emscripten-sdl2 index 98d595347..d611db019 100755 --- a/build-emscripten-sdl2 +++ b/build-emscripten-sdl2 @@ -22,7 +22,7 @@ top=`pwd` if test -z "$top" ; then exit 1; fi # fix -chmod +x vs2015/sdl/build-scripts/strip_fPIC.sh +chmod +x vs/sdl/build-scripts/strip_fPIC.sh echo Compiling DOSBox-X chmod +x configure @@ -36,5 +36,5 @@ chmod +x configure make -j6 || exit 1 cd src; -emcc -DEMSCRIPTEN=1 -s USE_ZLIB=1 -s TOTAL_MEMORY=95551488 -s ASYNCIFY -s ERROR_ON_UNDEFINED_SYMBOLS=0 -std=gnu++14 -Os -DFORCE_SDLDRAW -Wall -Wextra -Wunused -pedantic -Wlogical-op -Wsign-promo -Wconversion-null -Wno-deprecated-declarations -Wno-implicit-fallthrough -Wno-strict-aliasing -Wno-missing-field-initializers -Wno-format-zero-length -Wno-address-of-packed-member -Wno-int-to-void-pointer-cast -I/home/rossimo/dosbox-x -I/home/rossimo/dosbox-x/vs2015/sdlnet/linux-host/include -I/home/rossimo/dosbox-x/vs2015/sdlnet/linux-host/include/SDL -L/home/rossimo/dosbox-x/vs2015/sdlnet/linux-host/lib -o dosbox-x.html dosbox.o debug/libdebug.a dos/libdos.a shell/libshell.a builtin/libbuiltin.a ints/libints.a misc/libmisc.a hardware/serialport/libserial.a hardware/parport/libparallel.a libs/porttalk/libporttalk.a gui/libgui.a libs/gui_tk/libgui_tk.a hardware/libhardware.a cpu/libcpu.a hardware/reSID/libresid.a fpu/libfpu.a gui/libgui.a output/liboutput.a hardware/mame/libmame.a libs/zmbv/libzmbv.a libs/decoders/internal/libopusint.a -s USE_SDL=2 -lz ; +emcc -DEMSCRIPTEN=1 -s USE_ZLIB=1 -s TOTAL_MEMORY=95551488 -s ASYNCIFY -s ERROR_ON_UNDEFINED_SYMBOLS=0 -std=gnu++14 -Os -DFORCE_SDLDRAW -Wall -Wextra -Wunused -pedantic -Wlogical-op -Wsign-promo -Wconversion-null -Wno-deprecated-declarations -Wno-implicit-fallthrough -Wno-strict-aliasing -Wno-missing-field-initializers -Wno-format-zero-length -Wno-address-of-packed-member -Wno-int-to-void-pointer-cast -I/home/rossimo/dosbox-x -I/home/rossimo/dosbox-x/vs/sdlnet/linux-host/include -I/home/rossimo/dosbox-x/vs/sdlnet/linux-host/include/SDL -L/home/rossimo/dosbox-x/vs/sdlnet/linux-host/lib -o dosbox-x.html dosbox.o debug/libdebug.a dos/libdos.a shell/libshell.a builtin/libbuiltin.a ints/libints.a misc/libmisc.a hardware/serialport/libserial.a hardware/parport/libparallel.a libs/porttalk/libporttalk.a gui/libgui.a libs/gui_tk/libgui_tk.a hardware/libhardware.a cpu/libcpu.a hardware/reSID/libresid.a fpu/libfpu.a gui/libgui.a output/liboutput.a hardware/mame/libmame.a libs/zmbv/libzmbv.a libs/decoders/internal/libopusint.a -s USE_SDL=2 -lz ; cd .. \ No newline at end of file diff --git a/build-macosx b/build-macosx index 1db216a55..7d88a3516 100755 --- a/build-macosx +++ b/build-macosx @@ -10,23 +10,23 @@ top=`pwd` if test -z "$top" ; then exit 1; fi # fix -chmod +x vs2015/sdl/build-scripts/strip_fPIC.sh +chmod +x vs/sdl/build-scripts/strip_fPIC.sh # prefer to compile against our own copy of SDL 1.x echo Compiling our internal SDL 1.x -(cd vs2015/sdl && ./build-dosbox.sh) || exit 1 +(cd vs/sdl && ./build-dosbox.sh) || exit 1 # FIXME: SDLnet will compile a static library that targets a foreign architecture, # and then ld will complain about it???????? # prefer to compile against our own copy of SDLnet 1.x #echo Compiling our internal SDLnet 1.x -#(cd vs2015/sdlnet && ./build-dosbox.sh) || exit 1 +#(cd vs/sdlnet && ./build-dosbox.sh) || exit 1 # perfer to compile against our own zlib echo Compiling our internal zlib -(cd vs2015/zlib && ./build-dosbox.sh) || exit 1 -new="-I$top/vs2015/zlib/linux-host/include " -nld="-L$top/vs2015/zlib/linux-host/lib " +(cd vs/zlib && ./build-dosbox.sh) || exit 1 +new="-I$top/vs/zlib/linux-host/include " +nld="-L$top/vs/zlib/linux-host/lib " export CFLAGS="$new$CFLAGS" export LDFLAGS="$nld$LDFLAGS" export CPPFLAGS="$new$CPPFLAGS" @@ -34,9 +34,9 @@ export CXXFLAGS="$new$CXXFLAGS" # perfer to compile against our own libpng (comment this out to disable) echo Compiling our internal libpng -(cd vs2015/libpng && ./build-dosbox.sh) || exit 1 -new="-I$top/vs2015/libpng/linux-host/include " -nld="-L$top/vs2015/libpng/linux-host/lib " +(cd vs/libpng && ./build-dosbox.sh) || exit 1 +new="-I$top/vs/libpng/linux-host/include " +nld="-L$top/vs/libpng/linux-host/lib " export CFLAGS="$new$CFLAGS" export LDFLAGS="$nld$LDFLAGS" export CPPFLAGS="$new$CPPFLAGS" @@ -44,9 +44,9 @@ export CXXFLAGS="$new$CXXFLAGS" # perfer to compile against our own freetype echo Compiling our internal freetype -(cd vs2015/freetype && ./build-dosbox.sh) || exit 1 -new="-I$top/vs2015/freetype/linux-host/include/freetype2 " -nld="-L$top/vs2015/freetype/linux-host/lib -lfreetype " +(cd vs/freetype && ./build-dosbox.sh) || exit 1 +new="-I$top/vs/freetype/linux-host/include/freetype2 " +nld="-L$top/vs/freetype/linux-host/lib -lfreetype " export CFLAGS="$new$CFLAGS" export LDFLAGS="$nld$LDFLAGS" export CPPFLAGS="$new$CPPFLAGS" diff --git a/build-macosx-sdl2 b/build-macosx-sdl2 index c9465fb4d..abc12ffa1 100755 --- a/build-macosx-sdl2 +++ b/build-macosx-sdl2 @@ -10,20 +10,20 @@ top=`pwd` if test -z "$top" ; then exit 1; fi # fix -chmod +x vs2015/sdl/build-scripts/strip_fPIC.sh +chmod +x vs/sdl/build-scripts/strip_fPIC.sh # prefer to compile against our own copy of SDL 2.x IF the system does not provide one #x=`which sdl2-config` #if test -z "$x" ; then echo Compiling our internal SDL 2.x - (cd vs2015/sdl2 && ./build-dosbox.sh) || exit 1 + (cd vs/sdl2 && ./build-dosbox.sh) || exit 1 #fi # perfer to compile against our own zlib echo Compiling our internal zlib -(cd vs2015/zlib && ./build-dosbox.sh) || exit 1 -new="-I$top/vs2015/zlib/linux-host/include " -nld="-L$top/vs2015/zlib/linux-host/lib " +(cd vs/zlib && ./build-dosbox.sh) || exit 1 +new="-I$top/vs/zlib/linux-host/include " +nld="-L$top/vs/zlib/linux-host/lib " export CFLAGS="$new$CFLAGS" export LDFLAGS="$nld$LDFLAGS" export CPPFLAGS="$new$CPPFLAGS" @@ -31,9 +31,9 @@ export CXXFLAGS="$new$CXXFLAGS" # perfer to compile against our own libpng (comment this out to disable) echo Compiling our internal libpng -(cd vs2015/libpng && ./build-dosbox.sh) || exit 1 -new="-I$top/vs2015/libpng/linux-host/include " -nld="-L$top/vs2015/libpng/linux-host/lib " +(cd vs/libpng && ./build-dosbox.sh) || exit 1 +new="-I$top/vs/libpng/linux-host/include " +nld="-L$top/vs/libpng/linux-host/lib " export CFLAGS="$new$CFLAGS" export LDFLAGS="$nld$LDFLAGS" export CPPFLAGS="$new$CPPFLAGS" @@ -41,9 +41,9 @@ export CXXFLAGS="$new$CXXFLAGS" # perfer to compile against our own freetype echo Compiling our internal freetype -(cd vs2015/freetype && ./build-dosbox.sh) || exit 1 -new="-I$top/vs2015/freetype/linux-host/include/freetype2 " -nld="-L$top/vs2015/freetype/linux-host/lib -lfreetype " +(cd vs/freetype && ./build-dosbox.sh) || exit 1 +new="-I$top/vs/freetype/linux-host/include/freetype2 " +nld="-L$top/vs/freetype/linux-host/lib -lfreetype " export CFLAGS="$new$CFLAGS" export LDFLAGS="$nld$LDFLAGS" export CPPFLAGS="$new$CPPFLAGS" diff --git a/build-mingw b/build-mingw index 6022e410a..b661ccb18 100644 --- a/build-mingw +++ b/build-mingw @@ -10,28 +10,28 @@ top=`pwd` if test -z "$top" ; then exit 1; fi # fix -chmod +x vs2015/sdl/build-scripts/strip_fPIC.sh +chmod +x vs/sdl/build-scripts/strip_fPIC.sh # prefer to compile against our own copy of SDL 1.x echo Compiling our internal SDL 1.x -(cd vs2015/sdl && ./build-dosbox.sh) || exit 1 +(cd vs/sdl && ./build-dosbox.sh) || exit 1 # prefer to compile against our own copy of SDLnet 1.x echo Compiling our internal SDLnet 1.x -(cd vs2015/sdlnet && ./build-dosbox.sh) || exit 1 +(cd vs/sdlnet && ./build-dosbox.sh) || exit 1 # MinGW cannot compile SDL_net, configure goes off trying to autogen # prefer to compile against our own copy of SDLnet 1.x #echo Compiling our internal SDLnet 1.x -#(cd vs2015/sdlnet && ./build-dosbox.sh) || exit 1 +#(cd vs/sdlnet && ./build-dosbox.sh) || exit 1 # NTS: MinGW provides zlib for us if false; then # perfer to compile against our own zlib echo Compiling our internal zlib - (cd vs2015/zlib && ./build-dosbox.sh) || exit 1 - new="-I$top/vs2015/zlib/linux-host/include " - nld="-L$top/vs2015/zlib/linux-host/lib " + (cd vs/zlib && ./build-dosbox.sh) || exit 1 + new="-I$top/vs/zlib/linux-host/include " + nld="-L$top/vs/zlib/linux-host/lib " export CFLAGS="$new$CFLAGS" export LDFLAGS="$nld$LDFLAGS" export CPPFLAGS="$new$CPPFLAGS" @@ -40,9 +40,9 @@ fi # perfer to compile against our own libpng (comment this out to disable) echo Compiling our internal libpng -(cd vs2015/libpng && ./build-dosbox.sh) || exit 1 -new="-I$top/vs2015/libpng/linux-host/include " -nld="-L$top/vs2015/libpng/linux-host/lib " +(cd vs/libpng && ./build-dosbox.sh) || exit 1 +new="-I$top/vs/libpng/linux-host/include " +nld="-L$top/vs/libpng/linux-host/lib " export CFLAGS="$new$CFLAGS" export LDFLAGS="$nld$LDFLAGS" export CPPFLAGS="$new$CPPFLAGS" @@ -50,9 +50,9 @@ export CXXFLAGS="$new$CXXFLAGS" # perfer to compile against our own freetype echo Compiling our internal freetype -(cd vs2015/freetype && ./build-dosbox.sh) || exit 1 -new="-I$top/vs2015/freetype/linux-host/include/freetype2 " -nld="-L$top/vs2015/freetype/linux-host/lib -lfreetype " +(cd vs/freetype && ./build-dosbox.sh) || exit 1 +new="-I$top/vs/freetype/linux-host/include/freetype2 " +nld="-L$top/vs/freetype/linux-host/lib -lfreetype " export CFLAGS="$new$CFLAGS" export LDFLAGS="$nld$LDFLAGS" export CPPFLAGS="$new$CPPFLAGS" diff --git a/build-mingw-hx-dos b/build-mingw-hx-dos index 168add407..19999a7ad 100644 --- a/build-mingw-hx-dos +++ b/build-mingw-hx-dos @@ -10,19 +10,19 @@ top=`pwd` if test -z "$top" ; then exit 1; fi # fix -chmod +x vs2015/sdl/build-scripts/strip_fPIC.sh +chmod +x vs/sdl/build-scripts/strip_fPIC.sh # prefer to compile against our own copy of SDL 1.x echo Compiling our internal SDL 1.x -(cd vs2015/sdl && ./build-dosbox.sh hx-dos) || exit 1 +(cd vs/sdl && ./build-dosbox.sh hx-dos) || exit 1 # NTS: MinGW provides zlib for us if false; then # perfer to compile against our own zlib echo Compiling our internal zlib - (cd vs2015/zlib && ./build-dosbox.sh) || exit 1 - new="-I$top/vs2015/zlib/linux-host/include " - nld="-L$top/vs2015/zlib/linux-host/lib " + (cd vs/zlib && ./build-dosbox.sh) || exit 1 + new="-I$top/vs/zlib/linux-host/include " + nld="-L$top/vs/zlib/linux-host/lib " export CFLAGS="$new$CFLAGS" export LDFLAGS="$nld$LDFLAGS" export CPPFLAGS="$new$CPPFLAGS" @@ -31,9 +31,9 @@ fi # perfer to compile against our own libpng (comment this out to disable) echo Compiling our internal libpng -(cd vs2015/libpng && ./build-dosbox.sh) || exit 1 -new="-I$top/vs2015/libpng/linux-host/include " -nld="-L$top/vs2015/libpng/linux-host/lib " +(cd vs/libpng && ./build-dosbox.sh) || exit 1 +new="-I$top/vs/libpng/linux-host/include " +nld="-L$top/vs/libpng/linux-host/lib " export CFLAGS="$new$CFLAGS" export LDFLAGS="$nld$LDFLAGS" export CPPFLAGS="$new$CPPFLAGS" @@ -41,9 +41,9 @@ export CXXFLAGS="$new$CXXFLAGS" # perfer to compile against our own freetype echo Compiling our internal freetype -(cd vs2015/freetype && ./build-dosbox.sh) || exit 1 -new="-I$top/vs2015/freetype/linux-host/include/freetype2 " -nld="-L$top/vs2015/freetype/linux-host/lib -lfreetype " +(cd vs/freetype && ./build-dosbox.sh) || exit 1 +new="-I$top/vs/freetype/linux-host/include/freetype2 " +nld="-L$top/vs/freetype/linux-host/lib -lfreetype " export CFLAGS="$new$CFLAGS" export LDFLAGS="$nld$LDFLAGS" export CPPFLAGS="$new$CPPFLAGS" diff --git a/build-mingw-lowend b/build-mingw-lowend index 5f15f046b..996d565c1 100644 --- a/build-mingw-lowend +++ b/build-mingw-lowend @@ -10,23 +10,23 @@ top=`pwd` if test -z "$top" ; then exit 1; fi # fix -chmod +x vs2015/sdl/build-scripts/strip_fPIC.sh +chmod +x vs/sdl/build-scripts/strip_fPIC.sh # prefer to compile against our own copy of SDL 1.x echo Compiling our internal SDL 1.x -(cd vs2015/sdl && ./build-dosbox.sh) || exit 1 +(cd vs/sdl && ./build-dosbox.sh) || exit 1 # prefer to compile against our own copy of SDLnet 1.x echo Compiling our internal SDLnet 1.x -(cd vs2015/sdlnet && ./build-dosbox.sh) || exit 1 +(cd vs/sdlnet && ./build-dosbox.sh) || exit 1 # NTS: MinGW provides zlib for us if false; then # perfer to compile against our own zlib echo Compiling our internal zlib - (cd vs2015/zlib && ./build-dosbox.sh) || exit 1 - new="-I$top/vs2015/zlib/linux-host/include " - nld="-L$top/vs2015/zlib/linux-host/lib " + (cd vs/zlib && ./build-dosbox.sh) || exit 1 + new="-I$top/vs/zlib/linux-host/include " + nld="-L$top/vs/zlib/linux-host/lib " export CFLAGS="$new$CFLAGS" export LDFLAGS="$nld$LDFLAGS" export CPPFLAGS="$new$CPPFLAGS" @@ -35,9 +35,9 @@ fi # perfer to compile against our own libpng (comment this out to disable) echo Compiling our internal libpng -(cd vs2015/libpng && ./build-dosbox.sh) || exit 1 -new="-I$top/vs2015/libpng/linux-host/include " -nld="-L$top/vs2015/libpng/linux-host/lib " +(cd vs/libpng && ./build-dosbox.sh) || exit 1 +new="-I$top/vs/libpng/linux-host/include " +nld="-L$top/vs/libpng/linux-host/lib " export CFLAGS="$new$CFLAGS" export LDFLAGS="$nld$LDFLAGS" export CPPFLAGS="$new$CPPFLAGS" @@ -45,9 +45,9 @@ export CXXFLAGS="$new$CXXFLAGS" # perfer to compile against our own freetype echo Compiling our internal freetype -(cd vs2015/freetype && ./build-dosbox.sh) || exit 1 -new="-I$top/vs2015/freetype/linux-host/include/freetype2 " -nld="-L$top/vs2015/freetype/linux-host/lib -lfreetype " +(cd vs/freetype && ./build-dosbox.sh) || exit 1 +new="-I$top/vs/freetype/linux-host/include/freetype2 " +nld="-L$top/vs/freetype/linux-host/lib -lfreetype " export CFLAGS="$new$CFLAGS" export LDFLAGS="$nld$LDFLAGS" export CPPFLAGS="$new$CPPFLAGS" diff --git a/build-mingw-sdl2 b/build-mingw-sdl2 index 518fad825..59638970e 100644 --- a/build-mingw-sdl2 +++ b/build-mingw-sdl2 @@ -10,26 +10,26 @@ top=`pwd` if test -z "$top" ; then exit 1; fi # fix -chmod +x vs2015/sdl/build-scripts/strip_fPIC.sh +chmod +x vs/sdl/build-scripts/strip_fPIC.sh # prefer to compile against our own copy of SDL 2.x IF the system does not provide one x=`which sdl2-config` if test -z "$x" ; then echo Compiling our internal SDL 2.x - (cd vs2015/sdl2 && ./build-dosbox.sh) || exit 1 + (cd vs/sdl2 && ./build-dosbox.sh) || exit 1 fi # prefer to compile against our own copy of SDLnet 1.x echo Compiling our internal SDLnet 1.x -(cd vs2015/sdlnet && ./build-dosbox.sh) || exit 1 +(cd vs/sdlnet && ./build-dosbox.sh) || exit 1 # NTS: MinGW provides zlib for us if false; then # perfer to compile against our own zlib echo Compiling our internal zlib - (cd vs2015/zlib && ./build-dosbox.sh) || exit 1 - new="-I$top/vs2015/zlib/linux-host/include " - nld="-L$top/vs2015/zlib/linux-host/lib " + (cd vs/zlib && ./build-dosbox.sh) || exit 1 + new="-I$top/vs/zlib/linux-host/include " + nld="-L$top/vs/zlib/linux-host/lib " export CFLAGS="$new$CFLAGS" export LDFLAGS="$nld$LDFLAGS" export CPPFLAGS="$new$CPPFLAGS" @@ -38,9 +38,9 @@ fi # perfer to compile against our own libpng (comment this out to disable) echo Compiling our internal libpng -(cd vs2015/libpng && ./build-dosbox.sh) || exit 1 -new="-I$top/vs2015/libpng/linux-host/include " -nld="-L$top/vs2015/libpng/linux-host/lib " +(cd vs/libpng && ./build-dosbox.sh) || exit 1 +new="-I$top/vs/libpng/linux-host/include " +nld="-L$top/vs/libpng/linux-host/lib " export CFLAGS="$new$CFLAGS" export LDFLAGS="$nld$LDFLAGS" export CPPFLAGS="$new$CPPFLAGS" @@ -48,9 +48,9 @@ export CXXFLAGS="$new$CXXFLAGS" # perfer to compile against our own freetype echo Compiling our internal freetype -(cd vs2015/freetype && ./build-dosbox.sh) || exit 1 -new="-I$top/vs2015/freetype/linux-host/include/freetype2 " -nld="-L$top/vs2015/freetype/linux-host/lib -lfreetype " +(cd vs/freetype && ./build-dosbox.sh) || exit 1 +new="-I$top/vs/freetype/linux-host/include/freetype2 " +nld="-L$top/vs/freetype/linux-host/lib -lfreetype " export CFLAGS="$new$CFLAGS" export LDFLAGS="$nld$LDFLAGS" export CPPFLAGS="$new$CPPFLAGS" diff --git a/build-mingw-sdldraw b/build-mingw-sdldraw index 9af0b98c1..382b1325d 100644 --- a/build-mingw-sdldraw +++ b/build-mingw-sdldraw @@ -10,23 +10,23 @@ top=`pwd` if test -z "$top" ; then exit 1; fi # fix -chmod +x vs2015/sdl/build-scripts/strip_fPIC.sh +chmod +x vs/sdl/build-scripts/strip_fPIC.sh # prefer to compile against our own copy of SDL 1.x echo Compiling our internal SDL 1.x -(cd vs2015/sdl && ./build-dosbox.sh) || exit 1 +(cd vs/sdl && ./build-dosbox.sh) || exit 1 # prefer to compile against our own copy of SDLnet 1.x echo Compiling our internal SDLnet 1.x -(cd vs2015/sdlnet && ./build-dosbox.sh) || exit 1 +(cd vs/sdlnet && ./build-dosbox.sh) || exit 1 # NTS: MinGW provides zlib for us if false; then # perfer to compile against our own zlib echo Compiling our internal zlib - (cd vs2015/zlib && ./build-dosbox.sh) || exit 1 - new="-I$top/vs2015/zlib/linux-host/include " - nld="-L$top/vs2015/zlib/linux-host/lib " + (cd vs/zlib && ./build-dosbox.sh) || exit 1 + new="-I$top/vs/zlib/linux-host/include " + nld="-L$top/vs/zlib/linux-host/lib " export CFLAGS="$new$CFLAGS" export LDFLAGS="$nld$LDFLAGS" export CPPFLAGS="$new$CPPFLAGS" @@ -35,9 +35,9 @@ fi # perfer to compile against our own libpng (comment this out to disable) echo Compiling our internal libpng -(cd vs2015/libpng && ./build-dosbox.sh) || exit 1 -new="-I$top/vs2015/libpng/linux-host/include " -nld="-L$top/vs2015/libpng/linux-host/lib " +(cd vs/libpng && ./build-dosbox.sh) || exit 1 +new="-I$top/vs/libpng/linux-host/include " +nld="-L$top/vs/libpng/linux-host/lib " export CFLAGS="$new$CFLAGS" export LDFLAGS="$nld$LDFLAGS" export CPPFLAGS="$new$CPPFLAGS" @@ -45,9 +45,9 @@ export CXXFLAGS="$new$CXXFLAGS" # perfer to compile against our own freetype echo Compiling our internal freetype -(cd vs2015/freetype && ./build-dosbox.sh) || exit 1 -new="-I$top/vs2015/freetype/linux-host/include/freetype2 " -nld="-L$top/vs2015/freetype/linux-host/lib -lfreetype " +(cd vs/freetype && ./build-dosbox.sh) || exit 1 +new="-I$top/vs/freetype/linux-host/include/freetype2 " +nld="-L$top/vs/freetype/linux-host/lib -lfreetype " export CFLAGS="$new$CFLAGS" export LDFLAGS="$nld$LDFLAGS" export CPPFLAGS="$new$CPPFLAGS" diff --git a/build-scripts/mingw/make.exe b/build-scripts/mingw/make.exe new file mode 100644 index 000000000..060a686e0 Binary files /dev/null and b/build-scripts/mingw/make.exe differ diff --git a/build_sdl1_xinput_flavor.bat b/build_sdl1_xinput_flavor.bat index 2d1bd13a8..324df9f1b 100644 --- a/build_sdl1_xinput_flavor.bat +++ b/build_sdl1_xinput_flavor.bat @@ -1,6 +1,6 @@ @echo off pushd -cd vs2015 +cd vs set SDL1AdditionalOptions=/DSDL_JOYSTICK_XINPUT msbuild dosbox-x.sln /p:Configuration=Release /p:Platform=Win32 msbuild dosbox-x.sln /p:Configuration=Release /p:Platform=x64 diff --git a/configure.ac b/configure.ac index bac92493b..b1f6c5ff2 100644 --- a/configure.ac +++ b/configure.ac @@ -433,10 +433,10 @@ fi pwd=`realpath $srcdir` if [[ -z "$pwd" ]]; then pwd=`pwd`; fi -CFLAGS="$CFLAGS -I$pwd -I$pwd/vs2015/sdlnet/linux-host/include -I$pwd/vs2015/sdlnet/linux-host/include/SDL" -LDFLAGS="$LDFLAGS -L$pwd/vs2015/sdlnet/linux-host/lib" -CPPFLAGS="$CPPFLAGS -I$pwd -I$pwd/vs2015/sdlnet/linux-host/include -I$pwd/vs2015/sdlnet/linux-host/include/SDL" -CXXFLAGS="$CXXFLAGS -I$pwd -I$pwd/vs2015/sdlnet/linux-host/include -I$pwd/vs2015/sdlnet/linux-host/include/SDL" +CFLAGS="$CFLAGS -I$pwd -I$pwd/vs/sdlnet/linux-host/include -I$pwd/vs/sdlnet/linux-host/include/SDL" +LDFLAGS="$LDFLAGS -L$pwd/vs/sdlnet/linux-host/lib" +CPPFLAGS="$CPPFLAGS -I$pwd -I$pwd/vs/sdlnet/linux-host/include -I$pwd/vs/sdlnet/linux-host/include/SDL" +CXXFLAGS="$CXXFLAGS -I$pwd -I$pwd/vs/sdlnet/linux-host/include -I$pwd/vs/sdlnet/linux-host/include/SDL" if test x$enable_emscripten != xyes; then dnl Some target detection and actions for them @@ -990,8 +990,8 @@ dnl FEATURE: Whether to use libpcap, and enable ethernet passthrough AH_TEMPLATE(C_PCAP,[Define to 1 to enable ethernet passthrough, requires libpcap]) case "$host" in *-*-cygwin* | *-*-mingw32*) - CFLAGS="$CFLAGS -I$pwd/vs2015/pcap" - CXXFLAGS="$CXXFLAGS -I$pwd/vs2015/pcap" + CFLAGS="$CFLAGS -I$pwd/vs/pcap" + CXXFLAGS="$CXXFLAGS -I$pwd/vs/pcap" AC_DEFINE(C_PCAP,1) ;; *) @@ -1179,7 +1179,7 @@ if test x$enable_emscripten != xyes; then case "$host" in *-*-cygwin* | *-*-mingw32*) if test x$have_slirp = xyes; then - LIBS="$LIBS -lole32" + LIBS="$LIBS -luuid -lole32" fi LIBS="$LIBS -lwsock32 -lws2_32 -liphlpapi -lshlwapi" if test x$enable_freetype = xyes; then @@ -1231,5 +1231,5 @@ AC_OUTPUT # HACK: it's a script... chmod +x make-rpm.sh -# HACK: Write all PACKAGE defines to vs2015/config_package.h so Windows builds are kept in sync -grep -E 'PACKAGE|VERSION' config.h > $srcdir/vs2015/config_package.h +# HACK: Write all PACKAGE defines to vs/config_package.h so Windows builds are kept in sync +grep -E 'PACKAGE|VERSION' config.h > $srcdir/vs/config_package.h diff --git a/contrib/linux/com.dosbox_x.DOSBox-X.yaml b/contrib/linux/com.dosbox_x.DOSBox-X.yaml index fe9f48f5a..98e905df6 100644 --- a/contrib/linux/com.dosbox_x.DOSBox-X.yaml +++ b/contrib/linux/com.dosbox_x.DOSBox-X.yaml @@ -74,7 +74,7 @@ modules: buildsystem: simple build-commands: # We need to first build the included (modified) SDL1, otherwise the build will fail - - cd vs2015/sdl ; ./build-dosbox.sh + - cd vs/sdl ; ./build-dosbox.sh # Build the SDL1 debugger enabled version of DOSBox-X - ./build-debug - make bindir=/app/bin prefix=/app install diff --git a/include/SDL_cdrom.h b/include/SDL_cdrom.h index 69eca9ab4..7d40fa688 100644 --- a/include/SDL_cdrom.h +++ b/include/SDL_cdrom.h @@ -1,5 +1,5 @@ #if defined(C_SDL2) -#include "vs2015/sdl/src/cdrom/compat_SDL_cdrom.h" +#include "vs/sdl/src/cdrom/compat_SDL_cdrom.h" #else -#include "vs2015/sdl/include/SDL_cdrom.h" +#include "vs/sdl/include/SDL_cdrom.h" #endif \ No newline at end of file diff --git a/make-windows-release.pl b/make-windows-release.pl index 697f12097..c69fd4518 100644 --- a/make-windows-release.pl +++ b/make-windows-release.pl @@ -2,7 +2,7 @@ my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(); my $datestr = sprintf("%04u%02u%02u%02u%02u%02u",$year+1900,$mon+1,$mday,$hour,$min,$sec); -my $ziptool = "vs2015/tool/zip.exe"; +my $ziptool = "vs/tool/zip.exe"; my $subdir="release/windows"; diff --git a/ref-nmake/deps/pdcurses b/ref-nmake/deps/pdcurses index f7772ad4e..3ab25a6b4 100644 --- a/ref-nmake/deps/pdcurses +++ b/ref-nmake/deps/pdcurses @@ -4,7 +4,7 @@ LD = link LIBR = lib WINDRES = rc -PDCURSES = ..\..\vs2015\libpdcurses +PDCURSES = ..\..\vs\libpdcurses CXXFLAGS = -nologo -O2 -MT -DNDEBUG -I$(PDCURSES) diff --git a/ref-nmake/deps/png b/ref-nmake/deps/png index 0da43e32c..739253929 100644 --- a/ref-nmake/deps/png +++ b/ref-nmake/deps/png @@ -4,9 +4,9 @@ LD = link LIBR = lib WINDRES = rc -ZLIB = ..\..\vs2015\zlib +ZLIB = ..\..\vs\zlib -LPNG = ..\..\vs2015\libpng +LPNG = ..\..\vs\libpng CXXFLAGS = -nologo -O2 -MT -DNDEBUG -I$(ZLIB) diff --git a/ref-nmake/deps/sdl b/ref-nmake/deps/sdl index 4f49a1a8f..f739e6ef1 100644 --- a/ref-nmake/deps/sdl +++ b/ref-nmake/deps/sdl @@ -4,7 +4,7 @@ LD = link LIBR = lib WINDRES = rc -SDLDIR = ..\..\vs2015\sdl +SDLDIR = ..\..\vs\sdl CXXFLAGS = -nologo -O2 -MT -DNDEBUG -DNO_STDIO_REDIRECT -D_WIN32_WINNT=0x0501 -I$(SDLDIR)\include diff --git a/ref-nmake/deps/zlib b/ref-nmake/deps/zlib index 86c9b4059..fa0411427 100644 --- a/ref-nmake/deps/zlib +++ b/ref-nmake/deps/zlib @@ -13,7 +13,7 @@ LFLAGS = -nologo TARGET = z.lib -ZLIB = ..\..\vs2015\zlib +ZLIB = ..\..\vs\zlib OBJS = $(ZLIB)\adler32.obj \ $(ZLIB)\compress.obj \ diff --git a/src/dos/cdrom.cpp b/src/dos/cdrom.cpp index 5976b0d2d..adde819d8 100644 --- a/src/dos/cdrom.cpp +++ b/src/dos/cdrom.cpp @@ -30,23 +30,23 @@ #include "cdrom.h" #if defined(C_SDL2) -#include "../../vs2015/sdl/src/cdrom/compat_SDL_cdrom.c" +#include "../../vs/sdl/src/cdrom/compat_SDL_cdrom.c" #if defined(WIN32) #define SDL_CDROM_WIN32 -#include "../../vs2015/sdl/src/cdrom/win32/SDL_syscdrom.c" +#include "../../vs/sdl/src/cdrom/win32/SDL_syscdrom.c" #elif defined(LINUX) #define SDL_CDROM_LINUX -#include "../../vs2015/sdl/src/cdrom/linux/SDL_syscdrom.c" +#include "../../vs/sdl/src/cdrom/linux/SDL_syscdrom.c" #elif defined(MACOSX) #define SDL_CDROM_MACOSX -#include "../../vs2015/sdl/src/cdrom/macosx/SDL_syscdrom.c" -#include "../../vs2015/sdl/src/cdrom/macosx/AudioFilePlayer.c" -#include "../../vs2015/sdl/src/cdrom/macosx/AudioFileReaderThread.c" -#include "../../vs2015/sdl/src/cdrom/macosx/CDPlayer.c" -#include "../../vs2015/sdl/src/cdrom/macosx/SDLOSXCAGuard.c" +#include "../../vs/sdl/src/cdrom/macosx/SDL_syscdrom.c" +#include "../../vs/sdl/src/cdrom/macosx/AudioFilePlayer.c" +#include "../../vs/sdl/src/cdrom/macosx/AudioFileReaderThread.c" +#include "../../vs/sdl/src/cdrom/macosx/CDPlayer.c" +#include "../../vs/sdl/src/cdrom/macosx/SDLOSXCAGuard.c" #else #define SDL_CDROM_DUMMY -#include "../../vs2015/sdl/src/cdrom/dummy/SDL_syscdrom.c" +#include "../../vs/sdl/src/cdrom/dummy/SDL_syscdrom.c" #endif #endif diff --git a/src/dos/cdrom.h b/src/dos/cdrom.h index f1dd06a9a..2b11ede9f 100644 --- a/src/dos/cdrom.h +++ b/src/dos/cdrom.h @@ -52,7 +52,7 @@ *(M) = value; \ } #define MSF_TO_FRAMES(M, S, F) ((M)*60*CD_FPS+(S)*CD_FPS+(F)) -#include "../../vs2015/sdl/src/cdrom/compat_SDL_cdrom.h" +#include "../../vs/sdl/src/cdrom/compat_SDL_cdrom.h" #endif /* C_SDL2 */ #define RAW_SECTOR_SIZE 2352 diff --git a/src/gui/sdl_mapper.cpp b/src/gui/sdl_mapper.cpp index 3c058eff0..991e36688 100644 --- a/src/gui/sdl_mapper.cpp +++ b/src/gui/sdl_mapper.cpp @@ -878,7 +878,7 @@ typedef char assert_right_size [MAX_SCANCODES == (sizeof(sdlkey_map)/sizeof(sdlk #elif defined (__linux__) #define MAX_SCANCODES 0x90 -#include "../../vs2015/sdl/include/SDL_keysym.h" +#include "../../vs/sdl/include/SDL_keysym.h" static SDLKey sdlkey_map[MAX_SCANCODES] = { // Convert hardware scancode (XKB = evdev + 8) to SDL virtual keycode /* Refer to https://chromium.googlesource.com/chromium/src/+/lkgr/ui/events/keycodes/keyboard_code_conversion_x.cc */ SDLK_UNKNOWN,//0x00 diff --git a/src/misc/savestates.cpp b/src/misc/savestates.cpp index 2a56a6ddc..c92656fbb 100644 --- a/src/misc/savestates.cpp +++ b/src/misc/savestates.cpp @@ -29,9 +29,9 @@ #include "zip.h" #include "unzip.h" #include "ioapi.h" -#include "vs2015/zlib/contrib/minizip/zip.c" -#include "vs2015/zlib/contrib/minizip/unzip.c" -#include "vs2015/zlib/contrib/minizip/ioapi.c" +#include "vs/zlib/contrib/minizip/zip.c" +#include "vs/zlib/contrib/minizip/unzip.c" +#include "vs/zlib/contrib/minizip/ioapi.c" #if !defined(HX_DOS) #include "../libs/tinyfiledialogs/tinyfiledialogs.h" #endif diff --git a/vs2015/Backup/dosbox-x.sln b/vs/Backup/dosbox-x.sln similarity index 100% rename from vs2015/Backup/dosbox-x.sln rename to vs/Backup/dosbox-x.sln diff --git a/vs2015/TESTING.ZIP b/vs/TESTING.ZIP similarity index 100% rename from vs2015/TESTING.ZIP rename to vs/TESTING.ZIP diff --git a/vs2015/UpgradeLog.htm b/vs/UpgradeLog.htm similarity index 100% rename from vs2015/UpgradeLog.htm rename to vs/UpgradeLog.htm diff --git a/vs2015/config.h b/vs/config.h similarity index 100% rename from vs2015/config.h rename to vs/config.h diff --git a/vs2015/config_package.h b/vs/config_package.h similarity index 100% rename from vs2015/config_package.h rename to vs/config_package.h diff --git a/vs2015/d3dx9.h b/vs/d3dx9.h similarity index 100% rename from vs2015/d3dx9.h rename to vs/d3dx9.h diff --git a/vs2015/d3dx9anim.h b/vs/d3dx9anim.h similarity index 100% rename from vs2015/d3dx9anim.h rename to vs/d3dx9anim.h diff --git a/vs2015/d3dx9core.h b/vs/d3dx9core.h similarity index 100% rename from vs2015/d3dx9core.h rename to vs/d3dx9core.h diff --git a/vs2015/d3dx9effect.h b/vs/d3dx9effect.h similarity index 100% rename from vs2015/d3dx9effect.h rename to vs/d3dx9effect.h diff --git a/vs2015/d3dx9math.h b/vs/d3dx9math.h similarity index 100% rename from vs2015/d3dx9math.h rename to vs/d3dx9math.h diff --git a/vs2015/d3dx9math.inl b/vs/d3dx9math.inl similarity index 100% rename from vs2015/d3dx9math.inl rename to vs/d3dx9math.inl diff --git a/vs2015/d3dx9mesh.h b/vs/d3dx9mesh.h similarity index 100% rename from vs2015/d3dx9mesh.h rename to vs/d3dx9mesh.h diff --git a/vs2015/d3dx9shader.h b/vs/d3dx9shader.h similarity index 100% rename from vs2015/d3dx9shader.h rename to vs/d3dx9shader.h diff --git a/vs2015/d3dx9shape.h b/vs/d3dx9shape.h similarity index 100% rename from vs2015/d3dx9shape.h rename to vs/d3dx9shape.h diff --git a/vs2015/d3dx9tex.h b/vs/d3dx9tex.h similarity index 100% rename from vs2015/d3dx9tex.h rename to vs/d3dx9tex.h diff --git a/vs2015/d3dx9xof.h b/vs/d3dx9xof.h similarity index 100% rename from vs2015/d3dx9xof.h rename to vs/d3dx9xof.h diff --git a/vs2015/dosbox-x.sln b/vs/dosbox-x.sln similarity index 100% rename from vs2015/dosbox-x.sln rename to vs/dosbox-x.sln diff --git a/vs2015/dosbox-x.suo b/vs/dosbox-x.suo similarity index 100% rename from vs2015/dosbox-x.suo rename to vs/dosbox-x.suo diff --git a/vs2015/dosbox-x.vcxproj b/vs/dosbox-x.vcxproj similarity index 100% rename from vs2015/dosbox-x.vcxproj rename to vs/dosbox-x.vcxproj diff --git a/vs2015/dosbox-x.vcxproj.filters b/vs/dosbox-x.vcxproj.filters similarity index 100% rename from vs2015/dosbox-x.vcxproj.filters rename to vs/dosbox-x.vcxproj.filters diff --git a/vs2015/extlib/x64/dxguid.lib b/vs/extlib/x64/dxguid.lib similarity index 100% rename from vs2015/extlib/x64/dxguid.lib rename to vs/extlib/x64/dxguid.lib diff --git a/vs2015/extlib/x86/dxguid.lib b/vs/extlib/x86/dxguid.lib similarity index 100% rename from vs2015/extlib/x86/dxguid.lib rename to vs/extlib/x86/dxguid.lib diff --git a/vs2015/freetype/CMakeLists.txt b/vs/freetype/CMakeLists.txt similarity index 100% rename from vs2015/freetype/CMakeLists.txt rename to vs/freetype/CMakeLists.txt diff --git a/vs2015/freetype/ChangeLog b/vs/freetype/ChangeLog similarity index 100% rename from vs2015/freetype/ChangeLog rename to vs/freetype/ChangeLog diff --git a/vs2015/freetype/ChangeLog.20 b/vs/freetype/ChangeLog.20 similarity index 100% rename from vs2015/freetype/ChangeLog.20 rename to vs/freetype/ChangeLog.20 diff --git a/vs2015/freetype/ChangeLog.21 b/vs/freetype/ChangeLog.21 similarity index 100% rename from vs2015/freetype/ChangeLog.21 rename to vs/freetype/ChangeLog.21 diff --git a/vs2015/freetype/ChangeLog.22 b/vs/freetype/ChangeLog.22 similarity index 100% rename from vs2015/freetype/ChangeLog.22 rename to vs/freetype/ChangeLog.22 diff --git a/vs2015/freetype/ChangeLog.23 b/vs/freetype/ChangeLog.23 similarity index 100% rename from vs2015/freetype/ChangeLog.23 rename to vs/freetype/ChangeLog.23 diff --git a/vs2015/freetype/ChangeLog.24 b/vs/freetype/ChangeLog.24 similarity index 100% rename from vs2015/freetype/ChangeLog.24 rename to vs/freetype/ChangeLog.24 diff --git a/vs2015/freetype/ChangeLog.25 b/vs/freetype/ChangeLog.25 similarity index 100% rename from vs2015/freetype/ChangeLog.25 rename to vs/freetype/ChangeLog.25 diff --git a/vs2015/freetype/ChangeLog.26 b/vs/freetype/ChangeLog.26 similarity index 100% rename from vs2015/freetype/ChangeLog.26 rename to vs/freetype/ChangeLog.26 diff --git a/vs2015/freetype/ChangeLog.27 b/vs/freetype/ChangeLog.27 similarity index 100% rename from vs2015/freetype/ChangeLog.27 rename to vs/freetype/ChangeLog.27 diff --git a/vs2015/freetype/ChangeLog.28 b/vs/freetype/ChangeLog.28 similarity index 100% rename from vs2015/freetype/ChangeLog.28 rename to vs/freetype/ChangeLog.28 diff --git a/vs2015/freetype/Jamfile b/vs/freetype/Jamfile similarity index 100% rename from vs2015/freetype/Jamfile rename to vs/freetype/Jamfile diff --git a/vs2015/freetype/Jamrules b/vs/freetype/Jamrules similarity index 100% rename from vs2015/freetype/Jamrules rename to vs/freetype/Jamrules diff --git a/vs2015/freetype/Makefile b/vs/freetype/Makefile similarity index 100% rename from vs2015/freetype/Makefile rename to vs/freetype/Makefile diff --git a/vs2015/freetype/README b/vs/freetype/README similarity index 100% rename from vs2015/freetype/README rename to vs/freetype/README diff --git a/vs2015/freetype/README.git b/vs/freetype/README.git similarity index 100% rename from vs2015/freetype/README.git rename to vs/freetype/README.git diff --git a/vs2015/freetype/autogen.sh b/vs/freetype/autogen.sh similarity index 100% rename from vs2015/freetype/autogen.sh rename to vs/freetype/autogen.sh diff --git a/vs2015/freetype/build-dosbox.sh b/vs/freetype/build-dosbox.sh similarity index 100% rename from vs2015/freetype/build-dosbox.sh rename to vs/freetype/build-dosbox.sh diff --git a/vs2015/freetype/builds/amiga/README b/vs/freetype/builds/amiga/README similarity index 100% rename from vs2015/freetype/builds/amiga/README rename to vs/freetype/builds/amiga/README diff --git a/vs2015/freetype/builds/amiga/include/config/ftconfig.h b/vs/freetype/builds/amiga/include/config/ftconfig.h similarity index 100% rename from vs2015/freetype/builds/amiga/include/config/ftconfig.h rename to vs/freetype/builds/amiga/include/config/ftconfig.h diff --git a/vs2015/freetype/builds/amiga/include/config/ftmodule.h b/vs/freetype/builds/amiga/include/config/ftmodule.h similarity index 100% rename from vs2015/freetype/builds/amiga/include/config/ftmodule.h rename to vs/freetype/builds/amiga/include/config/ftmodule.h diff --git a/vs2015/freetype/builds/amiga/makefile b/vs/freetype/builds/amiga/makefile similarity index 100% rename from vs2015/freetype/builds/amiga/makefile rename to vs/freetype/builds/amiga/makefile diff --git a/vs2015/freetype/builds/amiga/makefile.os4 b/vs/freetype/builds/amiga/makefile.os4 similarity index 100% rename from vs2015/freetype/builds/amiga/makefile.os4 rename to vs/freetype/builds/amiga/makefile.os4 diff --git a/vs2015/freetype/builds/amiga/smakefile b/vs/freetype/builds/amiga/smakefile similarity index 100% rename from vs2015/freetype/builds/amiga/smakefile rename to vs/freetype/builds/amiga/smakefile diff --git a/vs2015/freetype/builds/amiga/src/base/ftdebug.c b/vs/freetype/builds/amiga/src/base/ftdebug.c similarity index 100% rename from vs2015/freetype/builds/amiga/src/base/ftdebug.c rename to vs/freetype/builds/amiga/src/base/ftdebug.c diff --git a/vs2015/freetype/builds/amiga/src/base/ftsystem.c b/vs/freetype/builds/amiga/src/base/ftsystem.c similarity index 100% rename from vs2015/freetype/builds/amiga/src/base/ftsystem.c rename to vs/freetype/builds/amiga/src/base/ftsystem.c diff --git a/vs2015/freetype/builds/ansi/ansi-def.mk b/vs/freetype/builds/ansi/ansi-def.mk similarity index 100% rename from vs2015/freetype/builds/ansi/ansi-def.mk rename to vs/freetype/builds/ansi/ansi-def.mk diff --git a/vs2015/freetype/builds/ansi/ansi.mk b/vs/freetype/builds/ansi/ansi.mk similarity index 100% rename from vs2015/freetype/builds/ansi/ansi.mk rename to vs/freetype/builds/ansi/ansi.mk diff --git a/vs2015/freetype/builds/atari/ATARI.H b/vs/freetype/builds/atari/ATARI.H similarity index 100% rename from vs2015/freetype/builds/atari/ATARI.H rename to vs/freetype/builds/atari/ATARI.H diff --git a/vs2015/freetype/builds/atari/FNames.SIC b/vs/freetype/builds/atari/FNames.SIC similarity index 100% rename from vs2015/freetype/builds/atari/FNames.SIC rename to vs/freetype/builds/atari/FNames.SIC diff --git a/vs2015/freetype/builds/atari/FREETYPE.PRJ b/vs/freetype/builds/atari/FREETYPE.PRJ similarity index 100% rename from vs2015/freetype/builds/atari/FREETYPE.PRJ rename to vs/freetype/builds/atari/FREETYPE.PRJ diff --git a/vs2015/freetype/builds/atari/README.TXT b/vs/freetype/builds/atari/README.TXT similarity index 100% rename from vs2015/freetype/builds/atari/README.TXT rename to vs/freetype/builds/atari/README.TXT diff --git a/vs2015/freetype/builds/atari/deflinejoiner.awk b/vs/freetype/builds/atari/deflinejoiner.awk similarity index 100% rename from vs2015/freetype/builds/atari/deflinejoiner.awk rename to vs/freetype/builds/atari/deflinejoiner.awk diff --git a/vs2015/freetype/builds/atari/gen-purec-patch.sh b/vs/freetype/builds/atari/gen-purec-patch.sh similarity index 100% rename from vs2015/freetype/builds/atari/gen-purec-patch.sh rename to vs/freetype/builds/atari/gen-purec-patch.sh diff --git a/vs2015/freetype/builds/beos/beos-def.mk b/vs/freetype/builds/beos/beos-def.mk similarity index 100% rename from vs2015/freetype/builds/beos/beos-def.mk rename to vs/freetype/builds/beos/beos-def.mk diff --git a/vs2015/freetype/builds/beos/beos.mk b/vs/freetype/builds/beos/beos.mk similarity index 100% rename from vs2015/freetype/builds/beos/beos.mk rename to vs/freetype/builds/beos/beos.mk diff --git a/vs2015/freetype/builds/beos/detect.mk b/vs/freetype/builds/beos/detect.mk similarity index 100% rename from vs2015/freetype/builds/beos/detect.mk rename to vs/freetype/builds/beos/detect.mk diff --git a/vs2015/freetype/builds/cmake/FindHarfBuzz.cmake b/vs/freetype/builds/cmake/FindHarfBuzz.cmake similarity index 100% rename from vs2015/freetype/builds/cmake/FindHarfBuzz.cmake rename to vs/freetype/builds/cmake/FindHarfBuzz.cmake diff --git a/vs2015/freetype/builds/cmake/iOS.cmake b/vs/freetype/builds/cmake/iOS.cmake similarity index 100% rename from vs2015/freetype/builds/cmake/iOS.cmake rename to vs/freetype/builds/cmake/iOS.cmake diff --git a/vs2015/freetype/builds/cmake/testbuild.sh b/vs/freetype/builds/cmake/testbuild.sh similarity index 100% rename from vs2015/freetype/builds/cmake/testbuild.sh rename to vs/freetype/builds/cmake/testbuild.sh diff --git a/vs2015/freetype/builds/compiler/ansi-cc.mk b/vs/freetype/builds/compiler/ansi-cc.mk similarity index 100% rename from vs2015/freetype/builds/compiler/ansi-cc.mk rename to vs/freetype/builds/compiler/ansi-cc.mk diff --git a/vs2015/freetype/builds/compiler/bcc-dev.mk b/vs/freetype/builds/compiler/bcc-dev.mk similarity index 100% rename from vs2015/freetype/builds/compiler/bcc-dev.mk rename to vs/freetype/builds/compiler/bcc-dev.mk diff --git a/vs2015/freetype/builds/compiler/bcc.mk b/vs/freetype/builds/compiler/bcc.mk similarity index 100% rename from vs2015/freetype/builds/compiler/bcc.mk rename to vs/freetype/builds/compiler/bcc.mk diff --git a/vs2015/freetype/builds/compiler/emx.mk b/vs/freetype/builds/compiler/emx.mk similarity index 100% rename from vs2015/freetype/builds/compiler/emx.mk rename to vs/freetype/builds/compiler/emx.mk diff --git a/vs2015/freetype/builds/compiler/gcc-dev.mk b/vs/freetype/builds/compiler/gcc-dev.mk similarity index 100% rename from vs2015/freetype/builds/compiler/gcc-dev.mk rename to vs/freetype/builds/compiler/gcc-dev.mk diff --git a/vs2015/freetype/builds/compiler/gcc.mk b/vs/freetype/builds/compiler/gcc.mk similarity index 100% rename from vs2015/freetype/builds/compiler/gcc.mk rename to vs/freetype/builds/compiler/gcc.mk diff --git a/vs2015/freetype/builds/compiler/intelc.mk b/vs/freetype/builds/compiler/intelc.mk similarity index 100% rename from vs2015/freetype/builds/compiler/intelc.mk rename to vs/freetype/builds/compiler/intelc.mk diff --git a/vs2015/freetype/builds/compiler/unix-lcc.mk b/vs/freetype/builds/compiler/unix-lcc.mk similarity index 100% rename from vs2015/freetype/builds/compiler/unix-lcc.mk rename to vs/freetype/builds/compiler/unix-lcc.mk diff --git a/vs2015/freetype/builds/compiler/visualage.mk b/vs/freetype/builds/compiler/visualage.mk similarity index 100% rename from vs2015/freetype/builds/compiler/visualage.mk rename to vs/freetype/builds/compiler/visualage.mk diff --git a/vs2015/freetype/builds/compiler/visualc.mk b/vs/freetype/builds/compiler/visualc.mk similarity index 100% rename from vs2015/freetype/builds/compiler/visualc.mk rename to vs/freetype/builds/compiler/visualc.mk diff --git a/vs2015/freetype/builds/compiler/watcom.mk b/vs/freetype/builds/compiler/watcom.mk similarity index 100% rename from vs2015/freetype/builds/compiler/watcom.mk rename to vs/freetype/builds/compiler/watcom.mk diff --git a/vs2015/freetype/builds/compiler/win-lcc.mk b/vs/freetype/builds/compiler/win-lcc.mk similarity index 100% rename from vs2015/freetype/builds/compiler/win-lcc.mk rename to vs/freetype/builds/compiler/win-lcc.mk diff --git a/vs2015/freetype/builds/detect.mk b/vs/freetype/builds/detect.mk similarity index 100% rename from vs2015/freetype/builds/detect.mk rename to vs/freetype/builds/detect.mk diff --git a/vs2015/freetype/builds/dos/detect.mk b/vs/freetype/builds/dos/detect.mk similarity index 100% rename from vs2015/freetype/builds/dos/detect.mk rename to vs/freetype/builds/dos/detect.mk diff --git a/vs2015/freetype/builds/dos/dos-def.mk b/vs/freetype/builds/dos/dos-def.mk similarity index 100% rename from vs2015/freetype/builds/dos/dos-def.mk rename to vs/freetype/builds/dos/dos-def.mk diff --git a/vs2015/freetype/builds/dos/dos-emx.mk b/vs/freetype/builds/dos/dos-emx.mk similarity index 100% rename from vs2015/freetype/builds/dos/dos-emx.mk rename to vs/freetype/builds/dos/dos-emx.mk diff --git a/vs2015/freetype/builds/dos/dos-gcc.mk b/vs/freetype/builds/dos/dos-gcc.mk similarity index 100% rename from vs2015/freetype/builds/dos/dos-gcc.mk rename to vs/freetype/builds/dos/dos-gcc.mk diff --git a/vs2015/freetype/builds/dos/dos-wat.mk b/vs/freetype/builds/dos/dos-wat.mk similarity index 100% rename from vs2015/freetype/builds/dos/dos-wat.mk rename to vs/freetype/builds/dos/dos-wat.mk diff --git a/vs2015/freetype/builds/exports.mk b/vs/freetype/builds/exports.mk similarity index 100% rename from vs2015/freetype/builds/exports.mk rename to vs/freetype/builds/exports.mk diff --git a/vs2015/freetype/builds/freetype.mk b/vs/freetype/builds/freetype.mk similarity index 100% rename from vs2015/freetype/builds/freetype.mk rename to vs/freetype/builds/freetype.mk diff --git a/vs2015/freetype/builds/link_dos.mk b/vs/freetype/builds/link_dos.mk similarity index 100% rename from vs2015/freetype/builds/link_dos.mk rename to vs/freetype/builds/link_dos.mk diff --git a/vs2015/freetype/builds/link_std.mk b/vs/freetype/builds/link_std.mk similarity index 100% rename from vs2015/freetype/builds/link_std.mk rename to vs/freetype/builds/link_std.mk diff --git a/vs2015/freetype/builds/mac/FreeType.m68k_cfm.make.txt b/vs/freetype/builds/mac/FreeType.m68k_cfm.make.txt similarity index 100% rename from vs2015/freetype/builds/mac/FreeType.m68k_cfm.make.txt rename to vs/freetype/builds/mac/FreeType.m68k_cfm.make.txt diff --git a/vs2015/freetype/builds/mac/FreeType.m68k_far.make.txt b/vs/freetype/builds/mac/FreeType.m68k_far.make.txt similarity index 100% rename from vs2015/freetype/builds/mac/FreeType.m68k_far.make.txt rename to vs/freetype/builds/mac/FreeType.m68k_far.make.txt diff --git a/vs2015/freetype/builds/mac/FreeType.ppc_carbon.make.txt b/vs/freetype/builds/mac/FreeType.ppc_carbon.make.txt similarity index 100% rename from vs2015/freetype/builds/mac/FreeType.ppc_carbon.make.txt rename to vs/freetype/builds/mac/FreeType.ppc_carbon.make.txt diff --git a/vs2015/freetype/builds/mac/FreeType.ppc_classic.make.txt b/vs/freetype/builds/mac/FreeType.ppc_classic.make.txt similarity index 100% rename from vs2015/freetype/builds/mac/FreeType.ppc_classic.make.txt rename to vs/freetype/builds/mac/FreeType.ppc_classic.make.txt diff --git a/vs2015/freetype/builds/mac/README b/vs/freetype/builds/mac/README similarity index 100% rename from vs2015/freetype/builds/mac/README rename to vs/freetype/builds/mac/README diff --git a/vs2015/freetype/builds/mac/ascii2mpw.py b/vs/freetype/builds/mac/ascii2mpw.py similarity index 100% rename from vs2015/freetype/builds/mac/ascii2mpw.py rename to vs/freetype/builds/mac/ascii2mpw.py diff --git a/vs2015/freetype/builds/mac/freetype-Info.plist b/vs/freetype/builds/mac/freetype-Info.plist similarity index 100% rename from vs2015/freetype/builds/mac/freetype-Info.plist rename to vs/freetype/builds/mac/freetype-Info.plist diff --git a/vs2015/freetype/builds/mac/ftlib.prj.xml b/vs/freetype/builds/mac/ftlib.prj.xml similarity index 100% rename from vs2015/freetype/builds/mac/ftlib.prj.xml rename to vs/freetype/builds/mac/ftlib.prj.xml diff --git a/vs2015/freetype/builds/mac/ftmac.c b/vs/freetype/builds/mac/ftmac.c similarity index 100% rename from vs2015/freetype/builds/mac/ftmac.c rename to vs/freetype/builds/mac/ftmac.c diff --git a/vs2015/freetype/builds/modules.mk b/vs/freetype/builds/modules.mk similarity index 100% rename from vs2015/freetype/builds/modules.mk rename to vs/freetype/builds/modules.mk diff --git a/vs2015/freetype/builds/os2/detect.mk b/vs/freetype/builds/os2/detect.mk similarity index 100% rename from vs2015/freetype/builds/os2/detect.mk rename to vs/freetype/builds/os2/detect.mk diff --git a/vs2015/freetype/builds/os2/os2-def.mk b/vs/freetype/builds/os2/os2-def.mk similarity index 100% rename from vs2015/freetype/builds/os2/os2-def.mk rename to vs/freetype/builds/os2/os2-def.mk diff --git a/vs2015/freetype/builds/os2/os2-dev.mk b/vs/freetype/builds/os2/os2-dev.mk similarity index 100% rename from vs2015/freetype/builds/os2/os2-dev.mk rename to vs/freetype/builds/os2/os2-dev.mk diff --git a/vs2015/freetype/builds/os2/os2-gcc.mk b/vs/freetype/builds/os2/os2-gcc.mk similarity index 100% rename from vs2015/freetype/builds/os2/os2-gcc.mk rename to vs/freetype/builds/os2/os2-gcc.mk diff --git a/vs2015/freetype/builds/symbian/bld.inf b/vs/freetype/builds/symbian/bld.inf similarity index 100% rename from vs2015/freetype/builds/symbian/bld.inf rename to vs/freetype/builds/symbian/bld.inf diff --git a/vs2015/freetype/builds/symbian/freetype.mmp b/vs/freetype/builds/symbian/freetype.mmp similarity index 100% rename from vs2015/freetype/builds/symbian/freetype.mmp rename to vs/freetype/builds/symbian/freetype.mmp diff --git a/vs2015/freetype/builds/toplevel.mk b/vs/freetype/builds/toplevel.mk similarity index 100% rename from vs2015/freetype/builds/toplevel.mk rename to vs/freetype/builds/toplevel.mk diff --git a/vs2015/freetype/builds/unix/aclocal.m4 b/vs/freetype/builds/unix/aclocal.m4 similarity index 100% rename from vs2015/freetype/builds/unix/aclocal.m4 rename to vs/freetype/builds/unix/aclocal.m4 diff --git a/vs2015/freetype/builds/unix/config.guess b/vs/freetype/builds/unix/config.guess similarity index 100% rename from vs2015/freetype/builds/unix/config.guess rename to vs/freetype/builds/unix/config.guess diff --git a/vs2015/freetype/builds/unix/config.sub b/vs/freetype/builds/unix/config.sub similarity index 100% rename from vs2015/freetype/builds/unix/config.sub rename to vs/freetype/builds/unix/config.sub diff --git a/vs2015/freetype/builds/unix/configure b/vs/freetype/builds/unix/configure similarity index 100% rename from vs2015/freetype/builds/unix/configure rename to vs/freetype/builds/unix/configure diff --git a/vs2015/freetype/builds/unix/configure.ac b/vs/freetype/builds/unix/configure.ac similarity index 100% rename from vs2015/freetype/builds/unix/configure.ac rename to vs/freetype/builds/unix/configure.ac diff --git a/vs2015/freetype/builds/unix/configure.raw b/vs/freetype/builds/unix/configure.raw similarity index 100% rename from vs2015/freetype/builds/unix/configure.raw rename to vs/freetype/builds/unix/configure.raw diff --git a/vs2015/freetype/builds/unix/detect.mk b/vs/freetype/builds/unix/detect.mk similarity index 100% rename from vs2015/freetype/builds/unix/detect.mk rename to vs/freetype/builds/unix/detect.mk diff --git a/vs2015/freetype/builds/unix/freetype-config.in b/vs/freetype/builds/unix/freetype-config.in similarity index 100% rename from vs2015/freetype/builds/unix/freetype-config.in rename to vs/freetype/builds/unix/freetype-config.in diff --git a/vs2015/freetype/builds/unix/freetype2.in b/vs/freetype/builds/unix/freetype2.in similarity index 100% rename from vs2015/freetype/builds/unix/freetype2.in rename to vs/freetype/builds/unix/freetype2.in diff --git a/vs2015/freetype/builds/unix/freetype2.m4 b/vs/freetype/builds/unix/freetype2.m4 similarity index 100% rename from vs2015/freetype/builds/unix/freetype2.m4 rename to vs/freetype/builds/unix/freetype2.m4 diff --git a/vs2015/freetype/builds/unix/ft-munmap.m4 b/vs/freetype/builds/unix/ft-munmap.m4 similarity index 100% rename from vs2015/freetype/builds/unix/ft-munmap.m4 rename to vs/freetype/builds/unix/ft-munmap.m4 diff --git a/vs2015/freetype/builds/unix/ftconfig.in b/vs/freetype/builds/unix/ftconfig.in similarity index 100% rename from vs2015/freetype/builds/unix/ftconfig.in rename to vs/freetype/builds/unix/ftconfig.in diff --git a/vs2015/freetype/builds/unix/ftsystem.c b/vs/freetype/builds/unix/ftsystem.c similarity index 100% rename from vs2015/freetype/builds/unix/ftsystem.c rename to vs/freetype/builds/unix/ftsystem.c diff --git a/vs2015/freetype/builds/unix/install-sh b/vs/freetype/builds/unix/install-sh similarity index 100% rename from vs2015/freetype/builds/unix/install-sh rename to vs/freetype/builds/unix/install-sh diff --git a/vs2015/freetype/builds/unix/install.mk b/vs/freetype/builds/unix/install.mk similarity index 100% rename from vs2015/freetype/builds/unix/install.mk rename to vs/freetype/builds/unix/install.mk diff --git a/vs2015/freetype/builds/unix/ltmain.sh b/vs/freetype/builds/unix/ltmain.sh similarity index 100% rename from vs2015/freetype/builds/unix/ltmain.sh rename to vs/freetype/builds/unix/ltmain.sh diff --git a/vs2015/freetype/builds/unix/pkg.m4 b/vs/freetype/builds/unix/pkg.m4 similarity index 100% rename from vs2015/freetype/builds/unix/pkg.m4 rename to vs/freetype/builds/unix/pkg.m4 diff --git a/vs2015/freetype/builds/unix/unix-cc.in b/vs/freetype/builds/unix/unix-cc.in similarity index 100% rename from vs2015/freetype/builds/unix/unix-cc.in rename to vs/freetype/builds/unix/unix-cc.in diff --git a/vs2015/freetype/builds/unix/unix-def.in b/vs/freetype/builds/unix/unix-def.in similarity index 100% rename from vs2015/freetype/builds/unix/unix-def.in rename to vs/freetype/builds/unix/unix-def.in diff --git a/vs2015/freetype/builds/unix/unix-dev.mk b/vs/freetype/builds/unix/unix-dev.mk similarity index 100% rename from vs2015/freetype/builds/unix/unix-dev.mk rename to vs/freetype/builds/unix/unix-dev.mk diff --git a/vs2015/freetype/builds/unix/unix-lcc.mk b/vs/freetype/builds/unix/unix-lcc.mk similarity index 100% rename from vs2015/freetype/builds/unix/unix-lcc.mk rename to vs/freetype/builds/unix/unix-lcc.mk diff --git a/vs2015/freetype/builds/unix/unix.mk b/vs/freetype/builds/unix/unix.mk similarity index 100% rename from vs2015/freetype/builds/unix/unix.mk rename to vs/freetype/builds/unix/unix.mk diff --git a/vs2015/freetype/builds/unix/unixddef.mk b/vs/freetype/builds/unix/unixddef.mk similarity index 100% rename from vs2015/freetype/builds/unix/unixddef.mk rename to vs/freetype/builds/unix/unixddef.mk diff --git a/vs2015/freetype/builds/vms/ftconfig.h b/vs/freetype/builds/vms/ftconfig.h similarity index 100% rename from vs2015/freetype/builds/vms/ftconfig.h rename to vs/freetype/builds/vms/ftconfig.h diff --git a/vs2015/freetype/builds/vms/ftsystem.c b/vs/freetype/builds/vms/ftsystem.c similarity index 100% rename from vs2015/freetype/builds/vms/ftsystem.c rename to vs/freetype/builds/vms/ftsystem.c diff --git a/vs2015/freetype/builds/wince/ftdebug.c b/vs/freetype/builds/wince/ftdebug.c similarity index 100% rename from vs2015/freetype/builds/wince/ftdebug.c rename to vs/freetype/builds/wince/ftdebug.c diff --git a/vs2015/freetype/builds/wince/vc2005-ce/freetype.sln b/vs/freetype/builds/wince/vc2005-ce/freetype.sln similarity index 100% rename from vs2015/freetype/builds/wince/vc2005-ce/freetype.sln rename to vs/freetype/builds/wince/vc2005-ce/freetype.sln diff --git a/vs2015/freetype/builds/wince/vc2005-ce/freetype.vcproj b/vs/freetype/builds/wince/vc2005-ce/freetype.vcproj similarity index 100% rename from vs2015/freetype/builds/wince/vc2005-ce/freetype.vcproj rename to vs/freetype/builds/wince/vc2005-ce/freetype.vcproj diff --git a/vs2015/freetype/builds/wince/vc2005-ce/index.html b/vs/freetype/builds/wince/vc2005-ce/index.html similarity index 100% rename from vs2015/freetype/builds/wince/vc2005-ce/index.html rename to vs/freetype/builds/wince/vc2005-ce/index.html diff --git a/vs2015/freetype/builds/wince/vc2008-ce/freetype.sln b/vs/freetype/builds/wince/vc2008-ce/freetype.sln similarity index 100% rename from vs2015/freetype/builds/wince/vc2008-ce/freetype.sln rename to vs/freetype/builds/wince/vc2008-ce/freetype.sln diff --git a/vs2015/freetype/builds/wince/vc2008-ce/freetype.vcproj b/vs/freetype/builds/wince/vc2008-ce/freetype.vcproj similarity index 100% rename from vs2015/freetype/builds/wince/vc2008-ce/freetype.vcproj rename to vs/freetype/builds/wince/vc2008-ce/freetype.vcproj diff --git a/vs2015/freetype/builds/wince/vc2008-ce/index.html b/vs/freetype/builds/wince/vc2008-ce/index.html similarity index 100% rename from vs2015/freetype/builds/wince/vc2008-ce/index.html rename to vs/freetype/builds/wince/vc2008-ce/index.html diff --git a/vs2015/freetype/builds/windows/detect.mk b/vs/freetype/builds/windows/detect.mk similarity index 100% rename from vs2015/freetype/builds/windows/detect.mk rename to vs/freetype/builds/windows/detect.mk diff --git a/vs2015/freetype/builds/windows/ftdebug.c b/vs/freetype/builds/windows/ftdebug.c similarity index 100% rename from vs2015/freetype/builds/windows/ftdebug.c rename to vs/freetype/builds/windows/ftdebug.c diff --git a/vs2015/freetype/builds/windows/vc2005/freetype.sln b/vs/freetype/builds/windows/vc2005/freetype.sln similarity index 100% rename from vs2015/freetype/builds/windows/vc2005/freetype.sln rename to vs/freetype/builds/windows/vc2005/freetype.sln diff --git a/vs2015/freetype/builds/windows/vc2005/freetype.vcproj b/vs/freetype/builds/windows/vc2005/freetype.vcproj similarity index 100% rename from vs2015/freetype/builds/windows/vc2005/freetype.vcproj rename to vs/freetype/builds/windows/vc2005/freetype.vcproj diff --git a/vs2015/freetype/builds/windows/vc2005/index.html b/vs/freetype/builds/windows/vc2005/index.html similarity index 100% rename from vs2015/freetype/builds/windows/vc2005/index.html rename to vs/freetype/builds/windows/vc2005/index.html diff --git a/vs2015/freetype/builds/windows/vc2008/freetype.sln b/vs/freetype/builds/windows/vc2008/freetype.sln similarity index 100% rename from vs2015/freetype/builds/windows/vc2008/freetype.sln rename to vs/freetype/builds/windows/vc2008/freetype.sln diff --git a/vs2015/freetype/builds/windows/vc2008/freetype.vcproj b/vs/freetype/builds/windows/vc2008/freetype.vcproj similarity index 100% rename from vs2015/freetype/builds/windows/vc2008/freetype.vcproj rename to vs/freetype/builds/windows/vc2008/freetype.vcproj diff --git a/vs2015/freetype/builds/windows/vc2008/index.html b/vs/freetype/builds/windows/vc2008/index.html similarity index 100% rename from vs2015/freetype/builds/windows/vc2008/index.html rename to vs/freetype/builds/windows/vc2008/index.html diff --git a/vs2015/freetype/builds/windows/vc2010/freetype.sln b/vs/freetype/builds/windows/vc2010/freetype.sln similarity index 100% rename from vs2015/freetype/builds/windows/vc2010/freetype.sln rename to vs/freetype/builds/windows/vc2010/freetype.sln diff --git a/vs2015/freetype/builds/windows/vc2010/freetype.user.props b/vs/freetype/builds/windows/vc2010/freetype.user.props similarity index 100% rename from vs2015/freetype/builds/windows/vc2010/freetype.user.props rename to vs/freetype/builds/windows/vc2010/freetype.user.props diff --git a/vs2015/freetype/builds/windows/vc2010/freetype.vcxproj b/vs/freetype/builds/windows/vc2010/freetype.vcxproj similarity index 100% rename from vs2015/freetype/builds/windows/vc2010/freetype.vcxproj rename to vs/freetype/builds/windows/vc2010/freetype.vcxproj diff --git a/vs2015/freetype/builds/windows/vc2010/freetype.vcxproj.filters b/vs/freetype/builds/windows/vc2010/freetype.vcxproj.filters similarity index 100% rename from vs2015/freetype/builds/windows/vc2010/freetype.vcxproj.filters rename to vs/freetype/builds/windows/vc2010/freetype.vcxproj.filters diff --git a/vs2015/freetype/builds/windows/vc2010/index.html b/vs/freetype/builds/windows/vc2010/index.html similarity index 100% rename from vs2015/freetype/builds/windows/vc2010/index.html rename to vs/freetype/builds/windows/vc2010/index.html diff --git a/vs2015/freetype/builds/windows/visualc/freetype.dsp b/vs/freetype/builds/windows/visualc/freetype.dsp similarity index 100% rename from vs2015/freetype/builds/windows/visualc/freetype.dsp rename to vs/freetype/builds/windows/visualc/freetype.dsp diff --git a/vs2015/freetype/builds/windows/visualc/freetype.dsw b/vs/freetype/builds/windows/visualc/freetype.dsw similarity index 100% rename from vs2015/freetype/builds/windows/visualc/freetype.dsw rename to vs/freetype/builds/windows/visualc/freetype.dsw diff --git a/vs2015/freetype/builds/windows/visualc/freetype.sln b/vs/freetype/builds/windows/visualc/freetype.sln similarity index 100% rename from vs2015/freetype/builds/windows/visualc/freetype.sln rename to vs/freetype/builds/windows/visualc/freetype.sln diff --git a/vs2015/freetype/builds/windows/visualc/freetype.vcproj b/vs/freetype/builds/windows/visualc/freetype.vcproj similarity index 100% rename from vs2015/freetype/builds/windows/visualc/freetype.vcproj rename to vs/freetype/builds/windows/visualc/freetype.vcproj diff --git a/vs2015/freetype/builds/windows/visualc/index.html b/vs/freetype/builds/windows/visualc/index.html similarity index 100% rename from vs2015/freetype/builds/windows/visualc/index.html rename to vs/freetype/builds/windows/visualc/index.html diff --git a/vs2015/freetype/builds/windows/visualce/freetype.dsp b/vs/freetype/builds/windows/visualce/freetype.dsp similarity index 100% rename from vs2015/freetype/builds/windows/visualce/freetype.dsp rename to vs/freetype/builds/windows/visualce/freetype.dsp diff --git a/vs2015/freetype/builds/windows/visualce/freetype.dsw b/vs/freetype/builds/windows/visualce/freetype.dsw similarity index 100% rename from vs2015/freetype/builds/windows/visualce/freetype.dsw rename to vs/freetype/builds/windows/visualce/freetype.dsw diff --git a/vs2015/freetype/builds/windows/visualce/freetype.vcproj b/vs/freetype/builds/windows/visualce/freetype.vcproj similarity index 100% rename from vs2015/freetype/builds/windows/visualce/freetype.vcproj rename to vs/freetype/builds/windows/visualce/freetype.vcproj diff --git a/vs2015/freetype/builds/windows/visualce/index.html b/vs/freetype/builds/windows/visualce/index.html similarity index 100% rename from vs2015/freetype/builds/windows/visualce/index.html rename to vs/freetype/builds/windows/visualce/index.html diff --git a/vs2015/freetype/builds/windows/w32-bcc.mk b/vs/freetype/builds/windows/w32-bcc.mk similarity index 100% rename from vs2015/freetype/builds/windows/w32-bcc.mk rename to vs/freetype/builds/windows/w32-bcc.mk diff --git a/vs2015/freetype/builds/windows/w32-bccd.mk b/vs/freetype/builds/windows/w32-bccd.mk similarity index 100% rename from vs2015/freetype/builds/windows/w32-bccd.mk rename to vs/freetype/builds/windows/w32-bccd.mk diff --git a/vs2015/freetype/builds/windows/w32-dev.mk b/vs/freetype/builds/windows/w32-dev.mk similarity index 100% rename from vs2015/freetype/builds/windows/w32-dev.mk rename to vs/freetype/builds/windows/w32-dev.mk diff --git a/vs2015/freetype/builds/windows/w32-gcc.mk b/vs/freetype/builds/windows/w32-gcc.mk similarity index 100% rename from vs2015/freetype/builds/windows/w32-gcc.mk rename to vs/freetype/builds/windows/w32-gcc.mk diff --git a/vs2015/freetype/builds/windows/w32-icc.mk b/vs/freetype/builds/windows/w32-icc.mk similarity index 100% rename from vs2015/freetype/builds/windows/w32-icc.mk rename to vs/freetype/builds/windows/w32-icc.mk diff --git a/vs2015/freetype/builds/windows/w32-intl.mk b/vs/freetype/builds/windows/w32-intl.mk similarity index 100% rename from vs2015/freetype/builds/windows/w32-intl.mk rename to vs/freetype/builds/windows/w32-intl.mk diff --git a/vs2015/freetype/builds/windows/w32-lcc.mk b/vs/freetype/builds/windows/w32-lcc.mk similarity index 100% rename from vs2015/freetype/builds/windows/w32-lcc.mk rename to vs/freetype/builds/windows/w32-lcc.mk diff --git a/vs2015/freetype/builds/windows/w32-mingw32.mk b/vs/freetype/builds/windows/w32-mingw32.mk similarity index 100% rename from vs2015/freetype/builds/windows/w32-mingw32.mk rename to vs/freetype/builds/windows/w32-mingw32.mk diff --git a/vs2015/freetype/builds/windows/w32-vcc.mk b/vs/freetype/builds/windows/w32-vcc.mk similarity index 100% rename from vs2015/freetype/builds/windows/w32-vcc.mk rename to vs/freetype/builds/windows/w32-vcc.mk diff --git a/vs2015/freetype/builds/windows/w32-wat.mk b/vs/freetype/builds/windows/w32-wat.mk similarity index 100% rename from vs2015/freetype/builds/windows/w32-wat.mk rename to vs/freetype/builds/windows/w32-wat.mk diff --git a/vs2015/freetype/builds/windows/win32-def.mk b/vs/freetype/builds/windows/win32-def.mk similarity index 100% rename from vs2015/freetype/builds/windows/win32-def.mk rename to vs/freetype/builds/windows/win32-def.mk diff --git a/vs2015/freetype/configure b/vs/freetype/configure similarity index 100% rename from vs2015/freetype/configure rename to vs/freetype/configure diff --git a/vs2015/freetype/devel/ft2build.h b/vs/freetype/devel/ft2build.h similarity index 100% rename from vs2015/freetype/devel/ft2build.h rename to vs/freetype/devel/ft2build.h diff --git a/vs2015/freetype/devel/ftoption.h b/vs/freetype/devel/ftoption.h similarity index 100% rename from vs2015/freetype/devel/ftoption.h rename to vs/freetype/devel/ftoption.h diff --git a/vs2015/freetype/docs/CHANGES b/vs/freetype/docs/CHANGES similarity index 100% rename from vs2015/freetype/docs/CHANGES rename to vs/freetype/docs/CHANGES diff --git a/vs2015/freetype/docs/CMAKE b/vs/freetype/docs/CMAKE similarity index 100% rename from vs2015/freetype/docs/CMAKE rename to vs/freetype/docs/CMAKE diff --git a/vs2015/freetype/docs/CUSTOMIZE b/vs/freetype/docs/CUSTOMIZE similarity index 100% rename from vs2015/freetype/docs/CUSTOMIZE rename to vs/freetype/docs/CUSTOMIZE diff --git a/vs2015/freetype/docs/DEBUG b/vs/freetype/docs/DEBUG similarity index 100% rename from vs2015/freetype/docs/DEBUG rename to vs/freetype/docs/DEBUG diff --git a/vs2015/freetype/docs/FTL.TXT b/vs/freetype/docs/FTL.TXT similarity index 100% rename from vs2015/freetype/docs/FTL.TXT rename to vs/freetype/docs/FTL.TXT diff --git a/vs2015/freetype/docs/GPLv2.TXT b/vs/freetype/docs/GPLv2.TXT similarity index 100% rename from vs2015/freetype/docs/GPLv2.TXT rename to vs/freetype/docs/GPLv2.TXT diff --git a/vs2015/freetype/docs/INSTALL b/vs/freetype/docs/INSTALL similarity index 100% rename from vs2015/freetype/docs/INSTALL rename to vs/freetype/docs/INSTALL diff --git a/vs2015/freetype/docs/INSTALL.ANY b/vs/freetype/docs/INSTALL.ANY similarity index 100% rename from vs2015/freetype/docs/INSTALL.ANY rename to vs/freetype/docs/INSTALL.ANY diff --git a/vs2015/freetype/docs/INSTALL.CROSS b/vs/freetype/docs/INSTALL.CROSS similarity index 100% rename from vs2015/freetype/docs/INSTALL.CROSS rename to vs/freetype/docs/INSTALL.CROSS diff --git a/vs2015/freetype/docs/INSTALL.GNU b/vs/freetype/docs/INSTALL.GNU similarity index 100% rename from vs2015/freetype/docs/INSTALL.GNU rename to vs/freetype/docs/INSTALL.GNU diff --git a/vs2015/freetype/docs/INSTALL.MAC b/vs/freetype/docs/INSTALL.MAC similarity index 100% rename from vs2015/freetype/docs/INSTALL.MAC rename to vs/freetype/docs/INSTALL.MAC diff --git a/vs2015/freetype/docs/INSTALL.UNIX b/vs/freetype/docs/INSTALL.UNIX similarity index 100% rename from vs2015/freetype/docs/INSTALL.UNIX rename to vs/freetype/docs/INSTALL.UNIX diff --git a/vs2015/freetype/docs/INSTALL.VMS b/vs/freetype/docs/INSTALL.VMS similarity index 100% rename from vs2015/freetype/docs/INSTALL.VMS rename to vs/freetype/docs/INSTALL.VMS diff --git a/vs2015/freetype/docs/LICENSE.TXT b/vs/freetype/docs/LICENSE.TXT similarity index 100% rename from vs2015/freetype/docs/LICENSE.TXT rename to vs/freetype/docs/LICENSE.TXT diff --git a/vs2015/freetype/docs/MAKEPP b/vs/freetype/docs/MAKEPP similarity index 100% rename from vs2015/freetype/docs/MAKEPP rename to vs/freetype/docs/MAKEPP diff --git a/vs2015/freetype/docs/PROBLEMS b/vs/freetype/docs/PROBLEMS similarity index 100% rename from vs2015/freetype/docs/PROBLEMS rename to vs/freetype/docs/PROBLEMS diff --git a/vs2015/freetype/docs/TODO b/vs/freetype/docs/TODO similarity index 100% rename from vs2015/freetype/docs/TODO rename to vs/freetype/docs/TODO diff --git a/vs2015/freetype/docs/VERSIONS.TXT b/vs/freetype/docs/VERSIONS.TXT similarity index 100% rename from vs2015/freetype/docs/VERSIONS.TXT rename to vs/freetype/docs/VERSIONS.TXT diff --git a/vs2015/freetype/docs/formats.txt b/vs/freetype/docs/formats.txt similarity index 100% rename from vs2015/freetype/docs/formats.txt rename to vs/freetype/docs/formats.txt diff --git a/vs2015/freetype/docs/freetype-config.1 b/vs/freetype/docs/freetype-config.1 similarity index 100% rename from vs2015/freetype/docs/freetype-config.1 rename to vs/freetype/docs/freetype-config.1 diff --git a/vs2015/freetype/docs/raster.txt b/vs/freetype/docs/raster.txt similarity index 100% rename from vs2015/freetype/docs/raster.txt rename to vs/freetype/docs/raster.txt diff --git a/vs2015/freetype/docs/reference/README b/vs/freetype/docs/reference/README similarity index 100% rename from vs2015/freetype/docs/reference/README rename to vs/freetype/docs/reference/README diff --git a/vs2015/freetype/docs/reference/ft2-auto_hinter.html b/vs/freetype/docs/reference/ft2-auto_hinter.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-auto_hinter.html rename to vs/freetype/docs/reference/ft2-auto_hinter.html diff --git a/vs2015/freetype/docs/reference/ft2-base_interface.html b/vs/freetype/docs/reference/ft2-base_interface.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-base_interface.html rename to vs/freetype/docs/reference/ft2-base_interface.html diff --git a/vs2015/freetype/docs/reference/ft2-basic_types.html b/vs/freetype/docs/reference/ft2-basic_types.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-basic_types.html rename to vs/freetype/docs/reference/ft2-basic_types.html diff --git a/vs2015/freetype/docs/reference/ft2-bdf_fonts.html b/vs/freetype/docs/reference/ft2-bdf_fonts.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-bdf_fonts.html rename to vs/freetype/docs/reference/ft2-bdf_fonts.html diff --git a/vs2015/freetype/docs/reference/ft2-bitmap_handling.html b/vs/freetype/docs/reference/ft2-bitmap_handling.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-bitmap_handling.html rename to vs/freetype/docs/reference/ft2-bitmap_handling.html diff --git a/vs2015/freetype/docs/reference/ft2-bzip2.html b/vs/freetype/docs/reference/ft2-bzip2.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-bzip2.html rename to vs/freetype/docs/reference/ft2-bzip2.html diff --git a/vs2015/freetype/docs/reference/ft2-cache_subsystem.html b/vs/freetype/docs/reference/ft2-cache_subsystem.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-cache_subsystem.html rename to vs/freetype/docs/reference/ft2-cache_subsystem.html diff --git a/vs2015/freetype/docs/reference/ft2-cff_driver.html b/vs/freetype/docs/reference/ft2-cff_driver.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-cff_driver.html rename to vs/freetype/docs/reference/ft2-cff_driver.html diff --git a/vs2015/freetype/docs/reference/ft2-cid_fonts.html b/vs/freetype/docs/reference/ft2-cid_fonts.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-cid_fonts.html rename to vs/freetype/docs/reference/ft2-cid_fonts.html diff --git a/vs2015/freetype/docs/reference/ft2-computations.html b/vs/freetype/docs/reference/ft2-computations.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-computations.html rename to vs/freetype/docs/reference/ft2-computations.html diff --git a/vs2015/freetype/docs/reference/ft2-error_code_values.html b/vs/freetype/docs/reference/ft2-error_code_values.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-error_code_values.html rename to vs/freetype/docs/reference/ft2-error_code_values.html diff --git a/vs2015/freetype/docs/reference/ft2-error_enumerations.html b/vs/freetype/docs/reference/ft2-error_enumerations.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-error_enumerations.html rename to vs/freetype/docs/reference/ft2-error_enumerations.html diff --git a/vs2015/freetype/docs/reference/ft2-font_formats.html b/vs/freetype/docs/reference/ft2-font_formats.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-font_formats.html rename to vs/freetype/docs/reference/ft2-font_formats.html diff --git a/vs2015/freetype/docs/reference/ft2-gasp_table.html b/vs/freetype/docs/reference/ft2-gasp_table.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-gasp_table.html rename to vs/freetype/docs/reference/ft2-gasp_table.html diff --git a/vs2015/freetype/docs/reference/ft2-glyph_management.html b/vs/freetype/docs/reference/ft2-glyph_management.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-glyph_management.html rename to vs/freetype/docs/reference/ft2-glyph_management.html diff --git a/vs2015/freetype/docs/reference/ft2-glyph_stroker.html b/vs/freetype/docs/reference/ft2-glyph_stroker.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-glyph_stroker.html rename to vs/freetype/docs/reference/ft2-glyph_stroker.html diff --git a/vs2015/freetype/docs/reference/ft2-glyph_variants.html b/vs/freetype/docs/reference/ft2-glyph_variants.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-glyph_variants.html rename to vs/freetype/docs/reference/ft2-glyph_variants.html diff --git a/vs2015/freetype/docs/reference/ft2-gx_validation.html b/vs/freetype/docs/reference/ft2-gx_validation.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-gx_validation.html rename to vs/freetype/docs/reference/ft2-gx_validation.html diff --git a/vs2015/freetype/docs/reference/ft2-gzip.html b/vs/freetype/docs/reference/ft2-gzip.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-gzip.html rename to vs/freetype/docs/reference/ft2-gzip.html diff --git a/vs2015/freetype/docs/reference/ft2-header_file_macros.html b/vs/freetype/docs/reference/ft2-header_file_macros.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-header_file_macros.html rename to vs/freetype/docs/reference/ft2-header_file_macros.html diff --git a/vs2015/freetype/docs/reference/ft2-header_inclusion.html b/vs/freetype/docs/reference/ft2-header_inclusion.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-header_inclusion.html rename to vs/freetype/docs/reference/ft2-header_inclusion.html diff --git a/vs2015/freetype/docs/reference/ft2-incremental.html b/vs/freetype/docs/reference/ft2-incremental.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-incremental.html rename to vs/freetype/docs/reference/ft2-incremental.html diff --git a/vs2015/freetype/docs/reference/ft2-index.html b/vs/freetype/docs/reference/ft2-index.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-index.html rename to vs/freetype/docs/reference/ft2-index.html diff --git a/vs2015/freetype/docs/reference/ft2-lcd_filtering.html b/vs/freetype/docs/reference/ft2-lcd_filtering.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-lcd_filtering.html rename to vs/freetype/docs/reference/ft2-lcd_filtering.html diff --git a/vs2015/freetype/docs/reference/ft2-list_processing.html b/vs/freetype/docs/reference/ft2-list_processing.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-list_processing.html rename to vs/freetype/docs/reference/ft2-list_processing.html diff --git a/vs2015/freetype/docs/reference/ft2-lzw.html b/vs/freetype/docs/reference/ft2-lzw.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-lzw.html rename to vs/freetype/docs/reference/ft2-lzw.html diff --git a/vs2015/freetype/docs/reference/ft2-mac_specific.html b/vs/freetype/docs/reference/ft2-mac_specific.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-mac_specific.html rename to vs/freetype/docs/reference/ft2-mac_specific.html diff --git a/vs2015/freetype/docs/reference/ft2-module_management.html b/vs/freetype/docs/reference/ft2-module_management.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-module_management.html rename to vs/freetype/docs/reference/ft2-module_management.html diff --git a/vs2015/freetype/docs/reference/ft2-multiple_masters.html b/vs/freetype/docs/reference/ft2-multiple_masters.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-multiple_masters.html rename to vs/freetype/docs/reference/ft2-multiple_masters.html diff --git a/vs2015/freetype/docs/reference/ft2-ot_validation.html b/vs/freetype/docs/reference/ft2-ot_validation.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-ot_validation.html rename to vs/freetype/docs/reference/ft2-ot_validation.html diff --git a/vs2015/freetype/docs/reference/ft2-outline_processing.html b/vs/freetype/docs/reference/ft2-outline_processing.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-outline_processing.html rename to vs/freetype/docs/reference/ft2-outline_processing.html diff --git a/vs2015/freetype/docs/reference/ft2-parameter_tags.html b/vs/freetype/docs/reference/ft2-parameter_tags.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-parameter_tags.html rename to vs/freetype/docs/reference/ft2-parameter_tags.html diff --git a/vs2015/freetype/docs/reference/ft2-pcf_driver.html b/vs/freetype/docs/reference/ft2-pcf_driver.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-pcf_driver.html rename to vs/freetype/docs/reference/ft2-pcf_driver.html diff --git a/vs2015/freetype/docs/reference/ft2-pfr_fonts.html b/vs/freetype/docs/reference/ft2-pfr_fonts.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-pfr_fonts.html rename to vs/freetype/docs/reference/ft2-pfr_fonts.html diff --git a/vs2015/freetype/docs/reference/ft2-properties.html b/vs/freetype/docs/reference/ft2-properties.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-properties.html rename to vs/freetype/docs/reference/ft2-properties.html diff --git a/vs2015/freetype/docs/reference/ft2-quick_advance.html b/vs/freetype/docs/reference/ft2-quick_advance.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-quick_advance.html rename to vs/freetype/docs/reference/ft2-quick_advance.html diff --git a/vs2015/freetype/docs/reference/ft2-raster.html b/vs/freetype/docs/reference/ft2-raster.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-raster.html rename to vs/freetype/docs/reference/ft2-raster.html diff --git a/vs2015/freetype/docs/reference/ft2-sfnt_names.html b/vs/freetype/docs/reference/ft2-sfnt_names.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-sfnt_names.html rename to vs/freetype/docs/reference/ft2-sfnt_names.html diff --git a/vs2015/freetype/docs/reference/ft2-sizes_management.html b/vs/freetype/docs/reference/ft2-sizes_management.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-sizes_management.html rename to vs/freetype/docs/reference/ft2-sizes_management.html diff --git a/vs2015/freetype/docs/reference/ft2-system_interface.html b/vs/freetype/docs/reference/ft2-system_interface.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-system_interface.html rename to vs/freetype/docs/reference/ft2-system_interface.html diff --git a/vs2015/freetype/docs/reference/ft2-t1_cid_driver.html b/vs/freetype/docs/reference/ft2-t1_cid_driver.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-t1_cid_driver.html rename to vs/freetype/docs/reference/ft2-t1_cid_driver.html diff --git a/vs2015/freetype/docs/reference/ft2-toc.html b/vs/freetype/docs/reference/ft2-toc.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-toc.html rename to vs/freetype/docs/reference/ft2-toc.html diff --git a/vs2015/freetype/docs/reference/ft2-truetype_engine.html b/vs/freetype/docs/reference/ft2-truetype_engine.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-truetype_engine.html rename to vs/freetype/docs/reference/ft2-truetype_engine.html diff --git a/vs2015/freetype/docs/reference/ft2-truetype_tables.html b/vs/freetype/docs/reference/ft2-truetype_tables.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-truetype_tables.html rename to vs/freetype/docs/reference/ft2-truetype_tables.html diff --git a/vs2015/freetype/docs/reference/ft2-tt_driver.html b/vs/freetype/docs/reference/ft2-tt_driver.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-tt_driver.html rename to vs/freetype/docs/reference/ft2-tt_driver.html diff --git a/vs2015/freetype/docs/reference/ft2-type1_tables.html b/vs/freetype/docs/reference/ft2-type1_tables.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-type1_tables.html rename to vs/freetype/docs/reference/ft2-type1_tables.html diff --git a/vs2015/freetype/docs/reference/ft2-user_allocation.html b/vs/freetype/docs/reference/ft2-user_allocation.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-user_allocation.html rename to vs/freetype/docs/reference/ft2-user_allocation.html diff --git a/vs2015/freetype/docs/reference/ft2-version.html b/vs/freetype/docs/reference/ft2-version.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-version.html rename to vs/freetype/docs/reference/ft2-version.html diff --git a/vs2015/freetype/docs/reference/ft2-winfnt_fonts.html b/vs/freetype/docs/reference/ft2-winfnt_fonts.html similarity index 100% rename from vs2015/freetype/docs/reference/ft2-winfnt_fonts.html rename to vs/freetype/docs/reference/ft2-winfnt_fonts.html diff --git a/vs2015/freetype/docs/release b/vs/freetype/docs/release similarity index 100% rename from vs2015/freetype/docs/release rename to vs/freetype/docs/release diff --git a/vs2015/freetype/include/freetype/config/ftconfig.h b/vs/freetype/include/freetype/config/ftconfig.h similarity index 100% rename from vs2015/freetype/include/freetype/config/ftconfig.h rename to vs/freetype/include/freetype/config/ftconfig.h diff --git a/vs2015/freetype/include/freetype/config/ftheader.h b/vs/freetype/include/freetype/config/ftheader.h similarity index 100% rename from vs2015/freetype/include/freetype/config/ftheader.h rename to vs/freetype/include/freetype/config/ftheader.h diff --git a/vs2015/freetype/include/freetype/config/ftmodule.h b/vs/freetype/include/freetype/config/ftmodule.h similarity index 100% rename from vs2015/freetype/include/freetype/config/ftmodule.h rename to vs/freetype/include/freetype/config/ftmodule.h diff --git a/vs2015/freetype/include/freetype/config/ftoption.h b/vs/freetype/include/freetype/config/ftoption.h similarity index 100% rename from vs2015/freetype/include/freetype/config/ftoption.h rename to vs/freetype/include/freetype/config/ftoption.h diff --git a/vs2015/freetype/include/freetype/config/ftstdlib.h b/vs/freetype/include/freetype/config/ftstdlib.h similarity index 100% rename from vs2015/freetype/include/freetype/config/ftstdlib.h rename to vs/freetype/include/freetype/config/ftstdlib.h diff --git a/vs2015/freetype/include/freetype/freetype.h b/vs/freetype/include/freetype/freetype.h similarity index 100% rename from vs2015/freetype/include/freetype/freetype.h rename to vs/freetype/include/freetype/freetype.h diff --git a/vs2015/freetype/include/freetype/ftadvanc.h b/vs/freetype/include/freetype/ftadvanc.h similarity index 100% rename from vs2015/freetype/include/freetype/ftadvanc.h rename to vs/freetype/include/freetype/ftadvanc.h diff --git a/vs2015/freetype/include/freetype/ftbbox.h b/vs/freetype/include/freetype/ftbbox.h similarity index 100% rename from vs2015/freetype/include/freetype/ftbbox.h rename to vs/freetype/include/freetype/ftbbox.h diff --git a/vs2015/freetype/include/freetype/ftbdf.h b/vs/freetype/include/freetype/ftbdf.h similarity index 100% rename from vs2015/freetype/include/freetype/ftbdf.h rename to vs/freetype/include/freetype/ftbdf.h diff --git a/vs2015/freetype/include/freetype/ftbitmap.h b/vs/freetype/include/freetype/ftbitmap.h similarity index 100% rename from vs2015/freetype/include/freetype/ftbitmap.h rename to vs/freetype/include/freetype/ftbitmap.h diff --git a/vs2015/freetype/include/freetype/ftbzip2.h b/vs/freetype/include/freetype/ftbzip2.h similarity index 100% rename from vs2015/freetype/include/freetype/ftbzip2.h rename to vs/freetype/include/freetype/ftbzip2.h diff --git a/vs2015/freetype/include/freetype/ftcache.h b/vs/freetype/include/freetype/ftcache.h similarity index 100% rename from vs2015/freetype/include/freetype/ftcache.h rename to vs/freetype/include/freetype/ftcache.h diff --git a/vs2015/freetype/include/freetype/ftchapters.h b/vs/freetype/include/freetype/ftchapters.h similarity index 100% rename from vs2015/freetype/include/freetype/ftchapters.h rename to vs/freetype/include/freetype/ftchapters.h diff --git a/vs2015/freetype/include/freetype/ftcid.h b/vs/freetype/include/freetype/ftcid.h similarity index 100% rename from vs2015/freetype/include/freetype/ftcid.h rename to vs/freetype/include/freetype/ftcid.h diff --git a/vs2015/freetype/include/freetype/ftdriver.h b/vs/freetype/include/freetype/ftdriver.h similarity index 100% rename from vs2015/freetype/include/freetype/ftdriver.h rename to vs/freetype/include/freetype/ftdriver.h diff --git a/vs2015/freetype/include/freetype/fterrdef.h b/vs/freetype/include/freetype/fterrdef.h similarity index 100% rename from vs2015/freetype/include/freetype/fterrdef.h rename to vs/freetype/include/freetype/fterrdef.h diff --git a/vs2015/freetype/include/freetype/fterrors.h b/vs/freetype/include/freetype/fterrors.h similarity index 100% rename from vs2015/freetype/include/freetype/fterrors.h rename to vs/freetype/include/freetype/fterrors.h diff --git a/vs2015/freetype/include/freetype/ftfntfmt.h b/vs/freetype/include/freetype/ftfntfmt.h similarity index 100% rename from vs2015/freetype/include/freetype/ftfntfmt.h rename to vs/freetype/include/freetype/ftfntfmt.h diff --git a/vs2015/freetype/include/freetype/ftgasp.h b/vs/freetype/include/freetype/ftgasp.h similarity index 100% rename from vs2015/freetype/include/freetype/ftgasp.h rename to vs/freetype/include/freetype/ftgasp.h diff --git a/vs2015/freetype/include/freetype/ftglyph.h b/vs/freetype/include/freetype/ftglyph.h similarity index 100% rename from vs2015/freetype/include/freetype/ftglyph.h rename to vs/freetype/include/freetype/ftglyph.h diff --git a/vs2015/freetype/include/freetype/ftgxval.h b/vs/freetype/include/freetype/ftgxval.h similarity index 100% rename from vs2015/freetype/include/freetype/ftgxval.h rename to vs/freetype/include/freetype/ftgxval.h diff --git a/vs2015/freetype/include/freetype/ftgzip.h b/vs/freetype/include/freetype/ftgzip.h similarity index 100% rename from vs2015/freetype/include/freetype/ftgzip.h rename to vs/freetype/include/freetype/ftgzip.h diff --git a/vs2015/freetype/include/freetype/ftimage.h b/vs/freetype/include/freetype/ftimage.h similarity index 100% rename from vs2015/freetype/include/freetype/ftimage.h rename to vs/freetype/include/freetype/ftimage.h diff --git a/vs2015/freetype/include/freetype/ftincrem.h b/vs/freetype/include/freetype/ftincrem.h similarity index 100% rename from vs2015/freetype/include/freetype/ftincrem.h rename to vs/freetype/include/freetype/ftincrem.h diff --git a/vs2015/freetype/include/freetype/ftlcdfil.h b/vs/freetype/include/freetype/ftlcdfil.h similarity index 100% rename from vs2015/freetype/include/freetype/ftlcdfil.h rename to vs/freetype/include/freetype/ftlcdfil.h diff --git a/vs2015/freetype/include/freetype/ftlist.h b/vs/freetype/include/freetype/ftlist.h similarity index 100% rename from vs2015/freetype/include/freetype/ftlist.h rename to vs/freetype/include/freetype/ftlist.h diff --git a/vs2015/freetype/include/freetype/ftlzw.h b/vs/freetype/include/freetype/ftlzw.h similarity index 100% rename from vs2015/freetype/include/freetype/ftlzw.h rename to vs/freetype/include/freetype/ftlzw.h diff --git a/vs2015/freetype/include/freetype/ftmac.h b/vs/freetype/include/freetype/ftmac.h similarity index 100% rename from vs2015/freetype/include/freetype/ftmac.h rename to vs/freetype/include/freetype/ftmac.h diff --git a/vs2015/freetype/include/freetype/ftmm.h b/vs/freetype/include/freetype/ftmm.h similarity index 100% rename from vs2015/freetype/include/freetype/ftmm.h rename to vs/freetype/include/freetype/ftmm.h diff --git a/vs2015/freetype/include/freetype/ftmodapi.h b/vs/freetype/include/freetype/ftmodapi.h similarity index 100% rename from vs2015/freetype/include/freetype/ftmodapi.h rename to vs/freetype/include/freetype/ftmodapi.h diff --git a/vs2015/freetype/include/freetype/ftmoderr.h b/vs/freetype/include/freetype/ftmoderr.h similarity index 100% rename from vs2015/freetype/include/freetype/ftmoderr.h rename to vs/freetype/include/freetype/ftmoderr.h diff --git a/vs2015/freetype/include/freetype/ftotval.h b/vs/freetype/include/freetype/ftotval.h similarity index 100% rename from vs2015/freetype/include/freetype/ftotval.h rename to vs/freetype/include/freetype/ftotval.h diff --git a/vs2015/freetype/include/freetype/ftoutln.h b/vs/freetype/include/freetype/ftoutln.h similarity index 100% rename from vs2015/freetype/include/freetype/ftoutln.h rename to vs/freetype/include/freetype/ftoutln.h diff --git a/vs2015/freetype/include/freetype/ftparams.h b/vs/freetype/include/freetype/ftparams.h similarity index 100% rename from vs2015/freetype/include/freetype/ftparams.h rename to vs/freetype/include/freetype/ftparams.h diff --git a/vs2015/freetype/include/freetype/ftpfr.h b/vs/freetype/include/freetype/ftpfr.h similarity index 100% rename from vs2015/freetype/include/freetype/ftpfr.h rename to vs/freetype/include/freetype/ftpfr.h diff --git a/vs2015/freetype/include/freetype/ftrender.h b/vs/freetype/include/freetype/ftrender.h similarity index 100% rename from vs2015/freetype/include/freetype/ftrender.h rename to vs/freetype/include/freetype/ftrender.h diff --git a/vs2015/freetype/include/freetype/ftsizes.h b/vs/freetype/include/freetype/ftsizes.h similarity index 100% rename from vs2015/freetype/include/freetype/ftsizes.h rename to vs/freetype/include/freetype/ftsizes.h diff --git a/vs2015/freetype/include/freetype/ftsnames.h b/vs/freetype/include/freetype/ftsnames.h similarity index 100% rename from vs2015/freetype/include/freetype/ftsnames.h rename to vs/freetype/include/freetype/ftsnames.h diff --git a/vs2015/freetype/include/freetype/ftstroke.h b/vs/freetype/include/freetype/ftstroke.h similarity index 100% rename from vs2015/freetype/include/freetype/ftstroke.h rename to vs/freetype/include/freetype/ftstroke.h diff --git a/vs2015/freetype/include/freetype/ftsynth.h b/vs/freetype/include/freetype/ftsynth.h similarity index 100% rename from vs2015/freetype/include/freetype/ftsynth.h rename to vs/freetype/include/freetype/ftsynth.h diff --git a/vs2015/freetype/include/freetype/ftsystem.h b/vs/freetype/include/freetype/ftsystem.h similarity index 100% rename from vs2015/freetype/include/freetype/ftsystem.h rename to vs/freetype/include/freetype/ftsystem.h diff --git a/vs2015/freetype/include/freetype/fttrigon.h b/vs/freetype/include/freetype/fttrigon.h similarity index 100% rename from vs2015/freetype/include/freetype/fttrigon.h rename to vs/freetype/include/freetype/fttrigon.h diff --git a/vs2015/freetype/include/freetype/fttypes.h b/vs/freetype/include/freetype/fttypes.h similarity index 100% rename from vs2015/freetype/include/freetype/fttypes.h rename to vs/freetype/include/freetype/fttypes.h diff --git a/vs2015/freetype/include/freetype/ftwinfnt.h b/vs/freetype/include/freetype/ftwinfnt.h similarity index 100% rename from vs2015/freetype/include/freetype/ftwinfnt.h rename to vs/freetype/include/freetype/ftwinfnt.h diff --git a/vs2015/freetype/include/freetype/internal/autohint.h b/vs/freetype/include/freetype/internal/autohint.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/autohint.h rename to vs/freetype/include/freetype/internal/autohint.h diff --git a/vs2015/freetype/include/freetype/internal/cffotypes.h b/vs/freetype/include/freetype/internal/cffotypes.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/cffotypes.h rename to vs/freetype/include/freetype/internal/cffotypes.h diff --git a/vs2015/freetype/include/freetype/internal/cfftypes.h b/vs/freetype/include/freetype/internal/cfftypes.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/cfftypes.h rename to vs/freetype/include/freetype/internal/cfftypes.h diff --git a/vs2015/freetype/include/freetype/internal/ftcalc.h b/vs/freetype/include/freetype/internal/ftcalc.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/ftcalc.h rename to vs/freetype/include/freetype/internal/ftcalc.h diff --git a/vs2015/freetype/include/freetype/internal/ftdebug.h b/vs/freetype/include/freetype/internal/ftdebug.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/ftdebug.h rename to vs/freetype/include/freetype/internal/ftdebug.h diff --git a/vs2015/freetype/include/freetype/internal/ftdrv.h b/vs/freetype/include/freetype/internal/ftdrv.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/ftdrv.h rename to vs/freetype/include/freetype/internal/ftdrv.h diff --git a/vs2015/freetype/include/freetype/internal/ftgloadr.h b/vs/freetype/include/freetype/internal/ftgloadr.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/ftgloadr.h rename to vs/freetype/include/freetype/internal/ftgloadr.h diff --git a/vs2015/freetype/include/freetype/internal/fthash.h b/vs/freetype/include/freetype/internal/fthash.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/fthash.h rename to vs/freetype/include/freetype/internal/fthash.h diff --git a/vs2015/freetype/include/freetype/internal/ftmemory.h b/vs/freetype/include/freetype/internal/ftmemory.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/ftmemory.h rename to vs/freetype/include/freetype/internal/ftmemory.h diff --git a/vs2015/freetype/include/freetype/internal/ftobjs.h b/vs/freetype/include/freetype/internal/ftobjs.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/ftobjs.h rename to vs/freetype/include/freetype/internal/ftobjs.h diff --git a/vs2015/freetype/include/freetype/internal/ftpic.h b/vs/freetype/include/freetype/internal/ftpic.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/ftpic.h rename to vs/freetype/include/freetype/internal/ftpic.h diff --git a/vs2015/freetype/include/freetype/internal/ftpsprop.h b/vs/freetype/include/freetype/internal/ftpsprop.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/ftpsprop.h rename to vs/freetype/include/freetype/internal/ftpsprop.h diff --git a/vs2015/freetype/include/freetype/internal/ftrfork.h b/vs/freetype/include/freetype/internal/ftrfork.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/ftrfork.h rename to vs/freetype/include/freetype/internal/ftrfork.h diff --git a/vs2015/freetype/include/freetype/internal/ftserv.h b/vs/freetype/include/freetype/internal/ftserv.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/ftserv.h rename to vs/freetype/include/freetype/internal/ftserv.h diff --git a/vs2015/freetype/include/freetype/internal/ftstream.h b/vs/freetype/include/freetype/internal/ftstream.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/ftstream.h rename to vs/freetype/include/freetype/internal/ftstream.h diff --git a/vs2015/freetype/include/freetype/internal/fttrace.h b/vs/freetype/include/freetype/internal/fttrace.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/fttrace.h rename to vs/freetype/include/freetype/internal/fttrace.h diff --git a/vs2015/freetype/include/freetype/internal/ftvalid.h b/vs/freetype/include/freetype/internal/ftvalid.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/ftvalid.h rename to vs/freetype/include/freetype/internal/ftvalid.h diff --git a/vs2015/freetype/include/freetype/internal/internal.h b/vs/freetype/include/freetype/internal/internal.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/internal.h rename to vs/freetype/include/freetype/internal/internal.h diff --git a/vs2015/freetype/include/freetype/internal/psaux.h b/vs/freetype/include/freetype/internal/psaux.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/psaux.h rename to vs/freetype/include/freetype/internal/psaux.h diff --git a/vs2015/freetype/include/freetype/internal/pshints.h b/vs/freetype/include/freetype/internal/pshints.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/pshints.h rename to vs/freetype/include/freetype/internal/pshints.h diff --git a/vs2015/freetype/include/freetype/internal/services/svbdf.h b/vs/freetype/include/freetype/internal/services/svbdf.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/services/svbdf.h rename to vs/freetype/include/freetype/internal/services/svbdf.h diff --git a/vs2015/freetype/include/freetype/internal/services/svcfftl.h b/vs/freetype/include/freetype/internal/services/svcfftl.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/services/svcfftl.h rename to vs/freetype/include/freetype/internal/services/svcfftl.h diff --git a/vs2015/freetype/include/freetype/internal/services/svcid.h b/vs/freetype/include/freetype/internal/services/svcid.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/services/svcid.h rename to vs/freetype/include/freetype/internal/services/svcid.h diff --git a/vs2015/freetype/include/freetype/internal/services/svfntfmt.h b/vs/freetype/include/freetype/internal/services/svfntfmt.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/services/svfntfmt.h rename to vs/freetype/include/freetype/internal/services/svfntfmt.h diff --git a/vs2015/freetype/include/freetype/internal/services/svgldict.h b/vs/freetype/include/freetype/internal/services/svgldict.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/services/svgldict.h rename to vs/freetype/include/freetype/internal/services/svgldict.h diff --git a/vs2015/freetype/include/freetype/internal/services/svgxval.h b/vs/freetype/include/freetype/internal/services/svgxval.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/services/svgxval.h rename to vs/freetype/include/freetype/internal/services/svgxval.h diff --git a/vs2015/freetype/include/freetype/internal/services/svkern.h b/vs/freetype/include/freetype/internal/services/svkern.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/services/svkern.h rename to vs/freetype/include/freetype/internal/services/svkern.h diff --git a/vs2015/freetype/include/freetype/internal/services/svmetric.h b/vs/freetype/include/freetype/internal/services/svmetric.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/services/svmetric.h rename to vs/freetype/include/freetype/internal/services/svmetric.h diff --git a/vs2015/freetype/include/freetype/internal/services/svmm.h b/vs/freetype/include/freetype/internal/services/svmm.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/services/svmm.h rename to vs/freetype/include/freetype/internal/services/svmm.h diff --git a/vs2015/freetype/include/freetype/internal/services/svotval.h b/vs/freetype/include/freetype/internal/services/svotval.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/services/svotval.h rename to vs/freetype/include/freetype/internal/services/svotval.h diff --git a/vs2015/freetype/include/freetype/internal/services/svpfr.h b/vs/freetype/include/freetype/internal/services/svpfr.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/services/svpfr.h rename to vs/freetype/include/freetype/internal/services/svpfr.h diff --git a/vs2015/freetype/include/freetype/internal/services/svpostnm.h b/vs/freetype/include/freetype/internal/services/svpostnm.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/services/svpostnm.h rename to vs/freetype/include/freetype/internal/services/svpostnm.h diff --git a/vs2015/freetype/include/freetype/internal/services/svprop.h b/vs/freetype/include/freetype/internal/services/svprop.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/services/svprop.h rename to vs/freetype/include/freetype/internal/services/svprop.h diff --git a/vs2015/freetype/include/freetype/internal/services/svpscmap.h b/vs/freetype/include/freetype/internal/services/svpscmap.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/services/svpscmap.h rename to vs/freetype/include/freetype/internal/services/svpscmap.h diff --git a/vs2015/freetype/include/freetype/internal/services/svpsinfo.h b/vs/freetype/include/freetype/internal/services/svpsinfo.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/services/svpsinfo.h rename to vs/freetype/include/freetype/internal/services/svpsinfo.h diff --git a/vs2015/freetype/include/freetype/internal/services/svsfnt.h b/vs/freetype/include/freetype/internal/services/svsfnt.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/services/svsfnt.h rename to vs/freetype/include/freetype/internal/services/svsfnt.h diff --git a/vs2015/freetype/include/freetype/internal/services/svttcmap.h b/vs/freetype/include/freetype/internal/services/svttcmap.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/services/svttcmap.h rename to vs/freetype/include/freetype/internal/services/svttcmap.h diff --git a/vs2015/freetype/include/freetype/internal/services/svtteng.h b/vs/freetype/include/freetype/internal/services/svtteng.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/services/svtteng.h rename to vs/freetype/include/freetype/internal/services/svtteng.h diff --git a/vs2015/freetype/include/freetype/internal/services/svttglyf.h b/vs/freetype/include/freetype/internal/services/svttglyf.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/services/svttglyf.h rename to vs/freetype/include/freetype/internal/services/svttglyf.h diff --git a/vs2015/freetype/include/freetype/internal/services/svwinfnt.h b/vs/freetype/include/freetype/internal/services/svwinfnt.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/services/svwinfnt.h rename to vs/freetype/include/freetype/internal/services/svwinfnt.h diff --git a/vs2015/freetype/include/freetype/internal/sfnt.h b/vs/freetype/include/freetype/internal/sfnt.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/sfnt.h rename to vs/freetype/include/freetype/internal/sfnt.h diff --git a/vs2015/freetype/include/freetype/internal/t1types.h b/vs/freetype/include/freetype/internal/t1types.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/t1types.h rename to vs/freetype/include/freetype/internal/t1types.h diff --git a/vs2015/freetype/include/freetype/internal/tttypes.h b/vs/freetype/include/freetype/internal/tttypes.h similarity index 100% rename from vs2015/freetype/include/freetype/internal/tttypes.h rename to vs/freetype/include/freetype/internal/tttypes.h diff --git a/vs2015/freetype/include/freetype/t1tables.h b/vs/freetype/include/freetype/t1tables.h similarity index 100% rename from vs2015/freetype/include/freetype/t1tables.h rename to vs/freetype/include/freetype/t1tables.h diff --git a/vs2015/freetype/include/freetype/ttnameid.h b/vs/freetype/include/freetype/ttnameid.h similarity index 100% rename from vs2015/freetype/include/freetype/ttnameid.h rename to vs/freetype/include/freetype/ttnameid.h diff --git a/vs2015/freetype/include/freetype/tttables.h b/vs/freetype/include/freetype/tttables.h similarity index 100% rename from vs2015/freetype/include/freetype/tttables.h rename to vs/freetype/include/freetype/tttables.h diff --git a/vs2015/freetype/include/freetype/tttags.h b/vs/freetype/include/freetype/tttags.h similarity index 100% rename from vs2015/freetype/include/freetype/tttags.h rename to vs/freetype/include/freetype/tttags.h diff --git a/vs2015/freetype/include/ft2build.h b/vs/freetype/include/ft2build.h similarity index 100% rename from vs2015/freetype/include/ft2build.h rename to vs/freetype/include/ft2build.h diff --git a/vs2015/freetype/modules.cfg b/vs/freetype/modules.cfg similarity index 100% rename from vs2015/freetype/modules.cfg rename to vs/freetype/modules.cfg diff --git a/vs2015/freetype/objs/README b/vs/freetype/objs/README similarity index 100% rename from vs2015/freetype/objs/README rename to vs/freetype/objs/README diff --git a/vs2015/freetype/src/Jamfile b/vs/freetype/src/Jamfile similarity index 100% rename from vs2015/freetype/src/Jamfile rename to vs/freetype/src/Jamfile diff --git a/vs2015/freetype/src/autofit/Jamfile b/vs/freetype/src/autofit/Jamfile similarity index 100% rename from vs2015/freetype/src/autofit/Jamfile rename to vs/freetype/src/autofit/Jamfile diff --git a/vs2015/freetype/src/autofit/afangles.c b/vs/freetype/src/autofit/afangles.c similarity index 100% rename from vs2015/freetype/src/autofit/afangles.c rename to vs/freetype/src/autofit/afangles.c diff --git a/vs2015/freetype/src/autofit/afangles.h b/vs/freetype/src/autofit/afangles.h similarity index 100% rename from vs2015/freetype/src/autofit/afangles.h rename to vs/freetype/src/autofit/afangles.h diff --git a/vs2015/freetype/src/autofit/afblue.c b/vs/freetype/src/autofit/afblue.c similarity index 100% rename from vs2015/freetype/src/autofit/afblue.c rename to vs/freetype/src/autofit/afblue.c diff --git a/vs2015/freetype/src/autofit/afblue.cin b/vs/freetype/src/autofit/afblue.cin similarity index 100% rename from vs2015/freetype/src/autofit/afblue.cin rename to vs/freetype/src/autofit/afblue.cin diff --git a/vs2015/freetype/src/autofit/afblue.dat b/vs/freetype/src/autofit/afblue.dat similarity index 100% rename from vs2015/freetype/src/autofit/afblue.dat rename to vs/freetype/src/autofit/afblue.dat diff --git a/vs2015/freetype/src/autofit/afblue.h b/vs/freetype/src/autofit/afblue.h similarity index 100% rename from vs2015/freetype/src/autofit/afblue.h rename to vs/freetype/src/autofit/afblue.h diff --git a/vs2015/freetype/src/autofit/afblue.hin b/vs/freetype/src/autofit/afblue.hin similarity index 100% rename from vs2015/freetype/src/autofit/afblue.hin rename to vs/freetype/src/autofit/afblue.hin diff --git a/vs2015/freetype/src/autofit/afcjk.c b/vs/freetype/src/autofit/afcjk.c similarity index 100% rename from vs2015/freetype/src/autofit/afcjk.c rename to vs/freetype/src/autofit/afcjk.c diff --git a/vs2015/freetype/src/autofit/afcjk.h b/vs/freetype/src/autofit/afcjk.h similarity index 100% rename from vs2015/freetype/src/autofit/afcjk.h rename to vs/freetype/src/autofit/afcjk.h diff --git a/vs2015/freetype/src/autofit/afcover.h b/vs/freetype/src/autofit/afcover.h similarity index 100% rename from vs2015/freetype/src/autofit/afcover.h rename to vs/freetype/src/autofit/afcover.h diff --git a/vs2015/freetype/src/autofit/afdummy.c b/vs/freetype/src/autofit/afdummy.c similarity index 100% rename from vs2015/freetype/src/autofit/afdummy.c rename to vs/freetype/src/autofit/afdummy.c diff --git a/vs2015/freetype/src/autofit/afdummy.h b/vs/freetype/src/autofit/afdummy.h similarity index 100% rename from vs2015/freetype/src/autofit/afdummy.h rename to vs/freetype/src/autofit/afdummy.h diff --git a/vs2015/freetype/src/autofit/aferrors.h b/vs/freetype/src/autofit/aferrors.h similarity index 100% rename from vs2015/freetype/src/autofit/aferrors.h rename to vs/freetype/src/autofit/aferrors.h diff --git a/vs2015/freetype/src/autofit/afglobal.c b/vs/freetype/src/autofit/afglobal.c similarity index 100% rename from vs2015/freetype/src/autofit/afglobal.c rename to vs/freetype/src/autofit/afglobal.c diff --git a/vs2015/freetype/src/autofit/afglobal.h b/vs/freetype/src/autofit/afglobal.h similarity index 100% rename from vs2015/freetype/src/autofit/afglobal.h rename to vs/freetype/src/autofit/afglobal.h diff --git a/vs2015/freetype/src/autofit/afhints.c b/vs/freetype/src/autofit/afhints.c similarity index 100% rename from vs2015/freetype/src/autofit/afhints.c rename to vs/freetype/src/autofit/afhints.c diff --git a/vs2015/freetype/src/autofit/afhints.h b/vs/freetype/src/autofit/afhints.h similarity index 100% rename from vs2015/freetype/src/autofit/afhints.h rename to vs/freetype/src/autofit/afhints.h diff --git a/vs2015/freetype/src/autofit/afindic.c b/vs/freetype/src/autofit/afindic.c similarity index 100% rename from vs2015/freetype/src/autofit/afindic.c rename to vs/freetype/src/autofit/afindic.c diff --git a/vs2015/freetype/src/autofit/afindic.h b/vs/freetype/src/autofit/afindic.h similarity index 100% rename from vs2015/freetype/src/autofit/afindic.h rename to vs/freetype/src/autofit/afindic.h diff --git a/vs2015/freetype/src/autofit/aflatin.c b/vs/freetype/src/autofit/aflatin.c similarity index 100% rename from vs2015/freetype/src/autofit/aflatin.c rename to vs/freetype/src/autofit/aflatin.c diff --git a/vs2015/freetype/src/autofit/aflatin.h b/vs/freetype/src/autofit/aflatin.h similarity index 100% rename from vs2015/freetype/src/autofit/aflatin.h rename to vs/freetype/src/autofit/aflatin.h diff --git a/vs2015/freetype/src/autofit/aflatin2.c b/vs/freetype/src/autofit/aflatin2.c similarity index 100% rename from vs2015/freetype/src/autofit/aflatin2.c rename to vs/freetype/src/autofit/aflatin2.c diff --git a/vs2015/freetype/src/autofit/aflatin2.h b/vs/freetype/src/autofit/aflatin2.h similarity index 100% rename from vs2015/freetype/src/autofit/aflatin2.h rename to vs/freetype/src/autofit/aflatin2.h diff --git a/vs2015/freetype/src/autofit/afloader.c b/vs/freetype/src/autofit/afloader.c similarity index 100% rename from vs2015/freetype/src/autofit/afloader.c rename to vs/freetype/src/autofit/afloader.c diff --git a/vs2015/freetype/src/autofit/afloader.h b/vs/freetype/src/autofit/afloader.h similarity index 100% rename from vs2015/freetype/src/autofit/afloader.h rename to vs/freetype/src/autofit/afloader.h diff --git a/vs2015/freetype/src/autofit/afmodule.c b/vs/freetype/src/autofit/afmodule.c similarity index 100% rename from vs2015/freetype/src/autofit/afmodule.c rename to vs/freetype/src/autofit/afmodule.c diff --git a/vs2015/freetype/src/autofit/afmodule.h b/vs/freetype/src/autofit/afmodule.h similarity index 100% rename from vs2015/freetype/src/autofit/afmodule.h rename to vs/freetype/src/autofit/afmodule.h diff --git a/vs2015/freetype/src/autofit/afpic.c b/vs/freetype/src/autofit/afpic.c similarity index 100% rename from vs2015/freetype/src/autofit/afpic.c rename to vs/freetype/src/autofit/afpic.c diff --git a/vs2015/freetype/src/autofit/afpic.h b/vs/freetype/src/autofit/afpic.h similarity index 100% rename from vs2015/freetype/src/autofit/afpic.h rename to vs/freetype/src/autofit/afpic.h diff --git a/vs2015/freetype/src/autofit/afranges.c b/vs/freetype/src/autofit/afranges.c similarity index 100% rename from vs2015/freetype/src/autofit/afranges.c rename to vs/freetype/src/autofit/afranges.c diff --git a/vs2015/freetype/src/autofit/afranges.h b/vs/freetype/src/autofit/afranges.h similarity index 100% rename from vs2015/freetype/src/autofit/afranges.h rename to vs/freetype/src/autofit/afranges.h diff --git a/vs2015/freetype/src/autofit/afscript.h b/vs/freetype/src/autofit/afscript.h similarity index 100% rename from vs2015/freetype/src/autofit/afscript.h rename to vs/freetype/src/autofit/afscript.h diff --git a/vs2015/freetype/src/autofit/afshaper.c b/vs/freetype/src/autofit/afshaper.c similarity index 100% rename from vs2015/freetype/src/autofit/afshaper.c rename to vs/freetype/src/autofit/afshaper.c diff --git a/vs2015/freetype/src/autofit/afshaper.h b/vs/freetype/src/autofit/afshaper.h similarity index 100% rename from vs2015/freetype/src/autofit/afshaper.h rename to vs/freetype/src/autofit/afshaper.h diff --git a/vs2015/freetype/src/autofit/afstyles.h b/vs/freetype/src/autofit/afstyles.h similarity index 100% rename from vs2015/freetype/src/autofit/afstyles.h rename to vs/freetype/src/autofit/afstyles.h diff --git a/vs2015/freetype/src/autofit/aftypes.h b/vs/freetype/src/autofit/aftypes.h similarity index 100% rename from vs2015/freetype/src/autofit/aftypes.h rename to vs/freetype/src/autofit/aftypes.h diff --git a/vs2015/freetype/src/autofit/afwarp.c b/vs/freetype/src/autofit/afwarp.c similarity index 100% rename from vs2015/freetype/src/autofit/afwarp.c rename to vs/freetype/src/autofit/afwarp.c diff --git a/vs2015/freetype/src/autofit/afwarp.h b/vs/freetype/src/autofit/afwarp.h similarity index 100% rename from vs2015/freetype/src/autofit/afwarp.h rename to vs/freetype/src/autofit/afwarp.h diff --git a/vs2015/freetype/src/autofit/afwrtsys.h b/vs/freetype/src/autofit/afwrtsys.h similarity index 100% rename from vs2015/freetype/src/autofit/afwrtsys.h rename to vs/freetype/src/autofit/afwrtsys.h diff --git a/vs2015/freetype/src/autofit/autofit.c b/vs/freetype/src/autofit/autofit.c similarity index 100% rename from vs2015/freetype/src/autofit/autofit.c rename to vs/freetype/src/autofit/autofit.c diff --git a/vs2015/freetype/src/autofit/module.mk b/vs/freetype/src/autofit/module.mk similarity index 100% rename from vs2015/freetype/src/autofit/module.mk rename to vs/freetype/src/autofit/module.mk diff --git a/vs2015/freetype/src/autofit/rules.mk b/vs/freetype/src/autofit/rules.mk similarity index 100% rename from vs2015/freetype/src/autofit/rules.mk rename to vs/freetype/src/autofit/rules.mk diff --git a/vs2015/freetype/src/base/Jamfile b/vs/freetype/src/base/Jamfile similarity index 100% rename from vs2015/freetype/src/base/Jamfile rename to vs/freetype/src/base/Jamfile diff --git a/vs2015/freetype/src/base/basepic.c b/vs/freetype/src/base/basepic.c similarity index 100% rename from vs2015/freetype/src/base/basepic.c rename to vs/freetype/src/base/basepic.c diff --git a/vs2015/freetype/src/base/basepic.h b/vs/freetype/src/base/basepic.h similarity index 100% rename from vs2015/freetype/src/base/basepic.h rename to vs/freetype/src/base/basepic.h diff --git a/vs2015/freetype/src/base/ftadvanc.c b/vs/freetype/src/base/ftadvanc.c similarity index 100% rename from vs2015/freetype/src/base/ftadvanc.c rename to vs/freetype/src/base/ftadvanc.c diff --git a/vs2015/freetype/src/base/ftapi.c b/vs/freetype/src/base/ftapi.c similarity index 100% rename from vs2015/freetype/src/base/ftapi.c rename to vs/freetype/src/base/ftapi.c diff --git a/vs2015/freetype/src/base/ftbase.c b/vs/freetype/src/base/ftbase.c similarity index 100% rename from vs2015/freetype/src/base/ftbase.c rename to vs/freetype/src/base/ftbase.c diff --git a/vs2015/freetype/src/base/ftbase.h b/vs/freetype/src/base/ftbase.h similarity index 100% rename from vs2015/freetype/src/base/ftbase.h rename to vs/freetype/src/base/ftbase.h diff --git a/vs2015/freetype/src/base/ftbbox.c b/vs/freetype/src/base/ftbbox.c similarity index 100% rename from vs2015/freetype/src/base/ftbbox.c rename to vs/freetype/src/base/ftbbox.c diff --git a/vs2015/freetype/src/base/ftbdf.c b/vs/freetype/src/base/ftbdf.c similarity index 100% rename from vs2015/freetype/src/base/ftbdf.c rename to vs/freetype/src/base/ftbdf.c diff --git a/vs2015/freetype/src/base/ftbitmap.c b/vs/freetype/src/base/ftbitmap.c similarity index 100% rename from vs2015/freetype/src/base/ftbitmap.c rename to vs/freetype/src/base/ftbitmap.c diff --git a/vs2015/freetype/src/base/ftcalc.c b/vs/freetype/src/base/ftcalc.c similarity index 100% rename from vs2015/freetype/src/base/ftcalc.c rename to vs/freetype/src/base/ftcalc.c diff --git a/vs2015/freetype/src/base/ftcid.c b/vs/freetype/src/base/ftcid.c similarity index 100% rename from vs2015/freetype/src/base/ftcid.c rename to vs/freetype/src/base/ftcid.c diff --git a/vs2015/freetype/src/base/ftdbgmem.c b/vs/freetype/src/base/ftdbgmem.c similarity index 100% rename from vs2015/freetype/src/base/ftdbgmem.c rename to vs/freetype/src/base/ftdbgmem.c diff --git a/vs2015/freetype/src/base/ftdebug.c b/vs/freetype/src/base/ftdebug.c similarity index 100% rename from vs2015/freetype/src/base/ftdebug.c rename to vs/freetype/src/base/ftdebug.c diff --git a/vs2015/freetype/src/base/ftfntfmt.c b/vs/freetype/src/base/ftfntfmt.c similarity index 100% rename from vs2015/freetype/src/base/ftfntfmt.c rename to vs/freetype/src/base/ftfntfmt.c diff --git a/vs2015/freetype/src/base/ftfstype.c b/vs/freetype/src/base/ftfstype.c similarity index 100% rename from vs2015/freetype/src/base/ftfstype.c rename to vs/freetype/src/base/ftfstype.c diff --git a/vs2015/freetype/src/base/ftgasp.c b/vs/freetype/src/base/ftgasp.c similarity index 100% rename from vs2015/freetype/src/base/ftgasp.c rename to vs/freetype/src/base/ftgasp.c diff --git a/vs2015/freetype/src/base/ftgloadr.c b/vs/freetype/src/base/ftgloadr.c similarity index 100% rename from vs2015/freetype/src/base/ftgloadr.c rename to vs/freetype/src/base/ftgloadr.c diff --git a/vs2015/freetype/src/base/ftglyph.c b/vs/freetype/src/base/ftglyph.c similarity index 100% rename from vs2015/freetype/src/base/ftglyph.c rename to vs/freetype/src/base/ftglyph.c diff --git a/vs2015/freetype/src/base/ftgxval.c b/vs/freetype/src/base/ftgxval.c similarity index 100% rename from vs2015/freetype/src/base/ftgxval.c rename to vs/freetype/src/base/ftgxval.c diff --git a/vs2015/freetype/src/base/fthash.c b/vs/freetype/src/base/fthash.c similarity index 100% rename from vs2015/freetype/src/base/fthash.c rename to vs/freetype/src/base/fthash.c diff --git a/vs2015/freetype/src/base/ftinit.c b/vs/freetype/src/base/ftinit.c similarity index 100% rename from vs2015/freetype/src/base/ftinit.c rename to vs/freetype/src/base/ftinit.c diff --git a/vs2015/freetype/src/base/ftlcdfil.c b/vs/freetype/src/base/ftlcdfil.c similarity index 100% rename from vs2015/freetype/src/base/ftlcdfil.c rename to vs/freetype/src/base/ftlcdfil.c diff --git a/vs2015/freetype/src/base/ftmac.c b/vs/freetype/src/base/ftmac.c similarity index 100% rename from vs2015/freetype/src/base/ftmac.c rename to vs/freetype/src/base/ftmac.c diff --git a/vs2015/freetype/src/base/ftmm.c b/vs/freetype/src/base/ftmm.c similarity index 100% rename from vs2015/freetype/src/base/ftmm.c rename to vs/freetype/src/base/ftmm.c diff --git a/vs2015/freetype/src/base/ftobjs.c b/vs/freetype/src/base/ftobjs.c similarity index 100% rename from vs2015/freetype/src/base/ftobjs.c rename to vs/freetype/src/base/ftobjs.c diff --git a/vs2015/freetype/src/base/ftotval.c b/vs/freetype/src/base/ftotval.c similarity index 100% rename from vs2015/freetype/src/base/ftotval.c rename to vs/freetype/src/base/ftotval.c diff --git a/vs2015/freetype/src/base/ftoutln.c b/vs/freetype/src/base/ftoutln.c similarity index 100% rename from vs2015/freetype/src/base/ftoutln.c rename to vs/freetype/src/base/ftoutln.c diff --git a/vs2015/freetype/src/base/ftpatent.c b/vs/freetype/src/base/ftpatent.c similarity index 100% rename from vs2015/freetype/src/base/ftpatent.c rename to vs/freetype/src/base/ftpatent.c diff --git a/vs2015/freetype/src/base/ftpfr.c b/vs/freetype/src/base/ftpfr.c similarity index 100% rename from vs2015/freetype/src/base/ftpfr.c rename to vs/freetype/src/base/ftpfr.c diff --git a/vs2015/freetype/src/base/ftpic.c b/vs/freetype/src/base/ftpic.c similarity index 100% rename from vs2015/freetype/src/base/ftpic.c rename to vs/freetype/src/base/ftpic.c diff --git a/vs2015/freetype/src/base/ftpsprop.c b/vs/freetype/src/base/ftpsprop.c similarity index 100% rename from vs2015/freetype/src/base/ftpsprop.c rename to vs/freetype/src/base/ftpsprop.c diff --git a/vs2015/freetype/src/base/ftrfork.c b/vs/freetype/src/base/ftrfork.c similarity index 100% rename from vs2015/freetype/src/base/ftrfork.c rename to vs/freetype/src/base/ftrfork.c diff --git a/vs2015/freetype/src/base/ftsnames.c b/vs/freetype/src/base/ftsnames.c similarity index 100% rename from vs2015/freetype/src/base/ftsnames.c rename to vs/freetype/src/base/ftsnames.c diff --git a/vs2015/freetype/src/base/ftstream.c b/vs/freetype/src/base/ftstream.c similarity index 100% rename from vs2015/freetype/src/base/ftstream.c rename to vs/freetype/src/base/ftstream.c diff --git a/vs2015/freetype/src/base/ftstroke.c b/vs/freetype/src/base/ftstroke.c similarity index 100% rename from vs2015/freetype/src/base/ftstroke.c rename to vs/freetype/src/base/ftstroke.c diff --git a/vs2015/freetype/src/base/ftsynth.c b/vs/freetype/src/base/ftsynth.c similarity index 100% rename from vs2015/freetype/src/base/ftsynth.c rename to vs/freetype/src/base/ftsynth.c diff --git a/vs2015/freetype/src/base/ftsystem.c b/vs/freetype/src/base/ftsystem.c similarity index 100% rename from vs2015/freetype/src/base/ftsystem.c rename to vs/freetype/src/base/ftsystem.c diff --git a/vs2015/freetype/src/base/fttrigon.c b/vs/freetype/src/base/fttrigon.c similarity index 100% rename from vs2015/freetype/src/base/fttrigon.c rename to vs/freetype/src/base/fttrigon.c diff --git a/vs2015/freetype/src/base/fttype1.c b/vs/freetype/src/base/fttype1.c similarity index 100% rename from vs2015/freetype/src/base/fttype1.c rename to vs/freetype/src/base/fttype1.c diff --git a/vs2015/freetype/src/base/ftutil.c b/vs/freetype/src/base/ftutil.c similarity index 100% rename from vs2015/freetype/src/base/ftutil.c rename to vs/freetype/src/base/ftutil.c diff --git a/vs2015/freetype/src/base/ftver.rc b/vs/freetype/src/base/ftver.rc similarity index 100% rename from vs2015/freetype/src/base/ftver.rc rename to vs/freetype/src/base/ftver.rc diff --git a/vs2015/freetype/src/base/ftwinfnt.c b/vs/freetype/src/base/ftwinfnt.c similarity index 100% rename from vs2015/freetype/src/base/ftwinfnt.c rename to vs/freetype/src/base/ftwinfnt.c diff --git a/vs2015/freetype/src/base/md5.c b/vs/freetype/src/base/md5.c similarity index 100% rename from vs2015/freetype/src/base/md5.c rename to vs/freetype/src/base/md5.c diff --git a/vs2015/freetype/src/base/md5.h b/vs/freetype/src/base/md5.h similarity index 100% rename from vs2015/freetype/src/base/md5.h rename to vs/freetype/src/base/md5.h diff --git a/vs2015/freetype/src/base/rules.mk b/vs/freetype/src/base/rules.mk similarity index 100% rename from vs2015/freetype/src/base/rules.mk rename to vs/freetype/src/base/rules.mk diff --git a/vs2015/freetype/src/bdf/Jamfile b/vs/freetype/src/bdf/Jamfile similarity index 100% rename from vs2015/freetype/src/bdf/Jamfile rename to vs/freetype/src/bdf/Jamfile diff --git a/vs2015/freetype/src/bdf/README b/vs/freetype/src/bdf/README similarity index 100% rename from vs2015/freetype/src/bdf/README rename to vs/freetype/src/bdf/README diff --git a/vs2015/freetype/src/bdf/bdf.c b/vs/freetype/src/bdf/bdf.c similarity index 100% rename from vs2015/freetype/src/bdf/bdf.c rename to vs/freetype/src/bdf/bdf.c diff --git a/vs2015/freetype/src/bdf/bdf.h b/vs/freetype/src/bdf/bdf.h similarity index 100% rename from vs2015/freetype/src/bdf/bdf.h rename to vs/freetype/src/bdf/bdf.h diff --git a/vs2015/freetype/src/bdf/bdfdrivr.c b/vs/freetype/src/bdf/bdfdrivr.c similarity index 100% rename from vs2015/freetype/src/bdf/bdfdrivr.c rename to vs/freetype/src/bdf/bdfdrivr.c diff --git a/vs2015/freetype/src/bdf/bdfdrivr.h b/vs/freetype/src/bdf/bdfdrivr.h similarity index 100% rename from vs2015/freetype/src/bdf/bdfdrivr.h rename to vs/freetype/src/bdf/bdfdrivr.h diff --git a/vs2015/freetype/src/bdf/bdferror.h b/vs/freetype/src/bdf/bdferror.h similarity index 100% rename from vs2015/freetype/src/bdf/bdferror.h rename to vs/freetype/src/bdf/bdferror.h diff --git a/vs2015/freetype/src/bdf/bdflib.c b/vs/freetype/src/bdf/bdflib.c similarity index 100% rename from vs2015/freetype/src/bdf/bdflib.c rename to vs/freetype/src/bdf/bdflib.c diff --git a/vs2015/freetype/src/bdf/module.mk b/vs/freetype/src/bdf/module.mk similarity index 100% rename from vs2015/freetype/src/bdf/module.mk rename to vs/freetype/src/bdf/module.mk diff --git a/vs2015/freetype/src/bdf/rules.mk b/vs/freetype/src/bdf/rules.mk similarity index 100% rename from vs2015/freetype/src/bdf/rules.mk rename to vs/freetype/src/bdf/rules.mk diff --git a/vs2015/freetype/src/bzip2/Jamfile b/vs/freetype/src/bzip2/Jamfile similarity index 100% rename from vs2015/freetype/src/bzip2/Jamfile rename to vs/freetype/src/bzip2/Jamfile diff --git a/vs2015/freetype/src/bzip2/ftbzip2.c b/vs/freetype/src/bzip2/ftbzip2.c similarity index 100% rename from vs2015/freetype/src/bzip2/ftbzip2.c rename to vs/freetype/src/bzip2/ftbzip2.c diff --git a/vs2015/freetype/src/bzip2/rules.mk b/vs/freetype/src/bzip2/rules.mk similarity index 100% rename from vs2015/freetype/src/bzip2/rules.mk rename to vs/freetype/src/bzip2/rules.mk diff --git a/vs2015/freetype/src/cache/Jamfile b/vs/freetype/src/cache/Jamfile similarity index 100% rename from vs2015/freetype/src/cache/Jamfile rename to vs/freetype/src/cache/Jamfile diff --git a/vs2015/freetype/src/cache/ftcache.c b/vs/freetype/src/cache/ftcache.c similarity index 100% rename from vs2015/freetype/src/cache/ftcache.c rename to vs/freetype/src/cache/ftcache.c diff --git a/vs2015/freetype/src/cache/ftcbasic.c b/vs/freetype/src/cache/ftcbasic.c similarity index 100% rename from vs2015/freetype/src/cache/ftcbasic.c rename to vs/freetype/src/cache/ftcbasic.c diff --git a/vs2015/freetype/src/cache/ftccache.c b/vs/freetype/src/cache/ftccache.c similarity index 100% rename from vs2015/freetype/src/cache/ftccache.c rename to vs/freetype/src/cache/ftccache.c diff --git a/vs2015/freetype/src/cache/ftccache.h b/vs/freetype/src/cache/ftccache.h similarity index 100% rename from vs2015/freetype/src/cache/ftccache.h rename to vs/freetype/src/cache/ftccache.h diff --git a/vs2015/freetype/src/cache/ftccback.h b/vs/freetype/src/cache/ftccback.h similarity index 100% rename from vs2015/freetype/src/cache/ftccback.h rename to vs/freetype/src/cache/ftccback.h diff --git a/vs2015/freetype/src/cache/ftccmap.c b/vs/freetype/src/cache/ftccmap.c similarity index 100% rename from vs2015/freetype/src/cache/ftccmap.c rename to vs/freetype/src/cache/ftccmap.c diff --git a/vs2015/freetype/src/cache/ftcerror.h b/vs/freetype/src/cache/ftcerror.h similarity index 100% rename from vs2015/freetype/src/cache/ftcerror.h rename to vs/freetype/src/cache/ftcerror.h diff --git a/vs2015/freetype/src/cache/ftcglyph.c b/vs/freetype/src/cache/ftcglyph.c similarity index 100% rename from vs2015/freetype/src/cache/ftcglyph.c rename to vs/freetype/src/cache/ftcglyph.c diff --git a/vs2015/freetype/src/cache/ftcglyph.h b/vs/freetype/src/cache/ftcglyph.h similarity index 100% rename from vs2015/freetype/src/cache/ftcglyph.h rename to vs/freetype/src/cache/ftcglyph.h diff --git a/vs2015/freetype/src/cache/ftcimage.c b/vs/freetype/src/cache/ftcimage.c similarity index 100% rename from vs2015/freetype/src/cache/ftcimage.c rename to vs/freetype/src/cache/ftcimage.c diff --git a/vs2015/freetype/src/cache/ftcimage.h b/vs/freetype/src/cache/ftcimage.h similarity index 100% rename from vs2015/freetype/src/cache/ftcimage.h rename to vs/freetype/src/cache/ftcimage.h diff --git a/vs2015/freetype/src/cache/ftcmanag.c b/vs/freetype/src/cache/ftcmanag.c similarity index 100% rename from vs2015/freetype/src/cache/ftcmanag.c rename to vs/freetype/src/cache/ftcmanag.c diff --git a/vs2015/freetype/src/cache/ftcmanag.h b/vs/freetype/src/cache/ftcmanag.h similarity index 100% rename from vs2015/freetype/src/cache/ftcmanag.h rename to vs/freetype/src/cache/ftcmanag.h diff --git a/vs2015/freetype/src/cache/ftcmru.c b/vs/freetype/src/cache/ftcmru.c similarity index 100% rename from vs2015/freetype/src/cache/ftcmru.c rename to vs/freetype/src/cache/ftcmru.c diff --git a/vs2015/freetype/src/cache/ftcmru.h b/vs/freetype/src/cache/ftcmru.h similarity index 100% rename from vs2015/freetype/src/cache/ftcmru.h rename to vs/freetype/src/cache/ftcmru.h diff --git a/vs2015/freetype/src/cache/ftcsbits.c b/vs/freetype/src/cache/ftcsbits.c similarity index 100% rename from vs2015/freetype/src/cache/ftcsbits.c rename to vs/freetype/src/cache/ftcsbits.c diff --git a/vs2015/freetype/src/cache/ftcsbits.h b/vs/freetype/src/cache/ftcsbits.h similarity index 100% rename from vs2015/freetype/src/cache/ftcsbits.h rename to vs/freetype/src/cache/ftcsbits.h diff --git a/vs2015/freetype/src/cache/rules.mk b/vs/freetype/src/cache/rules.mk similarity index 100% rename from vs2015/freetype/src/cache/rules.mk rename to vs/freetype/src/cache/rules.mk diff --git a/vs2015/freetype/src/cff/Jamfile b/vs/freetype/src/cff/Jamfile similarity index 100% rename from vs2015/freetype/src/cff/Jamfile rename to vs/freetype/src/cff/Jamfile diff --git a/vs2015/freetype/src/cff/cff.c b/vs/freetype/src/cff/cff.c similarity index 100% rename from vs2015/freetype/src/cff/cff.c rename to vs/freetype/src/cff/cff.c diff --git a/vs2015/freetype/src/cff/cffcmap.c b/vs/freetype/src/cff/cffcmap.c similarity index 100% rename from vs2015/freetype/src/cff/cffcmap.c rename to vs/freetype/src/cff/cffcmap.c diff --git a/vs2015/freetype/src/cff/cffcmap.h b/vs/freetype/src/cff/cffcmap.h similarity index 100% rename from vs2015/freetype/src/cff/cffcmap.h rename to vs/freetype/src/cff/cffcmap.h diff --git a/vs2015/freetype/src/cff/cffdrivr.c b/vs/freetype/src/cff/cffdrivr.c similarity index 100% rename from vs2015/freetype/src/cff/cffdrivr.c rename to vs/freetype/src/cff/cffdrivr.c diff --git a/vs2015/freetype/src/cff/cffdrivr.h b/vs/freetype/src/cff/cffdrivr.h similarity index 100% rename from vs2015/freetype/src/cff/cffdrivr.h rename to vs/freetype/src/cff/cffdrivr.h diff --git a/vs2015/freetype/src/cff/cfferrs.h b/vs/freetype/src/cff/cfferrs.h similarity index 100% rename from vs2015/freetype/src/cff/cfferrs.h rename to vs/freetype/src/cff/cfferrs.h diff --git a/vs2015/freetype/src/cff/cffgload.c b/vs/freetype/src/cff/cffgload.c similarity index 100% rename from vs2015/freetype/src/cff/cffgload.c rename to vs/freetype/src/cff/cffgload.c diff --git a/vs2015/freetype/src/cff/cffgload.h b/vs/freetype/src/cff/cffgload.h similarity index 100% rename from vs2015/freetype/src/cff/cffgload.h rename to vs/freetype/src/cff/cffgload.h diff --git a/vs2015/freetype/src/cff/cffload.c b/vs/freetype/src/cff/cffload.c similarity index 100% rename from vs2015/freetype/src/cff/cffload.c rename to vs/freetype/src/cff/cffload.c diff --git a/vs2015/freetype/src/cff/cffload.h b/vs/freetype/src/cff/cffload.h similarity index 100% rename from vs2015/freetype/src/cff/cffload.h rename to vs/freetype/src/cff/cffload.h diff --git a/vs2015/freetype/src/cff/cffobjs.c b/vs/freetype/src/cff/cffobjs.c similarity index 100% rename from vs2015/freetype/src/cff/cffobjs.c rename to vs/freetype/src/cff/cffobjs.c diff --git a/vs2015/freetype/src/cff/cffobjs.h b/vs/freetype/src/cff/cffobjs.h similarity index 100% rename from vs2015/freetype/src/cff/cffobjs.h rename to vs/freetype/src/cff/cffobjs.h diff --git a/vs2015/freetype/src/cff/cffparse.c b/vs/freetype/src/cff/cffparse.c similarity index 100% rename from vs2015/freetype/src/cff/cffparse.c rename to vs/freetype/src/cff/cffparse.c diff --git a/vs2015/freetype/src/cff/cffparse.h b/vs/freetype/src/cff/cffparse.h similarity index 100% rename from vs2015/freetype/src/cff/cffparse.h rename to vs/freetype/src/cff/cffparse.h diff --git a/vs2015/freetype/src/cff/cffpic.c b/vs/freetype/src/cff/cffpic.c similarity index 100% rename from vs2015/freetype/src/cff/cffpic.c rename to vs/freetype/src/cff/cffpic.c diff --git a/vs2015/freetype/src/cff/cffpic.h b/vs/freetype/src/cff/cffpic.h similarity index 100% rename from vs2015/freetype/src/cff/cffpic.h rename to vs/freetype/src/cff/cffpic.h diff --git a/vs2015/freetype/src/cff/cfftoken.h b/vs/freetype/src/cff/cfftoken.h similarity index 100% rename from vs2015/freetype/src/cff/cfftoken.h rename to vs/freetype/src/cff/cfftoken.h diff --git a/vs2015/freetype/src/cff/module.mk b/vs/freetype/src/cff/module.mk similarity index 100% rename from vs2015/freetype/src/cff/module.mk rename to vs/freetype/src/cff/module.mk diff --git a/vs2015/freetype/src/cff/rules.mk b/vs/freetype/src/cff/rules.mk similarity index 100% rename from vs2015/freetype/src/cff/rules.mk rename to vs/freetype/src/cff/rules.mk diff --git a/vs2015/freetype/src/cid/Jamfile b/vs/freetype/src/cid/Jamfile similarity index 100% rename from vs2015/freetype/src/cid/Jamfile rename to vs/freetype/src/cid/Jamfile diff --git a/vs2015/freetype/src/cid/ciderrs.h b/vs/freetype/src/cid/ciderrs.h similarity index 100% rename from vs2015/freetype/src/cid/ciderrs.h rename to vs/freetype/src/cid/ciderrs.h diff --git a/vs2015/freetype/src/cid/cidgload.c b/vs/freetype/src/cid/cidgload.c similarity index 100% rename from vs2015/freetype/src/cid/cidgload.c rename to vs/freetype/src/cid/cidgload.c diff --git a/vs2015/freetype/src/cid/cidgload.h b/vs/freetype/src/cid/cidgload.h similarity index 100% rename from vs2015/freetype/src/cid/cidgload.h rename to vs/freetype/src/cid/cidgload.h diff --git a/vs2015/freetype/src/cid/cidload.c b/vs/freetype/src/cid/cidload.c similarity index 100% rename from vs2015/freetype/src/cid/cidload.c rename to vs/freetype/src/cid/cidload.c diff --git a/vs2015/freetype/src/cid/cidload.h b/vs/freetype/src/cid/cidload.h similarity index 100% rename from vs2015/freetype/src/cid/cidload.h rename to vs/freetype/src/cid/cidload.h diff --git a/vs2015/freetype/src/cid/cidobjs.c b/vs/freetype/src/cid/cidobjs.c similarity index 100% rename from vs2015/freetype/src/cid/cidobjs.c rename to vs/freetype/src/cid/cidobjs.c diff --git a/vs2015/freetype/src/cid/cidobjs.h b/vs/freetype/src/cid/cidobjs.h similarity index 100% rename from vs2015/freetype/src/cid/cidobjs.h rename to vs/freetype/src/cid/cidobjs.h diff --git a/vs2015/freetype/src/cid/cidparse.c b/vs/freetype/src/cid/cidparse.c similarity index 100% rename from vs2015/freetype/src/cid/cidparse.c rename to vs/freetype/src/cid/cidparse.c diff --git a/vs2015/freetype/src/cid/cidparse.h b/vs/freetype/src/cid/cidparse.h similarity index 100% rename from vs2015/freetype/src/cid/cidparse.h rename to vs/freetype/src/cid/cidparse.h diff --git a/vs2015/freetype/src/cid/cidriver.c b/vs/freetype/src/cid/cidriver.c similarity index 100% rename from vs2015/freetype/src/cid/cidriver.c rename to vs/freetype/src/cid/cidriver.c diff --git a/vs2015/freetype/src/cid/cidriver.h b/vs/freetype/src/cid/cidriver.h similarity index 100% rename from vs2015/freetype/src/cid/cidriver.h rename to vs/freetype/src/cid/cidriver.h diff --git a/vs2015/freetype/src/cid/cidtoken.h b/vs/freetype/src/cid/cidtoken.h similarity index 100% rename from vs2015/freetype/src/cid/cidtoken.h rename to vs/freetype/src/cid/cidtoken.h diff --git a/vs2015/freetype/src/cid/module.mk b/vs/freetype/src/cid/module.mk similarity index 100% rename from vs2015/freetype/src/cid/module.mk rename to vs/freetype/src/cid/module.mk diff --git a/vs2015/freetype/src/cid/rules.mk b/vs/freetype/src/cid/rules.mk similarity index 100% rename from vs2015/freetype/src/cid/rules.mk rename to vs/freetype/src/cid/rules.mk diff --git a/vs2015/freetype/src/cid/type1cid.c b/vs/freetype/src/cid/type1cid.c similarity index 100% rename from vs2015/freetype/src/cid/type1cid.c rename to vs/freetype/src/cid/type1cid.c diff --git a/vs2015/freetype/src/gxvalid/Jamfile b/vs/freetype/src/gxvalid/Jamfile similarity index 100% rename from vs2015/freetype/src/gxvalid/Jamfile rename to vs/freetype/src/gxvalid/Jamfile diff --git a/vs2015/freetype/src/gxvalid/README b/vs/freetype/src/gxvalid/README similarity index 100% rename from vs2015/freetype/src/gxvalid/README rename to vs/freetype/src/gxvalid/README diff --git a/vs2015/freetype/src/gxvalid/gxvalid.c b/vs/freetype/src/gxvalid/gxvalid.c similarity index 100% rename from vs2015/freetype/src/gxvalid/gxvalid.c rename to vs/freetype/src/gxvalid/gxvalid.c diff --git a/vs2015/freetype/src/gxvalid/gxvalid.h b/vs/freetype/src/gxvalid/gxvalid.h similarity index 100% rename from vs2015/freetype/src/gxvalid/gxvalid.h rename to vs/freetype/src/gxvalid/gxvalid.h diff --git a/vs2015/freetype/src/gxvalid/gxvbsln.c b/vs/freetype/src/gxvalid/gxvbsln.c similarity index 100% rename from vs2015/freetype/src/gxvalid/gxvbsln.c rename to vs/freetype/src/gxvalid/gxvbsln.c diff --git a/vs2015/freetype/src/gxvalid/gxvcommn.c b/vs/freetype/src/gxvalid/gxvcommn.c similarity index 100% rename from vs2015/freetype/src/gxvalid/gxvcommn.c rename to vs/freetype/src/gxvalid/gxvcommn.c diff --git a/vs2015/freetype/src/gxvalid/gxvcommn.h b/vs/freetype/src/gxvalid/gxvcommn.h similarity index 100% rename from vs2015/freetype/src/gxvalid/gxvcommn.h rename to vs/freetype/src/gxvalid/gxvcommn.h diff --git a/vs2015/freetype/src/gxvalid/gxverror.h b/vs/freetype/src/gxvalid/gxverror.h similarity index 100% rename from vs2015/freetype/src/gxvalid/gxverror.h rename to vs/freetype/src/gxvalid/gxverror.h diff --git a/vs2015/freetype/src/gxvalid/gxvfeat.c b/vs/freetype/src/gxvalid/gxvfeat.c similarity index 100% rename from vs2015/freetype/src/gxvalid/gxvfeat.c rename to vs/freetype/src/gxvalid/gxvfeat.c diff --git a/vs2015/freetype/src/gxvalid/gxvfeat.h b/vs/freetype/src/gxvalid/gxvfeat.h similarity index 100% rename from vs2015/freetype/src/gxvalid/gxvfeat.h rename to vs/freetype/src/gxvalid/gxvfeat.h diff --git a/vs2015/freetype/src/gxvalid/gxvfgen.c b/vs/freetype/src/gxvalid/gxvfgen.c similarity index 100% rename from vs2015/freetype/src/gxvalid/gxvfgen.c rename to vs/freetype/src/gxvalid/gxvfgen.c diff --git a/vs2015/freetype/src/gxvalid/gxvjust.c b/vs/freetype/src/gxvalid/gxvjust.c similarity index 100% rename from vs2015/freetype/src/gxvalid/gxvjust.c rename to vs/freetype/src/gxvalid/gxvjust.c diff --git a/vs2015/freetype/src/gxvalid/gxvkern.c b/vs/freetype/src/gxvalid/gxvkern.c similarity index 100% rename from vs2015/freetype/src/gxvalid/gxvkern.c rename to vs/freetype/src/gxvalid/gxvkern.c diff --git a/vs2015/freetype/src/gxvalid/gxvlcar.c b/vs/freetype/src/gxvalid/gxvlcar.c similarity index 100% rename from vs2015/freetype/src/gxvalid/gxvlcar.c rename to vs/freetype/src/gxvalid/gxvlcar.c diff --git a/vs2015/freetype/src/gxvalid/gxvmod.c b/vs/freetype/src/gxvalid/gxvmod.c similarity index 100% rename from vs2015/freetype/src/gxvalid/gxvmod.c rename to vs/freetype/src/gxvalid/gxvmod.c diff --git a/vs2015/freetype/src/gxvalid/gxvmod.h b/vs/freetype/src/gxvalid/gxvmod.h similarity index 100% rename from vs2015/freetype/src/gxvalid/gxvmod.h rename to vs/freetype/src/gxvalid/gxvmod.h diff --git a/vs2015/freetype/src/gxvalid/gxvmort.c b/vs/freetype/src/gxvalid/gxvmort.c similarity index 100% rename from vs2015/freetype/src/gxvalid/gxvmort.c rename to vs/freetype/src/gxvalid/gxvmort.c diff --git a/vs2015/freetype/src/gxvalid/gxvmort.h b/vs/freetype/src/gxvalid/gxvmort.h similarity index 100% rename from vs2015/freetype/src/gxvalid/gxvmort.h rename to vs/freetype/src/gxvalid/gxvmort.h diff --git a/vs2015/freetype/src/gxvalid/gxvmort0.c b/vs/freetype/src/gxvalid/gxvmort0.c similarity index 100% rename from vs2015/freetype/src/gxvalid/gxvmort0.c rename to vs/freetype/src/gxvalid/gxvmort0.c diff --git a/vs2015/freetype/src/gxvalid/gxvmort1.c b/vs/freetype/src/gxvalid/gxvmort1.c similarity index 100% rename from vs2015/freetype/src/gxvalid/gxvmort1.c rename to vs/freetype/src/gxvalid/gxvmort1.c diff --git a/vs2015/freetype/src/gxvalid/gxvmort2.c b/vs/freetype/src/gxvalid/gxvmort2.c similarity index 100% rename from vs2015/freetype/src/gxvalid/gxvmort2.c rename to vs/freetype/src/gxvalid/gxvmort2.c diff --git a/vs2015/freetype/src/gxvalid/gxvmort4.c b/vs/freetype/src/gxvalid/gxvmort4.c similarity index 100% rename from vs2015/freetype/src/gxvalid/gxvmort4.c rename to vs/freetype/src/gxvalid/gxvmort4.c diff --git a/vs2015/freetype/src/gxvalid/gxvmort5.c b/vs/freetype/src/gxvalid/gxvmort5.c similarity index 100% rename from vs2015/freetype/src/gxvalid/gxvmort5.c rename to vs/freetype/src/gxvalid/gxvmort5.c diff --git a/vs2015/freetype/src/gxvalid/gxvmorx.c b/vs/freetype/src/gxvalid/gxvmorx.c similarity index 100% rename from vs2015/freetype/src/gxvalid/gxvmorx.c rename to vs/freetype/src/gxvalid/gxvmorx.c diff --git a/vs2015/freetype/src/gxvalid/gxvmorx.h b/vs/freetype/src/gxvalid/gxvmorx.h similarity index 100% rename from vs2015/freetype/src/gxvalid/gxvmorx.h rename to vs/freetype/src/gxvalid/gxvmorx.h diff --git a/vs2015/freetype/src/gxvalid/gxvmorx0.c b/vs/freetype/src/gxvalid/gxvmorx0.c similarity index 100% rename from vs2015/freetype/src/gxvalid/gxvmorx0.c rename to vs/freetype/src/gxvalid/gxvmorx0.c diff --git a/vs2015/freetype/src/gxvalid/gxvmorx1.c b/vs/freetype/src/gxvalid/gxvmorx1.c similarity index 100% rename from vs2015/freetype/src/gxvalid/gxvmorx1.c rename to vs/freetype/src/gxvalid/gxvmorx1.c diff --git a/vs2015/freetype/src/gxvalid/gxvmorx2.c b/vs/freetype/src/gxvalid/gxvmorx2.c similarity index 100% rename from vs2015/freetype/src/gxvalid/gxvmorx2.c rename to vs/freetype/src/gxvalid/gxvmorx2.c diff --git a/vs2015/freetype/src/gxvalid/gxvmorx4.c b/vs/freetype/src/gxvalid/gxvmorx4.c similarity index 100% rename from vs2015/freetype/src/gxvalid/gxvmorx4.c rename to vs/freetype/src/gxvalid/gxvmorx4.c diff --git a/vs2015/freetype/src/gxvalid/gxvmorx5.c b/vs/freetype/src/gxvalid/gxvmorx5.c similarity index 100% rename from vs2015/freetype/src/gxvalid/gxvmorx5.c rename to vs/freetype/src/gxvalid/gxvmorx5.c diff --git a/vs2015/freetype/src/gxvalid/gxvopbd.c b/vs/freetype/src/gxvalid/gxvopbd.c similarity index 100% rename from vs2015/freetype/src/gxvalid/gxvopbd.c rename to vs/freetype/src/gxvalid/gxvopbd.c diff --git a/vs2015/freetype/src/gxvalid/gxvprop.c b/vs/freetype/src/gxvalid/gxvprop.c similarity index 100% rename from vs2015/freetype/src/gxvalid/gxvprop.c rename to vs/freetype/src/gxvalid/gxvprop.c diff --git a/vs2015/freetype/src/gxvalid/gxvtrak.c b/vs/freetype/src/gxvalid/gxvtrak.c similarity index 100% rename from vs2015/freetype/src/gxvalid/gxvtrak.c rename to vs/freetype/src/gxvalid/gxvtrak.c diff --git a/vs2015/freetype/src/gxvalid/module.mk b/vs/freetype/src/gxvalid/module.mk similarity index 100% rename from vs2015/freetype/src/gxvalid/module.mk rename to vs/freetype/src/gxvalid/module.mk diff --git a/vs2015/freetype/src/gxvalid/rules.mk b/vs/freetype/src/gxvalid/rules.mk similarity index 100% rename from vs2015/freetype/src/gxvalid/rules.mk rename to vs/freetype/src/gxvalid/rules.mk diff --git a/vs2015/freetype/src/gzip/Jamfile b/vs/freetype/src/gzip/Jamfile similarity index 100% rename from vs2015/freetype/src/gzip/Jamfile rename to vs/freetype/src/gzip/Jamfile diff --git a/vs2015/freetype/src/gzip/adler32.c b/vs/freetype/src/gzip/adler32.c similarity index 100% rename from vs2015/freetype/src/gzip/adler32.c rename to vs/freetype/src/gzip/adler32.c diff --git a/vs2015/freetype/src/gzip/ftgzip.c b/vs/freetype/src/gzip/ftgzip.c similarity index 100% rename from vs2015/freetype/src/gzip/ftgzip.c rename to vs/freetype/src/gzip/ftgzip.c diff --git a/vs2015/freetype/src/gzip/ftzconf.h b/vs/freetype/src/gzip/ftzconf.h similarity index 100% rename from vs2015/freetype/src/gzip/ftzconf.h rename to vs/freetype/src/gzip/ftzconf.h diff --git a/vs2015/freetype/src/gzip/infblock.c b/vs/freetype/src/gzip/infblock.c similarity index 100% rename from vs2015/freetype/src/gzip/infblock.c rename to vs/freetype/src/gzip/infblock.c diff --git a/vs2015/freetype/src/gzip/infblock.h b/vs/freetype/src/gzip/infblock.h similarity index 100% rename from vs2015/freetype/src/gzip/infblock.h rename to vs/freetype/src/gzip/infblock.h diff --git a/vs2015/freetype/src/gzip/infcodes.c b/vs/freetype/src/gzip/infcodes.c similarity index 100% rename from vs2015/freetype/src/gzip/infcodes.c rename to vs/freetype/src/gzip/infcodes.c diff --git a/vs2015/freetype/src/gzip/infcodes.h b/vs/freetype/src/gzip/infcodes.h similarity index 100% rename from vs2015/freetype/src/gzip/infcodes.h rename to vs/freetype/src/gzip/infcodes.h diff --git a/vs2015/freetype/src/gzip/inffixed.h b/vs/freetype/src/gzip/inffixed.h similarity index 100% rename from vs2015/freetype/src/gzip/inffixed.h rename to vs/freetype/src/gzip/inffixed.h diff --git a/vs2015/freetype/src/gzip/inflate.c b/vs/freetype/src/gzip/inflate.c similarity index 100% rename from vs2015/freetype/src/gzip/inflate.c rename to vs/freetype/src/gzip/inflate.c diff --git a/vs2015/freetype/src/gzip/inftrees.c b/vs/freetype/src/gzip/inftrees.c similarity index 100% rename from vs2015/freetype/src/gzip/inftrees.c rename to vs/freetype/src/gzip/inftrees.c diff --git a/vs2015/freetype/src/gzip/inftrees.h b/vs/freetype/src/gzip/inftrees.h similarity index 100% rename from vs2015/freetype/src/gzip/inftrees.h rename to vs/freetype/src/gzip/inftrees.h diff --git a/vs2015/freetype/src/gzip/infutil.c b/vs/freetype/src/gzip/infutil.c similarity index 100% rename from vs2015/freetype/src/gzip/infutil.c rename to vs/freetype/src/gzip/infutil.c diff --git a/vs2015/freetype/src/gzip/infutil.h b/vs/freetype/src/gzip/infutil.h similarity index 100% rename from vs2015/freetype/src/gzip/infutil.h rename to vs/freetype/src/gzip/infutil.h diff --git a/vs2015/freetype/src/gzip/rules.mk b/vs/freetype/src/gzip/rules.mk similarity index 100% rename from vs2015/freetype/src/gzip/rules.mk rename to vs/freetype/src/gzip/rules.mk diff --git a/vs2015/freetype/src/gzip/zlib.h b/vs/freetype/src/gzip/zlib.h similarity index 100% rename from vs2015/freetype/src/gzip/zlib.h rename to vs/freetype/src/gzip/zlib.h diff --git a/vs2015/freetype/src/gzip/zutil.c b/vs/freetype/src/gzip/zutil.c similarity index 100% rename from vs2015/freetype/src/gzip/zutil.c rename to vs/freetype/src/gzip/zutil.c diff --git a/vs2015/freetype/src/gzip/zutil.h b/vs/freetype/src/gzip/zutil.h similarity index 100% rename from vs2015/freetype/src/gzip/zutil.h rename to vs/freetype/src/gzip/zutil.h diff --git a/vs2015/freetype/src/lzw/Jamfile b/vs/freetype/src/lzw/Jamfile similarity index 100% rename from vs2015/freetype/src/lzw/Jamfile rename to vs/freetype/src/lzw/Jamfile diff --git a/vs2015/freetype/src/lzw/ftlzw.c b/vs/freetype/src/lzw/ftlzw.c similarity index 100% rename from vs2015/freetype/src/lzw/ftlzw.c rename to vs/freetype/src/lzw/ftlzw.c diff --git a/vs2015/freetype/src/lzw/ftzopen.c b/vs/freetype/src/lzw/ftzopen.c similarity index 100% rename from vs2015/freetype/src/lzw/ftzopen.c rename to vs/freetype/src/lzw/ftzopen.c diff --git a/vs2015/freetype/src/lzw/ftzopen.h b/vs/freetype/src/lzw/ftzopen.h similarity index 100% rename from vs2015/freetype/src/lzw/ftzopen.h rename to vs/freetype/src/lzw/ftzopen.h diff --git a/vs2015/freetype/src/lzw/rules.mk b/vs/freetype/src/lzw/rules.mk similarity index 100% rename from vs2015/freetype/src/lzw/rules.mk rename to vs/freetype/src/lzw/rules.mk diff --git a/vs2015/freetype/src/otvalid/Jamfile b/vs/freetype/src/otvalid/Jamfile similarity index 100% rename from vs2015/freetype/src/otvalid/Jamfile rename to vs/freetype/src/otvalid/Jamfile diff --git a/vs2015/freetype/src/otvalid/module.mk b/vs/freetype/src/otvalid/module.mk similarity index 100% rename from vs2015/freetype/src/otvalid/module.mk rename to vs/freetype/src/otvalid/module.mk diff --git a/vs2015/freetype/src/otvalid/otvalid.c b/vs/freetype/src/otvalid/otvalid.c similarity index 100% rename from vs2015/freetype/src/otvalid/otvalid.c rename to vs/freetype/src/otvalid/otvalid.c diff --git a/vs2015/freetype/src/otvalid/otvalid.h b/vs/freetype/src/otvalid/otvalid.h similarity index 100% rename from vs2015/freetype/src/otvalid/otvalid.h rename to vs/freetype/src/otvalid/otvalid.h diff --git a/vs2015/freetype/src/otvalid/otvbase.c b/vs/freetype/src/otvalid/otvbase.c similarity index 100% rename from vs2015/freetype/src/otvalid/otvbase.c rename to vs/freetype/src/otvalid/otvbase.c diff --git a/vs2015/freetype/src/otvalid/otvcommn.c b/vs/freetype/src/otvalid/otvcommn.c similarity index 100% rename from vs2015/freetype/src/otvalid/otvcommn.c rename to vs/freetype/src/otvalid/otvcommn.c diff --git a/vs2015/freetype/src/otvalid/otvcommn.h b/vs/freetype/src/otvalid/otvcommn.h similarity index 100% rename from vs2015/freetype/src/otvalid/otvcommn.h rename to vs/freetype/src/otvalid/otvcommn.h diff --git a/vs2015/freetype/src/otvalid/otverror.h b/vs/freetype/src/otvalid/otverror.h similarity index 100% rename from vs2015/freetype/src/otvalid/otverror.h rename to vs/freetype/src/otvalid/otverror.h diff --git a/vs2015/freetype/src/otvalid/otvgdef.c b/vs/freetype/src/otvalid/otvgdef.c similarity index 100% rename from vs2015/freetype/src/otvalid/otvgdef.c rename to vs/freetype/src/otvalid/otvgdef.c diff --git a/vs2015/freetype/src/otvalid/otvgpos.c b/vs/freetype/src/otvalid/otvgpos.c similarity index 100% rename from vs2015/freetype/src/otvalid/otvgpos.c rename to vs/freetype/src/otvalid/otvgpos.c diff --git a/vs2015/freetype/src/otvalid/otvgpos.h b/vs/freetype/src/otvalid/otvgpos.h similarity index 100% rename from vs2015/freetype/src/otvalid/otvgpos.h rename to vs/freetype/src/otvalid/otvgpos.h diff --git a/vs2015/freetype/src/otvalid/otvgsub.c b/vs/freetype/src/otvalid/otvgsub.c similarity index 100% rename from vs2015/freetype/src/otvalid/otvgsub.c rename to vs/freetype/src/otvalid/otvgsub.c diff --git a/vs2015/freetype/src/otvalid/otvjstf.c b/vs/freetype/src/otvalid/otvjstf.c similarity index 100% rename from vs2015/freetype/src/otvalid/otvjstf.c rename to vs/freetype/src/otvalid/otvjstf.c diff --git a/vs2015/freetype/src/otvalid/otvmath.c b/vs/freetype/src/otvalid/otvmath.c similarity index 100% rename from vs2015/freetype/src/otvalid/otvmath.c rename to vs/freetype/src/otvalid/otvmath.c diff --git a/vs2015/freetype/src/otvalid/otvmod.c b/vs/freetype/src/otvalid/otvmod.c similarity index 100% rename from vs2015/freetype/src/otvalid/otvmod.c rename to vs/freetype/src/otvalid/otvmod.c diff --git a/vs2015/freetype/src/otvalid/otvmod.h b/vs/freetype/src/otvalid/otvmod.h similarity index 100% rename from vs2015/freetype/src/otvalid/otvmod.h rename to vs/freetype/src/otvalid/otvmod.h diff --git a/vs2015/freetype/src/otvalid/rules.mk b/vs/freetype/src/otvalid/rules.mk similarity index 100% rename from vs2015/freetype/src/otvalid/rules.mk rename to vs/freetype/src/otvalid/rules.mk diff --git a/vs2015/freetype/src/pcf/Jamfile b/vs/freetype/src/pcf/Jamfile similarity index 100% rename from vs2015/freetype/src/pcf/Jamfile rename to vs/freetype/src/pcf/Jamfile diff --git a/vs2015/freetype/src/pcf/README b/vs/freetype/src/pcf/README similarity index 100% rename from vs2015/freetype/src/pcf/README rename to vs/freetype/src/pcf/README diff --git a/vs2015/freetype/src/pcf/module.mk b/vs/freetype/src/pcf/module.mk similarity index 100% rename from vs2015/freetype/src/pcf/module.mk rename to vs/freetype/src/pcf/module.mk diff --git a/vs2015/freetype/src/pcf/pcf.c b/vs/freetype/src/pcf/pcf.c similarity index 100% rename from vs2015/freetype/src/pcf/pcf.c rename to vs/freetype/src/pcf/pcf.c diff --git a/vs2015/freetype/src/pcf/pcf.h b/vs/freetype/src/pcf/pcf.h similarity index 100% rename from vs2015/freetype/src/pcf/pcf.h rename to vs/freetype/src/pcf/pcf.h diff --git a/vs2015/freetype/src/pcf/pcfdrivr.c b/vs/freetype/src/pcf/pcfdrivr.c similarity index 100% rename from vs2015/freetype/src/pcf/pcfdrivr.c rename to vs/freetype/src/pcf/pcfdrivr.c diff --git a/vs2015/freetype/src/pcf/pcfdrivr.h b/vs/freetype/src/pcf/pcfdrivr.h similarity index 100% rename from vs2015/freetype/src/pcf/pcfdrivr.h rename to vs/freetype/src/pcf/pcfdrivr.h diff --git a/vs2015/freetype/src/pcf/pcferror.h b/vs/freetype/src/pcf/pcferror.h similarity index 100% rename from vs2015/freetype/src/pcf/pcferror.h rename to vs/freetype/src/pcf/pcferror.h diff --git a/vs2015/freetype/src/pcf/pcfread.c b/vs/freetype/src/pcf/pcfread.c similarity index 100% rename from vs2015/freetype/src/pcf/pcfread.c rename to vs/freetype/src/pcf/pcfread.c diff --git a/vs2015/freetype/src/pcf/pcfread.h b/vs/freetype/src/pcf/pcfread.h similarity index 100% rename from vs2015/freetype/src/pcf/pcfread.h rename to vs/freetype/src/pcf/pcfread.h diff --git a/vs2015/freetype/src/pcf/pcfutil.c b/vs/freetype/src/pcf/pcfutil.c similarity index 100% rename from vs2015/freetype/src/pcf/pcfutil.c rename to vs/freetype/src/pcf/pcfutil.c diff --git a/vs2015/freetype/src/pcf/pcfutil.h b/vs/freetype/src/pcf/pcfutil.h similarity index 100% rename from vs2015/freetype/src/pcf/pcfutil.h rename to vs/freetype/src/pcf/pcfutil.h diff --git a/vs2015/freetype/src/pcf/rules.mk b/vs/freetype/src/pcf/rules.mk similarity index 100% rename from vs2015/freetype/src/pcf/rules.mk rename to vs/freetype/src/pcf/rules.mk diff --git a/vs2015/freetype/src/pfr/Jamfile b/vs/freetype/src/pfr/Jamfile similarity index 100% rename from vs2015/freetype/src/pfr/Jamfile rename to vs/freetype/src/pfr/Jamfile diff --git a/vs2015/freetype/src/pfr/module.mk b/vs/freetype/src/pfr/module.mk similarity index 100% rename from vs2015/freetype/src/pfr/module.mk rename to vs/freetype/src/pfr/module.mk diff --git a/vs2015/freetype/src/pfr/pfr.c b/vs/freetype/src/pfr/pfr.c similarity index 100% rename from vs2015/freetype/src/pfr/pfr.c rename to vs/freetype/src/pfr/pfr.c diff --git a/vs2015/freetype/src/pfr/pfrcmap.c b/vs/freetype/src/pfr/pfrcmap.c similarity index 100% rename from vs2015/freetype/src/pfr/pfrcmap.c rename to vs/freetype/src/pfr/pfrcmap.c diff --git a/vs2015/freetype/src/pfr/pfrcmap.h b/vs/freetype/src/pfr/pfrcmap.h similarity index 100% rename from vs2015/freetype/src/pfr/pfrcmap.h rename to vs/freetype/src/pfr/pfrcmap.h diff --git a/vs2015/freetype/src/pfr/pfrdrivr.c b/vs/freetype/src/pfr/pfrdrivr.c similarity index 100% rename from vs2015/freetype/src/pfr/pfrdrivr.c rename to vs/freetype/src/pfr/pfrdrivr.c diff --git a/vs2015/freetype/src/pfr/pfrdrivr.h b/vs/freetype/src/pfr/pfrdrivr.h similarity index 100% rename from vs2015/freetype/src/pfr/pfrdrivr.h rename to vs/freetype/src/pfr/pfrdrivr.h diff --git a/vs2015/freetype/src/pfr/pfrerror.h b/vs/freetype/src/pfr/pfrerror.h similarity index 100% rename from vs2015/freetype/src/pfr/pfrerror.h rename to vs/freetype/src/pfr/pfrerror.h diff --git a/vs2015/freetype/src/pfr/pfrgload.c b/vs/freetype/src/pfr/pfrgload.c similarity index 100% rename from vs2015/freetype/src/pfr/pfrgload.c rename to vs/freetype/src/pfr/pfrgload.c diff --git a/vs2015/freetype/src/pfr/pfrgload.h b/vs/freetype/src/pfr/pfrgload.h similarity index 100% rename from vs2015/freetype/src/pfr/pfrgload.h rename to vs/freetype/src/pfr/pfrgload.h diff --git a/vs2015/freetype/src/pfr/pfrload.c b/vs/freetype/src/pfr/pfrload.c similarity index 100% rename from vs2015/freetype/src/pfr/pfrload.c rename to vs/freetype/src/pfr/pfrload.c diff --git a/vs2015/freetype/src/pfr/pfrload.h b/vs/freetype/src/pfr/pfrload.h similarity index 100% rename from vs2015/freetype/src/pfr/pfrload.h rename to vs/freetype/src/pfr/pfrload.h diff --git a/vs2015/freetype/src/pfr/pfrobjs.c b/vs/freetype/src/pfr/pfrobjs.c similarity index 100% rename from vs2015/freetype/src/pfr/pfrobjs.c rename to vs/freetype/src/pfr/pfrobjs.c diff --git a/vs2015/freetype/src/pfr/pfrobjs.h b/vs/freetype/src/pfr/pfrobjs.h similarity index 100% rename from vs2015/freetype/src/pfr/pfrobjs.h rename to vs/freetype/src/pfr/pfrobjs.h diff --git a/vs2015/freetype/src/pfr/pfrsbit.c b/vs/freetype/src/pfr/pfrsbit.c similarity index 100% rename from vs2015/freetype/src/pfr/pfrsbit.c rename to vs/freetype/src/pfr/pfrsbit.c diff --git a/vs2015/freetype/src/pfr/pfrsbit.h b/vs/freetype/src/pfr/pfrsbit.h similarity index 100% rename from vs2015/freetype/src/pfr/pfrsbit.h rename to vs/freetype/src/pfr/pfrsbit.h diff --git a/vs2015/freetype/src/pfr/pfrtypes.h b/vs/freetype/src/pfr/pfrtypes.h similarity index 100% rename from vs2015/freetype/src/pfr/pfrtypes.h rename to vs/freetype/src/pfr/pfrtypes.h diff --git a/vs2015/freetype/src/pfr/rules.mk b/vs/freetype/src/pfr/rules.mk similarity index 100% rename from vs2015/freetype/src/pfr/rules.mk rename to vs/freetype/src/pfr/rules.mk diff --git a/vs2015/freetype/src/psaux/Jamfile b/vs/freetype/src/psaux/Jamfile similarity index 100% rename from vs2015/freetype/src/psaux/Jamfile rename to vs/freetype/src/psaux/Jamfile diff --git a/vs2015/freetype/src/psaux/afmparse.c b/vs/freetype/src/psaux/afmparse.c similarity index 100% rename from vs2015/freetype/src/psaux/afmparse.c rename to vs/freetype/src/psaux/afmparse.c diff --git a/vs2015/freetype/src/psaux/afmparse.h b/vs/freetype/src/psaux/afmparse.h similarity index 100% rename from vs2015/freetype/src/psaux/afmparse.h rename to vs/freetype/src/psaux/afmparse.h diff --git a/vs2015/freetype/src/psaux/cffdecode.c b/vs/freetype/src/psaux/cffdecode.c similarity index 100% rename from vs2015/freetype/src/psaux/cffdecode.c rename to vs/freetype/src/psaux/cffdecode.c diff --git a/vs2015/freetype/src/psaux/cffdecode.h b/vs/freetype/src/psaux/cffdecode.h similarity index 100% rename from vs2015/freetype/src/psaux/cffdecode.h rename to vs/freetype/src/psaux/cffdecode.h diff --git a/vs2015/freetype/src/psaux/module.mk b/vs/freetype/src/psaux/module.mk similarity index 100% rename from vs2015/freetype/src/psaux/module.mk rename to vs/freetype/src/psaux/module.mk diff --git a/vs2015/freetype/src/psaux/psarrst.c b/vs/freetype/src/psaux/psarrst.c similarity index 100% rename from vs2015/freetype/src/psaux/psarrst.c rename to vs/freetype/src/psaux/psarrst.c diff --git a/vs2015/freetype/src/psaux/psarrst.h b/vs/freetype/src/psaux/psarrst.h similarity index 100% rename from vs2015/freetype/src/psaux/psarrst.h rename to vs/freetype/src/psaux/psarrst.h diff --git a/vs2015/freetype/src/psaux/psaux.c b/vs/freetype/src/psaux/psaux.c similarity index 100% rename from vs2015/freetype/src/psaux/psaux.c rename to vs/freetype/src/psaux/psaux.c diff --git a/vs2015/freetype/src/psaux/psauxerr.h b/vs/freetype/src/psaux/psauxerr.h similarity index 100% rename from vs2015/freetype/src/psaux/psauxerr.h rename to vs/freetype/src/psaux/psauxerr.h diff --git a/vs2015/freetype/src/psaux/psauxmod.c b/vs/freetype/src/psaux/psauxmod.c similarity index 100% rename from vs2015/freetype/src/psaux/psauxmod.c rename to vs/freetype/src/psaux/psauxmod.c diff --git a/vs2015/freetype/src/psaux/psauxmod.h b/vs/freetype/src/psaux/psauxmod.h similarity index 100% rename from vs2015/freetype/src/psaux/psauxmod.h rename to vs/freetype/src/psaux/psauxmod.h diff --git a/vs2015/freetype/src/psaux/psblues.c b/vs/freetype/src/psaux/psblues.c similarity index 100% rename from vs2015/freetype/src/psaux/psblues.c rename to vs/freetype/src/psaux/psblues.c diff --git a/vs2015/freetype/src/psaux/psblues.h b/vs/freetype/src/psaux/psblues.h similarity index 100% rename from vs2015/freetype/src/psaux/psblues.h rename to vs/freetype/src/psaux/psblues.h diff --git a/vs2015/freetype/src/psaux/psconv.c b/vs/freetype/src/psaux/psconv.c similarity index 100% rename from vs2015/freetype/src/psaux/psconv.c rename to vs/freetype/src/psaux/psconv.c diff --git a/vs2015/freetype/src/psaux/psconv.h b/vs/freetype/src/psaux/psconv.h similarity index 100% rename from vs2015/freetype/src/psaux/psconv.h rename to vs/freetype/src/psaux/psconv.h diff --git a/vs2015/freetype/src/psaux/pserror.c b/vs/freetype/src/psaux/pserror.c similarity index 100% rename from vs2015/freetype/src/psaux/pserror.c rename to vs/freetype/src/psaux/pserror.c diff --git a/vs2015/freetype/src/psaux/pserror.h b/vs/freetype/src/psaux/pserror.h similarity index 100% rename from vs2015/freetype/src/psaux/pserror.h rename to vs/freetype/src/psaux/pserror.h diff --git a/vs2015/freetype/src/psaux/psfixed.h b/vs/freetype/src/psaux/psfixed.h similarity index 100% rename from vs2015/freetype/src/psaux/psfixed.h rename to vs/freetype/src/psaux/psfixed.h diff --git a/vs2015/freetype/src/psaux/psfont.c b/vs/freetype/src/psaux/psfont.c similarity index 100% rename from vs2015/freetype/src/psaux/psfont.c rename to vs/freetype/src/psaux/psfont.c diff --git a/vs2015/freetype/src/psaux/psfont.h b/vs/freetype/src/psaux/psfont.h similarity index 100% rename from vs2015/freetype/src/psaux/psfont.h rename to vs/freetype/src/psaux/psfont.h diff --git a/vs2015/freetype/src/psaux/psft.c b/vs/freetype/src/psaux/psft.c similarity index 100% rename from vs2015/freetype/src/psaux/psft.c rename to vs/freetype/src/psaux/psft.c diff --git a/vs2015/freetype/src/psaux/psft.h b/vs/freetype/src/psaux/psft.h similarity index 100% rename from vs2015/freetype/src/psaux/psft.h rename to vs/freetype/src/psaux/psft.h diff --git a/vs2015/freetype/src/psaux/psglue.h b/vs/freetype/src/psaux/psglue.h similarity index 100% rename from vs2015/freetype/src/psaux/psglue.h rename to vs/freetype/src/psaux/psglue.h diff --git a/vs2015/freetype/src/psaux/pshints.c b/vs/freetype/src/psaux/pshints.c similarity index 100% rename from vs2015/freetype/src/psaux/pshints.c rename to vs/freetype/src/psaux/pshints.c diff --git a/vs2015/freetype/src/psaux/pshints.h b/vs/freetype/src/psaux/pshints.h similarity index 100% rename from vs2015/freetype/src/psaux/pshints.h rename to vs/freetype/src/psaux/pshints.h diff --git a/vs2015/freetype/src/psaux/psintrp.c b/vs/freetype/src/psaux/psintrp.c similarity index 100% rename from vs2015/freetype/src/psaux/psintrp.c rename to vs/freetype/src/psaux/psintrp.c diff --git a/vs2015/freetype/src/psaux/psintrp.h b/vs/freetype/src/psaux/psintrp.h similarity index 100% rename from vs2015/freetype/src/psaux/psintrp.h rename to vs/freetype/src/psaux/psintrp.h diff --git a/vs2015/freetype/src/psaux/psobjs.c b/vs/freetype/src/psaux/psobjs.c similarity index 100% rename from vs2015/freetype/src/psaux/psobjs.c rename to vs/freetype/src/psaux/psobjs.c diff --git a/vs2015/freetype/src/psaux/psobjs.h b/vs/freetype/src/psaux/psobjs.h similarity index 100% rename from vs2015/freetype/src/psaux/psobjs.h rename to vs/freetype/src/psaux/psobjs.h diff --git a/vs2015/freetype/src/psaux/psread.c b/vs/freetype/src/psaux/psread.c similarity index 100% rename from vs2015/freetype/src/psaux/psread.c rename to vs/freetype/src/psaux/psread.c diff --git a/vs2015/freetype/src/psaux/psread.h b/vs/freetype/src/psaux/psread.h similarity index 100% rename from vs2015/freetype/src/psaux/psread.h rename to vs/freetype/src/psaux/psread.h diff --git a/vs2015/freetype/src/psaux/psstack.c b/vs/freetype/src/psaux/psstack.c similarity index 100% rename from vs2015/freetype/src/psaux/psstack.c rename to vs/freetype/src/psaux/psstack.c diff --git a/vs2015/freetype/src/psaux/psstack.h b/vs/freetype/src/psaux/psstack.h similarity index 100% rename from vs2015/freetype/src/psaux/psstack.h rename to vs/freetype/src/psaux/psstack.h diff --git a/vs2015/freetype/src/psaux/pstypes.h b/vs/freetype/src/psaux/pstypes.h similarity index 100% rename from vs2015/freetype/src/psaux/pstypes.h rename to vs/freetype/src/psaux/pstypes.h diff --git a/vs2015/freetype/src/psaux/rules.mk b/vs/freetype/src/psaux/rules.mk similarity index 100% rename from vs2015/freetype/src/psaux/rules.mk rename to vs/freetype/src/psaux/rules.mk diff --git a/vs2015/freetype/src/psaux/t1cmap.c b/vs/freetype/src/psaux/t1cmap.c similarity index 100% rename from vs2015/freetype/src/psaux/t1cmap.c rename to vs/freetype/src/psaux/t1cmap.c diff --git a/vs2015/freetype/src/psaux/t1cmap.h b/vs/freetype/src/psaux/t1cmap.h similarity index 100% rename from vs2015/freetype/src/psaux/t1cmap.h rename to vs/freetype/src/psaux/t1cmap.h diff --git a/vs2015/freetype/src/psaux/t1decode.c b/vs/freetype/src/psaux/t1decode.c similarity index 100% rename from vs2015/freetype/src/psaux/t1decode.c rename to vs/freetype/src/psaux/t1decode.c diff --git a/vs2015/freetype/src/psaux/t1decode.h b/vs/freetype/src/psaux/t1decode.h similarity index 100% rename from vs2015/freetype/src/psaux/t1decode.h rename to vs/freetype/src/psaux/t1decode.h diff --git a/vs2015/freetype/src/pshinter/Jamfile b/vs/freetype/src/pshinter/Jamfile similarity index 100% rename from vs2015/freetype/src/pshinter/Jamfile rename to vs/freetype/src/pshinter/Jamfile diff --git a/vs2015/freetype/src/pshinter/module.mk b/vs/freetype/src/pshinter/module.mk similarity index 100% rename from vs2015/freetype/src/pshinter/module.mk rename to vs/freetype/src/pshinter/module.mk diff --git a/vs2015/freetype/src/pshinter/pshalgo.c b/vs/freetype/src/pshinter/pshalgo.c similarity index 100% rename from vs2015/freetype/src/pshinter/pshalgo.c rename to vs/freetype/src/pshinter/pshalgo.c diff --git a/vs2015/freetype/src/pshinter/pshalgo.h b/vs/freetype/src/pshinter/pshalgo.h similarity index 100% rename from vs2015/freetype/src/pshinter/pshalgo.h rename to vs/freetype/src/pshinter/pshalgo.h diff --git a/vs2015/freetype/src/pshinter/pshglob.c b/vs/freetype/src/pshinter/pshglob.c similarity index 100% rename from vs2015/freetype/src/pshinter/pshglob.c rename to vs/freetype/src/pshinter/pshglob.c diff --git a/vs2015/freetype/src/pshinter/pshglob.h b/vs/freetype/src/pshinter/pshglob.h similarity index 100% rename from vs2015/freetype/src/pshinter/pshglob.h rename to vs/freetype/src/pshinter/pshglob.h diff --git a/vs2015/freetype/src/pshinter/pshinter.c b/vs/freetype/src/pshinter/pshinter.c similarity index 100% rename from vs2015/freetype/src/pshinter/pshinter.c rename to vs/freetype/src/pshinter/pshinter.c diff --git a/vs2015/freetype/src/pshinter/pshmod.c b/vs/freetype/src/pshinter/pshmod.c similarity index 100% rename from vs2015/freetype/src/pshinter/pshmod.c rename to vs/freetype/src/pshinter/pshmod.c diff --git a/vs2015/freetype/src/pshinter/pshmod.h b/vs/freetype/src/pshinter/pshmod.h similarity index 100% rename from vs2015/freetype/src/pshinter/pshmod.h rename to vs/freetype/src/pshinter/pshmod.h diff --git a/vs2015/freetype/src/pshinter/pshnterr.h b/vs/freetype/src/pshinter/pshnterr.h similarity index 100% rename from vs2015/freetype/src/pshinter/pshnterr.h rename to vs/freetype/src/pshinter/pshnterr.h diff --git a/vs2015/freetype/src/pshinter/pshpic.c b/vs/freetype/src/pshinter/pshpic.c similarity index 100% rename from vs2015/freetype/src/pshinter/pshpic.c rename to vs/freetype/src/pshinter/pshpic.c diff --git a/vs2015/freetype/src/pshinter/pshpic.h b/vs/freetype/src/pshinter/pshpic.h similarity index 100% rename from vs2015/freetype/src/pshinter/pshpic.h rename to vs/freetype/src/pshinter/pshpic.h diff --git a/vs2015/freetype/src/pshinter/pshrec.c b/vs/freetype/src/pshinter/pshrec.c similarity index 100% rename from vs2015/freetype/src/pshinter/pshrec.c rename to vs/freetype/src/pshinter/pshrec.c diff --git a/vs2015/freetype/src/pshinter/pshrec.h b/vs/freetype/src/pshinter/pshrec.h similarity index 100% rename from vs2015/freetype/src/pshinter/pshrec.h rename to vs/freetype/src/pshinter/pshrec.h diff --git a/vs2015/freetype/src/pshinter/rules.mk b/vs/freetype/src/pshinter/rules.mk similarity index 100% rename from vs2015/freetype/src/pshinter/rules.mk rename to vs/freetype/src/pshinter/rules.mk diff --git a/vs2015/freetype/src/psnames/Jamfile b/vs/freetype/src/psnames/Jamfile similarity index 100% rename from vs2015/freetype/src/psnames/Jamfile rename to vs/freetype/src/psnames/Jamfile diff --git a/vs2015/freetype/src/psnames/module.mk b/vs/freetype/src/psnames/module.mk similarity index 100% rename from vs2015/freetype/src/psnames/module.mk rename to vs/freetype/src/psnames/module.mk diff --git a/vs2015/freetype/src/psnames/psmodule.c b/vs/freetype/src/psnames/psmodule.c similarity index 100% rename from vs2015/freetype/src/psnames/psmodule.c rename to vs/freetype/src/psnames/psmodule.c diff --git a/vs2015/freetype/src/psnames/psmodule.h b/vs/freetype/src/psnames/psmodule.h similarity index 100% rename from vs2015/freetype/src/psnames/psmodule.h rename to vs/freetype/src/psnames/psmodule.h diff --git a/vs2015/freetype/src/psnames/psnamerr.h b/vs/freetype/src/psnames/psnamerr.h similarity index 100% rename from vs2015/freetype/src/psnames/psnamerr.h rename to vs/freetype/src/psnames/psnamerr.h diff --git a/vs2015/freetype/src/psnames/psnames.c b/vs/freetype/src/psnames/psnames.c similarity index 100% rename from vs2015/freetype/src/psnames/psnames.c rename to vs/freetype/src/psnames/psnames.c diff --git a/vs2015/freetype/src/psnames/pspic.c b/vs/freetype/src/psnames/pspic.c similarity index 100% rename from vs2015/freetype/src/psnames/pspic.c rename to vs/freetype/src/psnames/pspic.c diff --git a/vs2015/freetype/src/psnames/pspic.h b/vs/freetype/src/psnames/pspic.h similarity index 100% rename from vs2015/freetype/src/psnames/pspic.h rename to vs/freetype/src/psnames/pspic.h diff --git a/vs2015/freetype/src/psnames/pstables.h b/vs/freetype/src/psnames/pstables.h similarity index 100% rename from vs2015/freetype/src/psnames/pstables.h rename to vs/freetype/src/psnames/pstables.h diff --git a/vs2015/freetype/src/psnames/rules.mk b/vs/freetype/src/psnames/rules.mk similarity index 100% rename from vs2015/freetype/src/psnames/rules.mk rename to vs/freetype/src/psnames/rules.mk diff --git a/vs2015/freetype/src/raster/Jamfile b/vs/freetype/src/raster/Jamfile similarity index 100% rename from vs2015/freetype/src/raster/Jamfile rename to vs/freetype/src/raster/Jamfile diff --git a/vs2015/freetype/src/raster/ftmisc.h b/vs/freetype/src/raster/ftmisc.h similarity index 100% rename from vs2015/freetype/src/raster/ftmisc.h rename to vs/freetype/src/raster/ftmisc.h diff --git a/vs2015/freetype/src/raster/ftraster.c b/vs/freetype/src/raster/ftraster.c similarity index 100% rename from vs2015/freetype/src/raster/ftraster.c rename to vs/freetype/src/raster/ftraster.c diff --git a/vs2015/freetype/src/raster/ftraster.h b/vs/freetype/src/raster/ftraster.h similarity index 100% rename from vs2015/freetype/src/raster/ftraster.h rename to vs/freetype/src/raster/ftraster.h diff --git a/vs2015/freetype/src/raster/ftrend1.c b/vs/freetype/src/raster/ftrend1.c similarity index 100% rename from vs2015/freetype/src/raster/ftrend1.c rename to vs/freetype/src/raster/ftrend1.c diff --git a/vs2015/freetype/src/raster/ftrend1.h b/vs/freetype/src/raster/ftrend1.h similarity index 100% rename from vs2015/freetype/src/raster/ftrend1.h rename to vs/freetype/src/raster/ftrend1.h diff --git a/vs2015/freetype/src/raster/module.mk b/vs/freetype/src/raster/module.mk similarity index 100% rename from vs2015/freetype/src/raster/module.mk rename to vs/freetype/src/raster/module.mk diff --git a/vs2015/freetype/src/raster/raster.c b/vs/freetype/src/raster/raster.c similarity index 100% rename from vs2015/freetype/src/raster/raster.c rename to vs/freetype/src/raster/raster.c diff --git a/vs2015/freetype/src/raster/rasterrs.h b/vs/freetype/src/raster/rasterrs.h similarity index 100% rename from vs2015/freetype/src/raster/rasterrs.h rename to vs/freetype/src/raster/rasterrs.h diff --git a/vs2015/freetype/src/raster/rastpic.c b/vs/freetype/src/raster/rastpic.c similarity index 100% rename from vs2015/freetype/src/raster/rastpic.c rename to vs/freetype/src/raster/rastpic.c diff --git a/vs2015/freetype/src/raster/rastpic.h b/vs/freetype/src/raster/rastpic.h similarity index 100% rename from vs2015/freetype/src/raster/rastpic.h rename to vs/freetype/src/raster/rastpic.h diff --git a/vs2015/freetype/src/raster/rules.mk b/vs/freetype/src/raster/rules.mk similarity index 100% rename from vs2015/freetype/src/raster/rules.mk rename to vs/freetype/src/raster/rules.mk diff --git a/vs2015/freetype/src/sfnt/Jamfile b/vs/freetype/src/sfnt/Jamfile similarity index 100% rename from vs2015/freetype/src/sfnt/Jamfile rename to vs/freetype/src/sfnt/Jamfile diff --git a/vs2015/freetype/src/sfnt/module.mk b/vs/freetype/src/sfnt/module.mk similarity index 100% rename from vs2015/freetype/src/sfnt/module.mk rename to vs/freetype/src/sfnt/module.mk diff --git a/vs2015/freetype/src/sfnt/pngshim.c b/vs/freetype/src/sfnt/pngshim.c similarity index 100% rename from vs2015/freetype/src/sfnt/pngshim.c rename to vs/freetype/src/sfnt/pngshim.c diff --git a/vs2015/freetype/src/sfnt/pngshim.h b/vs/freetype/src/sfnt/pngshim.h similarity index 100% rename from vs2015/freetype/src/sfnt/pngshim.h rename to vs/freetype/src/sfnt/pngshim.h diff --git a/vs2015/freetype/src/sfnt/rules.mk b/vs/freetype/src/sfnt/rules.mk similarity index 100% rename from vs2015/freetype/src/sfnt/rules.mk rename to vs/freetype/src/sfnt/rules.mk diff --git a/vs2015/freetype/src/sfnt/sfdriver.c b/vs/freetype/src/sfnt/sfdriver.c similarity index 100% rename from vs2015/freetype/src/sfnt/sfdriver.c rename to vs/freetype/src/sfnt/sfdriver.c diff --git a/vs2015/freetype/src/sfnt/sfdriver.h b/vs/freetype/src/sfnt/sfdriver.h similarity index 100% rename from vs2015/freetype/src/sfnt/sfdriver.h rename to vs/freetype/src/sfnt/sfdriver.h diff --git a/vs2015/freetype/src/sfnt/sferrors.h b/vs/freetype/src/sfnt/sferrors.h similarity index 100% rename from vs2015/freetype/src/sfnt/sferrors.h rename to vs/freetype/src/sfnt/sferrors.h diff --git a/vs2015/freetype/src/sfnt/sfnt.c b/vs/freetype/src/sfnt/sfnt.c similarity index 100% rename from vs2015/freetype/src/sfnt/sfnt.c rename to vs/freetype/src/sfnt/sfnt.c diff --git a/vs2015/freetype/src/sfnt/sfntpic.c b/vs/freetype/src/sfnt/sfntpic.c similarity index 100% rename from vs2015/freetype/src/sfnt/sfntpic.c rename to vs/freetype/src/sfnt/sfntpic.c diff --git a/vs2015/freetype/src/sfnt/sfntpic.h b/vs/freetype/src/sfnt/sfntpic.h similarity index 100% rename from vs2015/freetype/src/sfnt/sfntpic.h rename to vs/freetype/src/sfnt/sfntpic.h diff --git a/vs2015/freetype/src/sfnt/sfobjs.c b/vs/freetype/src/sfnt/sfobjs.c similarity index 100% rename from vs2015/freetype/src/sfnt/sfobjs.c rename to vs/freetype/src/sfnt/sfobjs.c diff --git a/vs2015/freetype/src/sfnt/sfobjs.h b/vs/freetype/src/sfnt/sfobjs.h similarity index 100% rename from vs2015/freetype/src/sfnt/sfobjs.h rename to vs/freetype/src/sfnt/sfobjs.h diff --git a/vs2015/freetype/src/sfnt/ttbdf.c b/vs/freetype/src/sfnt/ttbdf.c similarity index 100% rename from vs2015/freetype/src/sfnt/ttbdf.c rename to vs/freetype/src/sfnt/ttbdf.c diff --git a/vs2015/freetype/src/sfnt/ttbdf.h b/vs/freetype/src/sfnt/ttbdf.h similarity index 100% rename from vs2015/freetype/src/sfnt/ttbdf.h rename to vs/freetype/src/sfnt/ttbdf.h diff --git a/vs2015/freetype/src/sfnt/ttcmap.c b/vs/freetype/src/sfnt/ttcmap.c similarity index 100% rename from vs2015/freetype/src/sfnt/ttcmap.c rename to vs/freetype/src/sfnt/ttcmap.c diff --git a/vs2015/freetype/src/sfnt/ttcmap.h b/vs/freetype/src/sfnt/ttcmap.h similarity index 100% rename from vs2015/freetype/src/sfnt/ttcmap.h rename to vs/freetype/src/sfnt/ttcmap.h diff --git a/vs2015/freetype/src/sfnt/ttcmapc.h b/vs/freetype/src/sfnt/ttcmapc.h similarity index 100% rename from vs2015/freetype/src/sfnt/ttcmapc.h rename to vs/freetype/src/sfnt/ttcmapc.h diff --git a/vs2015/freetype/src/sfnt/ttkern.c b/vs/freetype/src/sfnt/ttkern.c similarity index 100% rename from vs2015/freetype/src/sfnt/ttkern.c rename to vs/freetype/src/sfnt/ttkern.c diff --git a/vs2015/freetype/src/sfnt/ttkern.h b/vs/freetype/src/sfnt/ttkern.h similarity index 100% rename from vs2015/freetype/src/sfnt/ttkern.h rename to vs/freetype/src/sfnt/ttkern.h diff --git a/vs2015/freetype/src/sfnt/ttload.c b/vs/freetype/src/sfnt/ttload.c similarity index 100% rename from vs2015/freetype/src/sfnt/ttload.c rename to vs/freetype/src/sfnt/ttload.c diff --git a/vs2015/freetype/src/sfnt/ttload.h b/vs/freetype/src/sfnt/ttload.h similarity index 100% rename from vs2015/freetype/src/sfnt/ttload.h rename to vs/freetype/src/sfnt/ttload.h diff --git a/vs2015/freetype/src/sfnt/ttmtx.c b/vs/freetype/src/sfnt/ttmtx.c similarity index 100% rename from vs2015/freetype/src/sfnt/ttmtx.c rename to vs/freetype/src/sfnt/ttmtx.c diff --git a/vs2015/freetype/src/sfnt/ttmtx.h b/vs/freetype/src/sfnt/ttmtx.h similarity index 100% rename from vs2015/freetype/src/sfnt/ttmtx.h rename to vs/freetype/src/sfnt/ttmtx.h diff --git a/vs2015/freetype/src/sfnt/ttpost.c b/vs/freetype/src/sfnt/ttpost.c similarity index 100% rename from vs2015/freetype/src/sfnt/ttpost.c rename to vs/freetype/src/sfnt/ttpost.c diff --git a/vs2015/freetype/src/sfnt/ttpost.h b/vs/freetype/src/sfnt/ttpost.h similarity index 100% rename from vs2015/freetype/src/sfnt/ttpost.h rename to vs/freetype/src/sfnt/ttpost.h diff --git a/vs2015/freetype/src/sfnt/ttsbit.c b/vs/freetype/src/sfnt/ttsbit.c similarity index 100% rename from vs2015/freetype/src/sfnt/ttsbit.c rename to vs/freetype/src/sfnt/ttsbit.c diff --git a/vs2015/freetype/src/sfnt/ttsbit.h b/vs/freetype/src/sfnt/ttsbit.h similarity index 100% rename from vs2015/freetype/src/sfnt/ttsbit.h rename to vs/freetype/src/sfnt/ttsbit.h diff --git a/vs2015/freetype/src/smooth/Jamfile b/vs/freetype/src/smooth/Jamfile similarity index 100% rename from vs2015/freetype/src/smooth/Jamfile rename to vs/freetype/src/smooth/Jamfile diff --git a/vs2015/freetype/src/smooth/ftgrays.c b/vs/freetype/src/smooth/ftgrays.c similarity index 100% rename from vs2015/freetype/src/smooth/ftgrays.c rename to vs/freetype/src/smooth/ftgrays.c diff --git a/vs2015/freetype/src/smooth/ftgrays.h b/vs/freetype/src/smooth/ftgrays.h similarity index 100% rename from vs2015/freetype/src/smooth/ftgrays.h rename to vs/freetype/src/smooth/ftgrays.h diff --git a/vs2015/freetype/src/smooth/ftsmerrs.h b/vs/freetype/src/smooth/ftsmerrs.h similarity index 100% rename from vs2015/freetype/src/smooth/ftsmerrs.h rename to vs/freetype/src/smooth/ftsmerrs.h diff --git a/vs2015/freetype/src/smooth/ftsmooth.c b/vs/freetype/src/smooth/ftsmooth.c similarity index 100% rename from vs2015/freetype/src/smooth/ftsmooth.c rename to vs/freetype/src/smooth/ftsmooth.c diff --git a/vs2015/freetype/src/smooth/ftsmooth.h b/vs/freetype/src/smooth/ftsmooth.h similarity index 100% rename from vs2015/freetype/src/smooth/ftsmooth.h rename to vs/freetype/src/smooth/ftsmooth.h diff --git a/vs2015/freetype/src/smooth/ftspic.c b/vs/freetype/src/smooth/ftspic.c similarity index 100% rename from vs2015/freetype/src/smooth/ftspic.c rename to vs/freetype/src/smooth/ftspic.c diff --git a/vs2015/freetype/src/smooth/ftspic.h b/vs/freetype/src/smooth/ftspic.h similarity index 100% rename from vs2015/freetype/src/smooth/ftspic.h rename to vs/freetype/src/smooth/ftspic.h diff --git a/vs2015/freetype/src/smooth/module.mk b/vs/freetype/src/smooth/module.mk similarity index 100% rename from vs2015/freetype/src/smooth/module.mk rename to vs/freetype/src/smooth/module.mk diff --git a/vs2015/freetype/src/smooth/rules.mk b/vs/freetype/src/smooth/rules.mk similarity index 100% rename from vs2015/freetype/src/smooth/rules.mk rename to vs/freetype/src/smooth/rules.mk diff --git a/vs2015/freetype/src/smooth/smooth.c b/vs/freetype/src/smooth/smooth.c similarity index 100% rename from vs2015/freetype/src/smooth/smooth.c rename to vs/freetype/src/smooth/smooth.c diff --git a/vs2015/freetype/src/tools/Jamfile b/vs/freetype/src/tools/Jamfile similarity index 100% rename from vs2015/freetype/src/tools/Jamfile rename to vs/freetype/src/tools/Jamfile diff --git a/vs2015/freetype/src/tools/afblue.pl b/vs/freetype/src/tools/afblue.pl similarity index 100% rename from vs2015/freetype/src/tools/afblue.pl rename to vs/freetype/src/tools/afblue.pl diff --git a/vs2015/freetype/src/tools/apinames.c b/vs/freetype/src/tools/apinames.c similarity index 100% rename from vs2015/freetype/src/tools/apinames.c rename to vs/freetype/src/tools/apinames.c diff --git a/vs2015/freetype/src/tools/chktrcmp.py b/vs/freetype/src/tools/chktrcmp.py similarity index 100% rename from vs2015/freetype/src/tools/chktrcmp.py rename to vs/freetype/src/tools/chktrcmp.py diff --git a/vs2015/freetype/src/tools/cordic.py b/vs/freetype/src/tools/cordic.py similarity index 100% rename from vs2015/freetype/src/tools/cordic.py rename to vs/freetype/src/tools/cordic.py diff --git a/vs2015/freetype/src/tools/docmaker/content.py b/vs/freetype/src/tools/docmaker/content.py similarity index 100% rename from vs2015/freetype/src/tools/docmaker/content.py rename to vs/freetype/src/tools/docmaker/content.py diff --git a/vs2015/freetype/src/tools/docmaker/docbeauty.py b/vs/freetype/src/tools/docmaker/docbeauty.py similarity index 100% rename from vs2015/freetype/src/tools/docmaker/docbeauty.py rename to vs/freetype/src/tools/docmaker/docbeauty.py diff --git a/vs2015/freetype/src/tools/docmaker/docmaker.py b/vs/freetype/src/tools/docmaker/docmaker.py similarity index 100% rename from vs2015/freetype/src/tools/docmaker/docmaker.py rename to vs/freetype/src/tools/docmaker/docmaker.py diff --git a/vs2015/freetype/src/tools/docmaker/formatter.py b/vs/freetype/src/tools/docmaker/formatter.py similarity index 100% rename from vs2015/freetype/src/tools/docmaker/formatter.py rename to vs/freetype/src/tools/docmaker/formatter.py diff --git a/vs2015/freetype/src/tools/docmaker/sources.py b/vs/freetype/src/tools/docmaker/sources.py similarity index 100% rename from vs2015/freetype/src/tools/docmaker/sources.py rename to vs/freetype/src/tools/docmaker/sources.py diff --git a/vs2015/freetype/src/tools/docmaker/tohtml.py b/vs/freetype/src/tools/docmaker/tohtml.py similarity index 100% rename from vs2015/freetype/src/tools/docmaker/tohtml.py rename to vs/freetype/src/tools/docmaker/tohtml.py diff --git a/vs2015/freetype/src/tools/docmaker/utils.py b/vs/freetype/src/tools/docmaker/utils.py similarity index 100% rename from vs2015/freetype/src/tools/docmaker/utils.py rename to vs/freetype/src/tools/docmaker/utils.py diff --git a/vs2015/freetype/src/tools/ftfuzzer/README b/vs/freetype/src/tools/ftfuzzer/README similarity index 100% rename from vs2015/freetype/src/tools/ftfuzzer/README rename to vs/freetype/src/tools/ftfuzzer/README diff --git a/vs2015/freetype/src/tools/ftfuzzer/ftfuzzer.cc b/vs/freetype/src/tools/ftfuzzer/ftfuzzer.cc similarity index 100% rename from vs2015/freetype/src/tools/ftfuzzer/ftfuzzer.cc rename to vs/freetype/src/tools/ftfuzzer/ftfuzzer.cc diff --git a/vs2015/freetype/src/tools/ftfuzzer/ftmutator.cc b/vs/freetype/src/tools/ftfuzzer/ftmutator.cc similarity index 100% rename from vs2015/freetype/src/tools/ftfuzzer/ftmutator.cc rename to vs/freetype/src/tools/ftfuzzer/ftmutator.cc diff --git a/vs2015/freetype/src/tools/ftfuzzer/rasterfuzzer.cc b/vs/freetype/src/tools/ftfuzzer/rasterfuzzer.cc similarity index 100% rename from vs2015/freetype/src/tools/ftfuzzer/rasterfuzzer.cc rename to vs/freetype/src/tools/ftfuzzer/rasterfuzzer.cc diff --git a/vs2015/freetype/src/tools/ftfuzzer/runinput.cc b/vs/freetype/src/tools/ftfuzzer/runinput.cc similarity index 100% rename from vs2015/freetype/src/tools/ftfuzzer/runinput.cc rename to vs/freetype/src/tools/ftfuzzer/runinput.cc diff --git a/vs2015/freetype/src/tools/ftrandom/README b/vs/freetype/src/tools/ftrandom/README similarity index 100% rename from vs2015/freetype/src/tools/ftrandom/README rename to vs/freetype/src/tools/ftrandom/README diff --git a/vs2015/freetype/src/tools/ftrandom/ftrandom.c b/vs/freetype/src/tools/ftrandom/ftrandom.c similarity index 100% rename from vs2015/freetype/src/tools/ftrandom/ftrandom.c rename to vs/freetype/src/tools/ftrandom/ftrandom.c diff --git a/vs2015/freetype/src/tools/glnames.py b/vs/freetype/src/tools/glnames.py similarity index 100% rename from vs2015/freetype/src/tools/glnames.py rename to vs/freetype/src/tools/glnames.py diff --git a/vs2015/freetype/src/tools/no-copyright b/vs/freetype/src/tools/no-copyright similarity index 100% rename from vs2015/freetype/src/tools/no-copyright rename to vs/freetype/src/tools/no-copyright diff --git a/vs2015/freetype/src/tools/test_afm.c b/vs/freetype/src/tools/test_afm.c similarity index 100% rename from vs2015/freetype/src/tools/test_afm.c rename to vs/freetype/src/tools/test_afm.c diff --git a/vs2015/freetype/src/tools/test_bbox.c b/vs/freetype/src/tools/test_bbox.c similarity index 100% rename from vs2015/freetype/src/tools/test_bbox.c rename to vs/freetype/src/tools/test_bbox.c diff --git a/vs2015/freetype/src/tools/test_trig.c b/vs/freetype/src/tools/test_trig.c similarity index 100% rename from vs2015/freetype/src/tools/test_trig.c rename to vs/freetype/src/tools/test_trig.c diff --git a/vs2015/freetype/src/tools/update-copyright b/vs/freetype/src/tools/update-copyright similarity index 100% rename from vs2015/freetype/src/tools/update-copyright rename to vs/freetype/src/tools/update-copyright diff --git a/vs2015/freetype/src/tools/update-copyright-year b/vs/freetype/src/tools/update-copyright-year similarity index 100% rename from vs2015/freetype/src/tools/update-copyright-year rename to vs/freetype/src/tools/update-copyright-year diff --git a/vs2015/freetype/src/truetype/Jamfile b/vs/freetype/src/truetype/Jamfile similarity index 100% rename from vs2015/freetype/src/truetype/Jamfile rename to vs/freetype/src/truetype/Jamfile diff --git a/vs2015/freetype/src/truetype/module.mk b/vs/freetype/src/truetype/module.mk similarity index 100% rename from vs2015/freetype/src/truetype/module.mk rename to vs/freetype/src/truetype/module.mk diff --git a/vs2015/freetype/src/truetype/rules.mk b/vs/freetype/src/truetype/rules.mk similarity index 100% rename from vs2015/freetype/src/truetype/rules.mk rename to vs/freetype/src/truetype/rules.mk diff --git a/vs2015/freetype/src/truetype/truetype.c b/vs/freetype/src/truetype/truetype.c similarity index 100% rename from vs2015/freetype/src/truetype/truetype.c rename to vs/freetype/src/truetype/truetype.c diff --git a/vs2015/freetype/src/truetype/ttdriver.c b/vs/freetype/src/truetype/ttdriver.c similarity index 100% rename from vs2015/freetype/src/truetype/ttdriver.c rename to vs/freetype/src/truetype/ttdriver.c diff --git a/vs2015/freetype/src/truetype/ttdriver.h b/vs/freetype/src/truetype/ttdriver.h similarity index 100% rename from vs2015/freetype/src/truetype/ttdriver.h rename to vs/freetype/src/truetype/ttdriver.h diff --git a/vs2015/freetype/src/truetype/tterrors.h b/vs/freetype/src/truetype/tterrors.h similarity index 100% rename from vs2015/freetype/src/truetype/tterrors.h rename to vs/freetype/src/truetype/tterrors.h diff --git a/vs2015/freetype/src/truetype/ttgload.c b/vs/freetype/src/truetype/ttgload.c similarity index 100% rename from vs2015/freetype/src/truetype/ttgload.c rename to vs/freetype/src/truetype/ttgload.c diff --git a/vs2015/freetype/src/truetype/ttgload.h b/vs/freetype/src/truetype/ttgload.h similarity index 100% rename from vs2015/freetype/src/truetype/ttgload.h rename to vs/freetype/src/truetype/ttgload.h diff --git a/vs2015/freetype/src/truetype/ttgxvar.c b/vs/freetype/src/truetype/ttgxvar.c similarity index 100% rename from vs2015/freetype/src/truetype/ttgxvar.c rename to vs/freetype/src/truetype/ttgxvar.c diff --git a/vs2015/freetype/src/truetype/ttgxvar.h b/vs/freetype/src/truetype/ttgxvar.h similarity index 100% rename from vs2015/freetype/src/truetype/ttgxvar.h rename to vs/freetype/src/truetype/ttgxvar.h diff --git a/vs2015/freetype/src/truetype/ttinterp.c b/vs/freetype/src/truetype/ttinterp.c similarity index 100% rename from vs2015/freetype/src/truetype/ttinterp.c rename to vs/freetype/src/truetype/ttinterp.c diff --git a/vs2015/freetype/src/truetype/ttinterp.h b/vs/freetype/src/truetype/ttinterp.h similarity index 100% rename from vs2015/freetype/src/truetype/ttinterp.h rename to vs/freetype/src/truetype/ttinterp.h diff --git a/vs2015/freetype/src/truetype/ttobjs.c b/vs/freetype/src/truetype/ttobjs.c similarity index 100% rename from vs2015/freetype/src/truetype/ttobjs.c rename to vs/freetype/src/truetype/ttobjs.c diff --git a/vs2015/freetype/src/truetype/ttobjs.h b/vs/freetype/src/truetype/ttobjs.h similarity index 100% rename from vs2015/freetype/src/truetype/ttobjs.h rename to vs/freetype/src/truetype/ttobjs.h diff --git a/vs2015/freetype/src/truetype/ttpic.c b/vs/freetype/src/truetype/ttpic.c similarity index 100% rename from vs2015/freetype/src/truetype/ttpic.c rename to vs/freetype/src/truetype/ttpic.c diff --git a/vs2015/freetype/src/truetype/ttpic.h b/vs/freetype/src/truetype/ttpic.h similarity index 100% rename from vs2015/freetype/src/truetype/ttpic.h rename to vs/freetype/src/truetype/ttpic.h diff --git a/vs2015/freetype/src/truetype/ttpload.c b/vs/freetype/src/truetype/ttpload.c similarity index 100% rename from vs2015/freetype/src/truetype/ttpload.c rename to vs/freetype/src/truetype/ttpload.c diff --git a/vs2015/freetype/src/truetype/ttpload.h b/vs/freetype/src/truetype/ttpload.h similarity index 100% rename from vs2015/freetype/src/truetype/ttpload.h rename to vs/freetype/src/truetype/ttpload.h diff --git a/vs2015/freetype/src/truetype/ttsubpix.c b/vs/freetype/src/truetype/ttsubpix.c similarity index 100% rename from vs2015/freetype/src/truetype/ttsubpix.c rename to vs/freetype/src/truetype/ttsubpix.c diff --git a/vs2015/freetype/src/truetype/ttsubpix.h b/vs/freetype/src/truetype/ttsubpix.h similarity index 100% rename from vs2015/freetype/src/truetype/ttsubpix.h rename to vs/freetype/src/truetype/ttsubpix.h diff --git a/vs2015/freetype/src/type1/Jamfile b/vs/freetype/src/type1/Jamfile similarity index 100% rename from vs2015/freetype/src/type1/Jamfile rename to vs/freetype/src/type1/Jamfile diff --git a/vs2015/freetype/src/type1/module.mk b/vs/freetype/src/type1/module.mk similarity index 100% rename from vs2015/freetype/src/type1/module.mk rename to vs/freetype/src/type1/module.mk diff --git a/vs2015/freetype/src/type1/rules.mk b/vs/freetype/src/type1/rules.mk similarity index 100% rename from vs2015/freetype/src/type1/rules.mk rename to vs/freetype/src/type1/rules.mk diff --git a/vs2015/freetype/src/type1/t1afm.c b/vs/freetype/src/type1/t1afm.c similarity index 100% rename from vs2015/freetype/src/type1/t1afm.c rename to vs/freetype/src/type1/t1afm.c diff --git a/vs2015/freetype/src/type1/t1afm.h b/vs/freetype/src/type1/t1afm.h similarity index 100% rename from vs2015/freetype/src/type1/t1afm.h rename to vs/freetype/src/type1/t1afm.h diff --git a/vs2015/freetype/src/type1/t1driver.c b/vs/freetype/src/type1/t1driver.c similarity index 100% rename from vs2015/freetype/src/type1/t1driver.c rename to vs/freetype/src/type1/t1driver.c diff --git a/vs2015/freetype/src/type1/t1driver.h b/vs/freetype/src/type1/t1driver.h similarity index 100% rename from vs2015/freetype/src/type1/t1driver.h rename to vs/freetype/src/type1/t1driver.h diff --git a/vs2015/freetype/src/type1/t1errors.h b/vs/freetype/src/type1/t1errors.h similarity index 100% rename from vs2015/freetype/src/type1/t1errors.h rename to vs/freetype/src/type1/t1errors.h diff --git a/vs2015/freetype/src/type1/t1gload.c b/vs/freetype/src/type1/t1gload.c similarity index 100% rename from vs2015/freetype/src/type1/t1gload.c rename to vs/freetype/src/type1/t1gload.c diff --git a/vs2015/freetype/src/type1/t1gload.h b/vs/freetype/src/type1/t1gload.h similarity index 100% rename from vs2015/freetype/src/type1/t1gload.h rename to vs/freetype/src/type1/t1gload.h diff --git a/vs2015/freetype/src/type1/t1load.c b/vs/freetype/src/type1/t1load.c similarity index 100% rename from vs2015/freetype/src/type1/t1load.c rename to vs/freetype/src/type1/t1load.c diff --git a/vs2015/freetype/src/type1/t1load.h b/vs/freetype/src/type1/t1load.h similarity index 100% rename from vs2015/freetype/src/type1/t1load.h rename to vs/freetype/src/type1/t1load.h diff --git a/vs2015/freetype/src/type1/t1objs.c b/vs/freetype/src/type1/t1objs.c similarity index 100% rename from vs2015/freetype/src/type1/t1objs.c rename to vs/freetype/src/type1/t1objs.c diff --git a/vs2015/freetype/src/type1/t1objs.h b/vs/freetype/src/type1/t1objs.h similarity index 100% rename from vs2015/freetype/src/type1/t1objs.h rename to vs/freetype/src/type1/t1objs.h diff --git a/vs2015/freetype/src/type1/t1parse.c b/vs/freetype/src/type1/t1parse.c similarity index 100% rename from vs2015/freetype/src/type1/t1parse.c rename to vs/freetype/src/type1/t1parse.c diff --git a/vs2015/freetype/src/type1/t1parse.h b/vs/freetype/src/type1/t1parse.h similarity index 100% rename from vs2015/freetype/src/type1/t1parse.h rename to vs/freetype/src/type1/t1parse.h diff --git a/vs2015/freetype/src/type1/t1tokens.h b/vs/freetype/src/type1/t1tokens.h similarity index 100% rename from vs2015/freetype/src/type1/t1tokens.h rename to vs/freetype/src/type1/t1tokens.h diff --git a/vs2015/freetype/src/type1/type1.c b/vs/freetype/src/type1/type1.c similarity index 100% rename from vs2015/freetype/src/type1/type1.c rename to vs/freetype/src/type1/type1.c diff --git a/vs2015/freetype/src/type42/Jamfile b/vs/freetype/src/type42/Jamfile similarity index 100% rename from vs2015/freetype/src/type42/Jamfile rename to vs/freetype/src/type42/Jamfile diff --git a/vs2015/freetype/src/type42/module.mk b/vs/freetype/src/type42/module.mk similarity index 100% rename from vs2015/freetype/src/type42/module.mk rename to vs/freetype/src/type42/module.mk diff --git a/vs2015/freetype/src/type42/rules.mk b/vs/freetype/src/type42/rules.mk similarity index 100% rename from vs2015/freetype/src/type42/rules.mk rename to vs/freetype/src/type42/rules.mk diff --git a/vs2015/freetype/src/type42/t42drivr.c b/vs/freetype/src/type42/t42drivr.c similarity index 100% rename from vs2015/freetype/src/type42/t42drivr.c rename to vs/freetype/src/type42/t42drivr.c diff --git a/vs2015/freetype/src/type42/t42drivr.h b/vs/freetype/src/type42/t42drivr.h similarity index 100% rename from vs2015/freetype/src/type42/t42drivr.h rename to vs/freetype/src/type42/t42drivr.h diff --git a/vs2015/freetype/src/type42/t42error.h b/vs/freetype/src/type42/t42error.h similarity index 100% rename from vs2015/freetype/src/type42/t42error.h rename to vs/freetype/src/type42/t42error.h diff --git a/vs2015/freetype/src/type42/t42objs.c b/vs/freetype/src/type42/t42objs.c similarity index 100% rename from vs2015/freetype/src/type42/t42objs.c rename to vs/freetype/src/type42/t42objs.c diff --git a/vs2015/freetype/src/type42/t42objs.h b/vs/freetype/src/type42/t42objs.h similarity index 100% rename from vs2015/freetype/src/type42/t42objs.h rename to vs/freetype/src/type42/t42objs.h diff --git a/vs2015/freetype/src/type42/t42parse.c b/vs/freetype/src/type42/t42parse.c similarity index 100% rename from vs2015/freetype/src/type42/t42parse.c rename to vs/freetype/src/type42/t42parse.c diff --git a/vs2015/freetype/src/type42/t42parse.h b/vs/freetype/src/type42/t42parse.h similarity index 100% rename from vs2015/freetype/src/type42/t42parse.h rename to vs/freetype/src/type42/t42parse.h diff --git a/vs2015/freetype/src/type42/t42types.h b/vs/freetype/src/type42/t42types.h similarity index 100% rename from vs2015/freetype/src/type42/t42types.h rename to vs/freetype/src/type42/t42types.h diff --git a/vs2015/freetype/src/type42/type42.c b/vs/freetype/src/type42/type42.c similarity index 100% rename from vs2015/freetype/src/type42/type42.c rename to vs/freetype/src/type42/type42.c diff --git a/vs2015/freetype/src/winfonts/Jamfile b/vs/freetype/src/winfonts/Jamfile similarity index 100% rename from vs2015/freetype/src/winfonts/Jamfile rename to vs/freetype/src/winfonts/Jamfile diff --git a/vs2015/freetype/src/winfonts/fnterrs.h b/vs/freetype/src/winfonts/fnterrs.h similarity index 100% rename from vs2015/freetype/src/winfonts/fnterrs.h rename to vs/freetype/src/winfonts/fnterrs.h diff --git a/vs2015/freetype/src/winfonts/module.mk b/vs/freetype/src/winfonts/module.mk similarity index 100% rename from vs2015/freetype/src/winfonts/module.mk rename to vs/freetype/src/winfonts/module.mk diff --git a/vs2015/freetype/src/winfonts/rules.mk b/vs/freetype/src/winfonts/rules.mk similarity index 100% rename from vs2015/freetype/src/winfonts/rules.mk rename to vs/freetype/src/winfonts/rules.mk diff --git a/vs2015/freetype/src/winfonts/winfnt.c b/vs/freetype/src/winfonts/winfnt.c similarity index 100% rename from vs2015/freetype/src/winfonts/winfnt.c rename to vs/freetype/src/winfonts/winfnt.c diff --git a/vs2015/freetype/src/winfonts/winfnt.h b/vs/freetype/src/winfonts/winfnt.h similarity index 100% rename from vs2015/freetype/src/winfonts/winfnt.h rename to vs/freetype/src/winfonts/winfnt.h diff --git a/vs2015/freetype/version.sed b/vs/freetype/version.sed similarity index 100% rename from vs2015/freetype/version.sed rename to vs/freetype/version.sed diff --git a/vs2015/freetype/vms_make.com b/vs/freetype/vms_make.com similarity index 100% rename from vs2015/freetype/vms_make.com rename to vs/freetype/vms_make.com diff --git a/vs2015/libpdcurses/HISTORY.md b/vs/libpdcurses/HISTORY.md similarity index 100% rename from vs2015/libpdcurses/HISTORY.md rename to vs/libpdcurses/HISTORY.md diff --git a/vs2015/libpdcurses/IMPLEMNT.md b/vs/libpdcurses/IMPLEMNT.md similarity index 100% rename from vs2015/libpdcurses/IMPLEMNT.md rename to vs/libpdcurses/IMPLEMNT.md diff --git a/vs2015/libpdcurses/README.md b/vs/libpdcurses/README.md similarity index 100% rename from vs2015/libpdcurses/README.md rename to vs/libpdcurses/README.md diff --git a/vs2015/libpdcurses/borland.lrf b/vs/libpdcurses/borland.lrf similarity index 100% rename from vs2015/libpdcurses/borland.lrf rename to vs/libpdcurses/borland.lrf diff --git a/vs2015/libpdcurses/curses.h b/vs/libpdcurses/curses.h similarity index 100% rename from vs2015/libpdcurses/curses.h rename to vs/libpdcurses/curses.h diff --git a/vs2015/libpdcurses/curspriv.h b/vs/libpdcurses/curspriv.h similarity index 100% rename from vs2015/libpdcurses/curspriv.h rename to vs/libpdcurses/curspriv.h diff --git a/vs2015/libpdcurses/demos/README.md b/vs/libpdcurses/demos/README.md similarity index 100% rename from vs2015/libpdcurses/demos/README.md rename to vs/libpdcurses/demos/README.md diff --git a/vs2015/libpdcurses/demos/firework.c b/vs/libpdcurses/demos/firework.c similarity index 100% rename from vs2015/libpdcurses/demos/firework.c rename to vs/libpdcurses/demos/firework.c diff --git a/vs2015/libpdcurses/demos/nctests.mif b/vs/libpdcurses/demos/nctests.mif similarity index 100% rename from vs2015/libpdcurses/demos/nctests.mif rename to vs/libpdcurses/demos/nctests.mif diff --git a/vs2015/libpdcurses/demos/ncurses_cfg.h b/vs/libpdcurses/demos/ncurses_cfg.h similarity index 100% rename from vs2015/libpdcurses/demos/ncurses_cfg.h rename to vs/libpdcurses/demos/ncurses_cfg.h diff --git a/vs2015/libpdcurses/demos/ozdemo.c b/vs/libpdcurses/demos/ozdemo.c similarity index 100% rename from vs2015/libpdcurses/demos/ozdemo.c rename to vs/libpdcurses/demos/ozdemo.c diff --git a/vs2015/libpdcurses/demos/ptest.c b/vs/libpdcurses/demos/ptest.c similarity index 100% rename from vs2015/libpdcurses/demos/ptest.c rename to vs/libpdcurses/demos/ptest.c diff --git a/vs2015/libpdcurses/demos/rain.c b/vs/libpdcurses/demos/rain.c similarity index 100% rename from vs2015/libpdcurses/demos/rain.c rename to vs/libpdcurses/demos/rain.c diff --git a/vs2015/libpdcurses/demos/testcurs.c b/vs/libpdcurses/demos/testcurs.c similarity index 100% rename from vs2015/libpdcurses/demos/testcurs.c rename to vs/libpdcurses/demos/testcurs.c diff --git a/vs2015/libpdcurses/demos/tui.c b/vs/libpdcurses/demos/tui.c similarity index 100% rename from vs2015/libpdcurses/demos/tui.c rename to vs/libpdcurses/demos/tui.c diff --git a/vs2015/libpdcurses/demos/tui.h b/vs/libpdcurses/demos/tui.h similarity index 100% rename from vs2015/libpdcurses/demos/tui.h rename to vs/libpdcurses/demos/tui.h diff --git a/vs2015/libpdcurses/demos/tuidemo.c b/vs/libpdcurses/demos/tuidemo.c similarity index 100% rename from vs2015/libpdcurses/demos/tuidemo.c rename to vs/libpdcurses/demos/tuidemo.c diff --git a/vs2015/libpdcurses/demos/worm.c b/vs/libpdcurses/demos/worm.c similarity index 100% rename from vs2015/libpdcurses/demos/worm.c rename to vs/libpdcurses/demos/worm.c diff --git a/vs2015/libpdcurses/demos/xmas.c b/vs/libpdcurses/demos/xmas.c similarity index 100% rename from vs2015/libpdcurses/demos/xmas.c rename to vs/libpdcurses/demos/xmas.c diff --git a/vs2015/libpdcurses/doc/README.md b/vs/libpdcurses/doc/README.md similarity index 100% rename from vs2015/libpdcurses/doc/README.md rename to vs/libpdcurses/doc/README.md diff --git a/vs2015/libpdcurses/doc/intro.md b/vs/libpdcurses/doc/intro.md similarity index 100% rename from vs2015/libpdcurses/doc/intro.md rename to vs/libpdcurses/doc/intro.md diff --git a/vs2015/libpdcurses/doc/manext.c b/vs/libpdcurses/doc/manext.c similarity index 100% rename from vs2015/libpdcurses/doc/manext.c rename to vs/libpdcurses/doc/manext.c diff --git a/vs2015/libpdcurses/doc/sdl.md b/vs/libpdcurses/doc/sdl.md similarity index 100% rename from vs2015/libpdcurses/doc/sdl.md rename to vs/libpdcurses/doc/sdl.md diff --git a/vs2015/libpdcurses/doc/x11.md b/vs/libpdcurses/doc/x11.md similarity index 100% rename from vs2015/libpdcurses/doc/x11.md rename to vs/libpdcurses/doc/x11.md diff --git a/vs2015/libpdcurses/dos/Makefile.bcc b/vs/libpdcurses/dos/Makefile.bcc similarity index 100% rename from vs2015/libpdcurses/dos/Makefile.bcc rename to vs/libpdcurses/dos/Makefile.bcc diff --git a/vs2015/libpdcurses/dos/Makefile.w16 b/vs/libpdcurses/dos/Makefile.w16 similarity index 100% rename from vs2015/libpdcurses/dos/Makefile.w16 rename to vs/libpdcurses/dos/Makefile.w16 diff --git a/vs2015/libpdcurses/dos/Makefile.w4g b/vs/libpdcurses/dos/Makefile.w4g similarity index 100% rename from vs2015/libpdcurses/dos/Makefile.w4g rename to vs/libpdcurses/dos/Makefile.w4g diff --git a/vs2015/libpdcurses/dos/README.md b/vs/libpdcurses/dos/README.md similarity index 100% rename from vs2015/libpdcurses/dos/README.md rename to vs/libpdcurses/dos/README.md diff --git a/vs2015/libpdcurses/dos/pdcclip.c b/vs/libpdcurses/dos/pdcclip.c similarity index 100% rename from vs2015/libpdcurses/dos/pdcclip.c rename to vs/libpdcurses/dos/pdcclip.c diff --git a/vs2015/libpdcurses/dos/pdcdisp.c b/vs/libpdcurses/dos/pdcdisp.c similarity index 100% rename from vs2015/libpdcurses/dos/pdcdisp.c rename to vs/libpdcurses/dos/pdcdisp.c diff --git a/vs2015/libpdcurses/dos/pdcdos.h b/vs/libpdcurses/dos/pdcdos.h similarity index 100% rename from vs2015/libpdcurses/dos/pdcdos.h rename to vs/libpdcurses/dos/pdcdos.h diff --git a/vs2015/libpdcurses/dos/pdcgetsc.c b/vs/libpdcurses/dos/pdcgetsc.c similarity index 100% rename from vs2015/libpdcurses/dos/pdcgetsc.c rename to vs/libpdcurses/dos/pdcgetsc.c diff --git a/vs2015/libpdcurses/dos/pdckbd.c b/vs/libpdcurses/dos/pdckbd.c similarity index 100% rename from vs2015/libpdcurses/dos/pdckbd.c rename to vs/libpdcurses/dos/pdckbd.c diff --git a/vs2015/libpdcurses/dos/pdcscrn.c b/vs/libpdcurses/dos/pdcscrn.c similarity index 100% rename from vs2015/libpdcurses/dos/pdcscrn.c rename to vs/libpdcurses/dos/pdcscrn.c diff --git a/vs2015/libpdcurses/dos/pdcsetsc.c b/vs/libpdcurses/dos/pdcsetsc.c similarity index 100% rename from vs2015/libpdcurses/dos/pdcsetsc.c rename to vs/libpdcurses/dos/pdcsetsc.c diff --git a/vs2015/libpdcurses/dos/pdcutil.c b/vs/libpdcurses/dos/pdcutil.c similarity index 100% rename from vs2015/libpdcurses/dos/pdcutil.c rename to vs/libpdcurses/dos/pdcutil.c diff --git a/vs2015/libpdcurses/libobjs.mif b/vs/libpdcurses/libobjs.mif similarity index 100% rename from vs2015/libpdcurses/libobjs.mif rename to vs/libpdcurses/libobjs.mif diff --git a/vs2015/libpdcurses/libpdcurses.vcxproj b/vs/libpdcurses/libpdcurses.vcxproj similarity index 100% rename from vs2015/libpdcurses/libpdcurses.vcxproj rename to vs/libpdcurses/libpdcurses.vcxproj diff --git a/vs2015/libpdcurses/libpdcurses.vcxproj.filters b/vs/libpdcurses/libpdcurses.vcxproj.filters similarity index 100% rename from vs2015/libpdcurses/libpdcurses.vcxproj.filters rename to vs/libpdcurses/libpdcurses.vcxproj.filters diff --git a/vs2015/libpdcurses/makedist.mif b/vs/libpdcurses/makedist.mif similarity index 100% rename from vs2015/libpdcurses/makedist.mif rename to vs/libpdcurses/makedist.mif diff --git a/vs2015/libpdcurses/os2/Makefile.bcc b/vs/libpdcurses/os2/Makefile.bcc similarity index 100% rename from vs2015/libpdcurses/os2/Makefile.bcc rename to vs/libpdcurses/os2/Makefile.bcc diff --git a/vs2015/libpdcurses/os2/Makefile.wcc b/vs/libpdcurses/os2/Makefile.wcc similarity index 100% rename from vs2015/libpdcurses/os2/Makefile.wcc rename to vs/libpdcurses/os2/Makefile.wcc diff --git a/vs2015/libpdcurses/os2/README.md b/vs/libpdcurses/os2/README.md similarity index 100% rename from vs2015/libpdcurses/os2/README.md rename to vs/libpdcurses/os2/README.md diff --git a/vs2015/libpdcurses/os2/pdcclip.c b/vs/libpdcurses/os2/pdcclip.c similarity index 100% rename from vs2015/libpdcurses/os2/pdcclip.c rename to vs/libpdcurses/os2/pdcclip.c diff --git a/vs2015/libpdcurses/os2/pdcdisp.c b/vs/libpdcurses/os2/pdcdisp.c similarity index 100% rename from vs2015/libpdcurses/os2/pdcdisp.c rename to vs/libpdcurses/os2/pdcdisp.c diff --git a/vs2015/libpdcurses/os2/pdcgetsc.c b/vs/libpdcurses/os2/pdcgetsc.c similarity index 100% rename from vs2015/libpdcurses/os2/pdcgetsc.c rename to vs/libpdcurses/os2/pdcgetsc.c diff --git a/vs2015/libpdcurses/os2/pdckbd.c b/vs/libpdcurses/os2/pdckbd.c similarity index 100% rename from vs2015/libpdcurses/os2/pdckbd.c rename to vs/libpdcurses/os2/pdckbd.c diff --git a/vs2015/libpdcurses/os2/pdcos2.h b/vs/libpdcurses/os2/pdcos2.h similarity index 100% rename from vs2015/libpdcurses/os2/pdcos2.h rename to vs/libpdcurses/os2/pdcos2.h diff --git a/vs2015/libpdcurses/os2/pdcscrn.c b/vs/libpdcurses/os2/pdcscrn.c similarity index 100% rename from vs2015/libpdcurses/os2/pdcscrn.c rename to vs/libpdcurses/os2/pdcscrn.c diff --git a/vs2015/libpdcurses/os2/pdcsetsc.c b/vs/libpdcurses/os2/pdcsetsc.c similarity index 100% rename from vs2015/libpdcurses/os2/pdcsetsc.c rename to vs/libpdcurses/os2/pdcsetsc.c diff --git a/vs2015/libpdcurses/os2/pdcutil.c b/vs/libpdcurses/os2/pdcutil.c similarity index 100% rename from vs2015/libpdcurses/os2/pdcutil.c rename to vs/libpdcurses/os2/pdcutil.c diff --git a/vs2015/libpdcurses/panel.h b/vs/libpdcurses/panel.h similarity index 100% rename from vs2015/libpdcurses/panel.h rename to vs/libpdcurses/panel.h diff --git a/vs2015/libpdcurses/pdcurses/README.md b/vs/libpdcurses/pdcurses/README.md similarity index 100% rename from vs2015/libpdcurses/pdcurses/README.md rename to vs/libpdcurses/pdcurses/README.md diff --git a/vs2015/libpdcurses/pdcurses/addch.c b/vs/libpdcurses/pdcurses/addch.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/addch.c rename to vs/libpdcurses/pdcurses/addch.c diff --git a/vs2015/libpdcurses/pdcurses/addchstr.c b/vs/libpdcurses/pdcurses/addchstr.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/addchstr.c rename to vs/libpdcurses/pdcurses/addchstr.c diff --git a/vs2015/libpdcurses/pdcurses/addstr.c b/vs/libpdcurses/pdcurses/addstr.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/addstr.c rename to vs/libpdcurses/pdcurses/addstr.c diff --git a/vs2015/libpdcurses/pdcurses/attr.c b/vs/libpdcurses/pdcurses/attr.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/attr.c rename to vs/libpdcurses/pdcurses/attr.c diff --git a/vs2015/libpdcurses/pdcurses/beep.c b/vs/libpdcurses/pdcurses/beep.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/beep.c rename to vs/libpdcurses/pdcurses/beep.c diff --git a/vs2015/libpdcurses/pdcurses/bkgd.c b/vs/libpdcurses/pdcurses/bkgd.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/bkgd.c rename to vs/libpdcurses/pdcurses/bkgd.c diff --git a/vs2015/libpdcurses/pdcurses/border.c b/vs/libpdcurses/pdcurses/border.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/border.c rename to vs/libpdcurses/pdcurses/border.c diff --git a/vs2015/libpdcurses/pdcurses/clear.c b/vs/libpdcurses/pdcurses/clear.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/clear.c rename to vs/libpdcurses/pdcurses/clear.c diff --git a/vs2015/libpdcurses/pdcurses/color.c b/vs/libpdcurses/pdcurses/color.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/color.c rename to vs/libpdcurses/pdcurses/color.c diff --git a/vs2015/libpdcurses/pdcurses/debug.c b/vs/libpdcurses/pdcurses/debug.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/debug.c rename to vs/libpdcurses/pdcurses/debug.c diff --git a/vs2015/libpdcurses/pdcurses/delch.c b/vs/libpdcurses/pdcurses/delch.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/delch.c rename to vs/libpdcurses/pdcurses/delch.c diff --git a/vs2015/libpdcurses/pdcurses/deleteln.c b/vs/libpdcurses/pdcurses/deleteln.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/deleteln.c rename to vs/libpdcurses/pdcurses/deleteln.c diff --git a/vs2015/libpdcurses/pdcurses/deprec.c b/vs/libpdcurses/pdcurses/deprec.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/deprec.c rename to vs/libpdcurses/pdcurses/deprec.c diff --git a/vs2015/libpdcurses/pdcurses/getch.c b/vs/libpdcurses/pdcurses/getch.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/getch.c rename to vs/libpdcurses/pdcurses/getch.c diff --git a/vs2015/libpdcurses/pdcurses/getstr.c b/vs/libpdcurses/pdcurses/getstr.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/getstr.c rename to vs/libpdcurses/pdcurses/getstr.c diff --git a/vs2015/libpdcurses/pdcurses/getyx.c b/vs/libpdcurses/pdcurses/getyx.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/getyx.c rename to vs/libpdcurses/pdcurses/getyx.c diff --git a/vs2015/libpdcurses/pdcurses/inch.c b/vs/libpdcurses/pdcurses/inch.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/inch.c rename to vs/libpdcurses/pdcurses/inch.c diff --git a/vs2015/libpdcurses/pdcurses/inchstr.c b/vs/libpdcurses/pdcurses/inchstr.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/inchstr.c rename to vs/libpdcurses/pdcurses/inchstr.c diff --git a/vs2015/libpdcurses/pdcurses/initscr.c b/vs/libpdcurses/pdcurses/initscr.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/initscr.c rename to vs/libpdcurses/pdcurses/initscr.c diff --git a/vs2015/libpdcurses/pdcurses/inopts.c b/vs/libpdcurses/pdcurses/inopts.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/inopts.c rename to vs/libpdcurses/pdcurses/inopts.c diff --git a/vs2015/libpdcurses/pdcurses/insch.c b/vs/libpdcurses/pdcurses/insch.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/insch.c rename to vs/libpdcurses/pdcurses/insch.c diff --git a/vs2015/libpdcurses/pdcurses/insstr.c b/vs/libpdcurses/pdcurses/insstr.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/insstr.c rename to vs/libpdcurses/pdcurses/insstr.c diff --git a/vs2015/libpdcurses/pdcurses/instr.c b/vs/libpdcurses/pdcurses/instr.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/instr.c rename to vs/libpdcurses/pdcurses/instr.c diff --git a/vs2015/libpdcurses/pdcurses/kernel.c b/vs/libpdcurses/pdcurses/kernel.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/kernel.c rename to vs/libpdcurses/pdcurses/kernel.c diff --git a/vs2015/libpdcurses/pdcurses/keyname.c b/vs/libpdcurses/pdcurses/keyname.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/keyname.c rename to vs/libpdcurses/pdcurses/keyname.c diff --git a/vs2015/libpdcurses/pdcurses/mouse.c b/vs/libpdcurses/pdcurses/mouse.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/mouse.c rename to vs/libpdcurses/pdcurses/mouse.c diff --git a/vs2015/libpdcurses/pdcurses/move.c b/vs/libpdcurses/pdcurses/move.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/move.c rename to vs/libpdcurses/pdcurses/move.c diff --git a/vs2015/libpdcurses/pdcurses/outopts.c b/vs/libpdcurses/pdcurses/outopts.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/outopts.c rename to vs/libpdcurses/pdcurses/outopts.c diff --git a/vs2015/libpdcurses/pdcurses/overlay.c b/vs/libpdcurses/pdcurses/overlay.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/overlay.c rename to vs/libpdcurses/pdcurses/overlay.c diff --git a/vs2015/libpdcurses/pdcurses/pad.c b/vs/libpdcurses/pdcurses/pad.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/pad.c rename to vs/libpdcurses/pdcurses/pad.c diff --git a/vs2015/libpdcurses/pdcurses/panel.c b/vs/libpdcurses/pdcurses/panel.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/panel.c rename to vs/libpdcurses/pdcurses/panel.c diff --git a/vs2015/libpdcurses/pdcurses/printw.c b/vs/libpdcurses/pdcurses/printw.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/printw.c rename to vs/libpdcurses/pdcurses/printw.c diff --git a/vs2015/libpdcurses/pdcurses/refresh.c b/vs/libpdcurses/pdcurses/refresh.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/refresh.c rename to vs/libpdcurses/pdcurses/refresh.c diff --git a/vs2015/libpdcurses/pdcurses/scanw.c b/vs/libpdcurses/pdcurses/scanw.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/scanw.c rename to vs/libpdcurses/pdcurses/scanw.c diff --git a/vs2015/libpdcurses/pdcurses/scr_dump.c b/vs/libpdcurses/pdcurses/scr_dump.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/scr_dump.c rename to vs/libpdcurses/pdcurses/scr_dump.c diff --git a/vs2015/libpdcurses/pdcurses/scroll.c b/vs/libpdcurses/pdcurses/scroll.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/scroll.c rename to vs/libpdcurses/pdcurses/scroll.c diff --git a/vs2015/libpdcurses/pdcurses/slk.c b/vs/libpdcurses/pdcurses/slk.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/slk.c rename to vs/libpdcurses/pdcurses/slk.c diff --git a/vs2015/libpdcurses/pdcurses/termattr.c b/vs/libpdcurses/pdcurses/termattr.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/termattr.c rename to vs/libpdcurses/pdcurses/termattr.c diff --git a/vs2015/libpdcurses/pdcurses/terminfo.c b/vs/libpdcurses/pdcurses/terminfo.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/terminfo.c rename to vs/libpdcurses/pdcurses/terminfo.c diff --git a/vs2015/libpdcurses/pdcurses/touch.c b/vs/libpdcurses/pdcurses/touch.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/touch.c rename to vs/libpdcurses/pdcurses/touch.c diff --git a/vs2015/libpdcurses/pdcurses/util.c b/vs/libpdcurses/pdcurses/util.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/util.c rename to vs/libpdcurses/pdcurses/util.c diff --git a/vs2015/libpdcurses/pdcurses/window.c b/vs/libpdcurses/pdcurses/window.c similarity index 100% rename from vs2015/libpdcurses/pdcurses/window.c rename to vs/libpdcurses/pdcurses/window.c diff --git a/vs2015/libpdcurses/sdl1/README.md b/vs/libpdcurses/sdl1/README.md similarity index 100% rename from vs2015/libpdcurses/sdl1/README.md rename to vs/libpdcurses/sdl1/README.md diff --git a/vs2015/libpdcurses/sdl1/deffont.h b/vs/libpdcurses/sdl1/deffont.h similarity index 100% rename from vs2015/libpdcurses/sdl1/deffont.h rename to vs/libpdcurses/sdl1/deffont.h diff --git a/vs2015/libpdcurses/sdl1/deficon.h b/vs/libpdcurses/sdl1/deficon.h similarity index 100% rename from vs2015/libpdcurses/sdl1/deficon.h rename to vs/libpdcurses/sdl1/deficon.h diff --git a/vs2015/libpdcurses/sdl1/pdcclip.c b/vs/libpdcurses/sdl1/pdcclip.c similarity index 100% rename from vs2015/libpdcurses/sdl1/pdcclip.c rename to vs/libpdcurses/sdl1/pdcclip.c diff --git a/vs2015/libpdcurses/sdl1/pdcdisp.c b/vs/libpdcurses/sdl1/pdcdisp.c similarity index 100% rename from vs2015/libpdcurses/sdl1/pdcdisp.c rename to vs/libpdcurses/sdl1/pdcdisp.c diff --git a/vs2015/libpdcurses/sdl1/pdcgetsc.c b/vs/libpdcurses/sdl1/pdcgetsc.c similarity index 100% rename from vs2015/libpdcurses/sdl1/pdcgetsc.c rename to vs/libpdcurses/sdl1/pdcgetsc.c diff --git a/vs2015/libpdcurses/sdl1/pdckbd.c b/vs/libpdcurses/sdl1/pdckbd.c similarity index 100% rename from vs2015/libpdcurses/sdl1/pdckbd.c rename to vs/libpdcurses/sdl1/pdckbd.c diff --git a/vs2015/libpdcurses/sdl1/pdcscrn.c b/vs/libpdcurses/sdl1/pdcscrn.c similarity index 100% rename from vs2015/libpdcurses/sdl1/pdcscrn.c rename to vs/libpdcurses/sdl1/pdcscrn.c diff --git a/vs2015/libpdcurses/sdl1/pdcsdl.h b/vs/libpdcurses/sdl1/pdcsdl.h similarity index 100% rename from vs2015/libpdcurses/sdl1/pdcsdl.h rename to vs/libpdcurses/sdl1/pdcsdl.h diff --git a/vs2015/libpdcurses/sdl1/pdcsetsc.c b/vs/libpdcurses/sdl1/pdcsetsc.c similarity index 100% rename from vs2015/libpdcurses/sdl1/pdcsetsc.c rename to vs/libpdcurses/sdl1/pdcsetsc.c diff --git a/vs2015/libpdcurses/sdl1/pdcutil.c b/vs/libpdcurses/sdl1/pdcutil.c similarity index 100% rename from vs2015/libpdcurses/sdl1/pdcutil.c rename to vs/libpdcurses/sdl1/pdcutil.c diff --git a/vs2015/libpdcurses/sdl1/sdltest.c b/vs/libpdcurses/sdl1/sdltest.c similarity index 100% rename from vs2015/libpdcurses/sdl1/sdltest.c rename to vs/libpdcurses/sdl1/sdltest.c diff --git a/vs2015/libpdcurses/sdl2/README.md b/vs/libpdcurses/sdl2/README.md similarity index 100% rename from vs2015/libpdcurses/sdl2/README.md rename to vs/libpdcurses/sdl2/README.md diff --git a/vs2015/libpdcurses/sdl2/deffont.h b/vs/libpdcurses/sdl2/deffont.h similarity index 100% rename from vs2015/libpdcurses/sdl2/deffont.h rename to vs/libpdcurses/sdl2/deffont.h diff --git a/vs2015/libpdcurses/sdl2/deficon.h b/vs/libpdcurses/sdl2/deficon.h similarity index 100% rename from vs2015/libpdcurses/sdl2/deficon.h rename to vs/libpdcurses/sdl2/deficon.h diff --git a/vs2015/libpdcurses/sdl2/pdcclip.c b/vs/libpdcurses/sdl2/pdcclip.c similarity index 100% rename from vs2015/libpdcurses/sdl2/pdcclip.c rename to vs/libpdcurses/sdl2/pdcclip.c diff --git a/vs2015/libpdcurses/sdl2/pdcdisp.c b/vs/libpdcurses/sdl2/pdcdisp.c similarity index 100% rename from vs2015/libpdcurses/sdl2/pdcdisp.c rename to vs/libpdcurses/sdl2/pdcdisp.c diff --git a/vs2015/libpdcurses/sdl2/pdcgetsc.c b/vs/libpdcurses/sdl2/pdcgetsc.c similarity index 100% rename from vs2015/libpdcurses/sdl2/pdcgetsc.c rename to vs/libpdcurses/sdl2/pdcgetsc.c diff --git a/vs2015/libpdcurses/sdl2/pdckbd.c b/vs/libpdcurses/sdl2/pdckbd.c similarity index 100% rename from vs2015/libpdcurses/sdl2/pdckbd.c rename to vs/libpdcurses/sdl2/pdckbd.c diff --git a/vs2015/libpdcurses/sdl2/pdcscrn.c b/vs/libpdcurses/sdl2/pdcscrn.c similarity index 100% rename from vs2015/libpdcurses/sdl2/pdcscrn.c rename to vs/libpdcurses/sdl2/pdcscrn.c diff --git a/vs2015/libpdcurses/sdl2/pdcsdl.h b/vs/libpdcurses/sdl2/pdcsdl.h similarity index 100% rename from vs2015/libpdcurses/sdl2/pdcsdl.h rename to vs/libpdcurses/sdl2/pdcsdl.h diff --git a/vs2015/libpdcurses/sdl2/pdcsetsc.c b/vs/libpdcurses/sdl2/pdcsetsc.c similarity index 100% rename from vs2015/libpdcurses/sdl2/pdcsetsc.c rename to vs/libpdcurses/sdl2/pdcsetsc.c diff --git a/vs2015/libpdcurses/sdl2/pdcutil.c b/vs/libpdcurses/sdl2/pdcutil.c similarity index 100% rename from vs2015/libpdcurses/sdl2/pdcutil.c rename to vs/libpdcurses/sdl2/pdcutil.c diff --git a/vs2015/libpdcurses/sdl2/sdltest.c b/vs/libpdcurses/sdl2/sdltest.c similarity index 100% rename from vs2015/libpdcurses/sdl2/sdltest.c rename to vs/libpdcurses/sdl2/sdltest.c diff --git a/vs2015/libpdcurses/term.h b/vs/libpdcurses/term.h similarity index 100% rename from vs2015/libpdcurses/term.h rename to vs/libpdcurses/term.h diff --git a/vs2015/libpdcurses/version.mif b/vs/libpdcurses/version.mif similarity index 100% rename from vs2015/libpdcurses/version.mif rename to vs/libpdcurses/version.mif diff --git a/vs2015/libpdcurses/watcom.mif b/vs/libpdcurses/watcom.mif similarity index 100% rename from vs2015/libpdcurses/watcom.mif rename to vs/libpdcurses/watcom.mif diff --git a/vs2015/libpdcurses/wincon/Makefile.bcc b/vs/libpdcurses/wincon/Makefile.bcc similarity index 100% rename from vs2015/libpdcurses/wincon/Makefile.bcc rename to vs/libpdcurses/wincon/Makefile.bcc diff --git a/vs2015/libpdcurses/wincon/Makefile.vc b/vs/libpdcurses/wincon/Makefile.vc similarity index 100% rename from vs2015/libpdcurses/wincon/Makefile.vc rename to vs/libpdcurses/wincon/Makefile.vc diff --git a/vs2015/libpdcurses/wincon/Makefile.wcc b/vs/libpdcurses/wincon/Makefile.wcc similarity index 100% rename from vs2015/libpdcurses/wincon/Makefile.wcc rename to vs/libpdcurses/wincon/Makefile.wcc diff --git a/vs2015/libpdcurses/wincon/README.md b/vs/libpdcurses/wincon/README.md similarity index 100% rename from vs2015/libpdcurses/wincon/README.md rename to vs/libpdcurses/wincon/README.md diff --git a/vs2015/libpdcurses/wincon/pdcclip.c b/vs/libpdcurses/wincon/pdcclip.c similarity index 100% rename from vs2015/libpdcurses/wincon/pdcclip.c rename to vs/libpdcurses/wincon/pdcclip.c diff --git a/vs2015/libpdcurses/wincon/pdcdisp.c b/vs/libpdcurses/wincon/pdcdisp.c similarity index 100% rename from vs2015/libpdcurses/wincon/pdcdisp.c rename to vs/libpdcurses/wincon/pdcdisp.c diff --git a/vs2015/libpdcurses/wincon/pdcgetsc.c b/vs/libpdcurses/wincon/pdcgetsc.c similarity index 100% rename from vs2015/libpdcurses/wincon/pdcgetsc.c rename to vs/libpdcurses/wincon/pdcgetsc.c diff --git a/vs2015/libpdcurses/wincon/pdckbd.c b/vs/libpdcurses/wincon/pdckbd.c similarity index 100% rename from vs2015/libpdcurses/wincon/pdckbd.c rename to vs/libpdcurses/wincon/pdckbd.c diff --git a/vs2015/libpdcurses/wincon/pdcscrn.c b/vs/libpdcurses/wincon/pdcscrn.c similarity index 100% rename from vs2015/libpdcurses/wincon/pdcscrn.c rename to vs/libpdcurses/wincon/pdcscrn.c diff --git a/vs2015/libpdcurses/wincon/pdcsetsc.c b/vs/libpdcurses/wincon/pdcsetsc.c similarity index 100% rename from vs2015/libpdcurses/wincon/pdcsetsc.c rename to vs/libpdcurses/wincon/pdcsetsc.c diff --git a/vs2015/libpdcurses/wincon/pdcurses.ico b/vs/libpdcurses/wincon/pdcurses.ico similarity index 100% rename from vs2015/libpdcurses/wincon/pdcurses.ico rename to vs/libpdcurses/wincon/pdcurses.ico diff --git a/vs2015/libpdcurses/wincon/pdcurses.rc b/vs/libpdcurses/wincon/pdcurses.rc similarity index 100% rename from vs2015/libpdcurses/wincon/pdcurses.rc rename to vs/libpdcurses/wincon/pdcurses.rc diff --git a/vs2015/libpdcurses/wincon/pdcutil.c b/vs/libpdcurses/wincon/pdcutil.c similarity index 100% rename from vs2015/libpdcurses/wincon/pdcutil.c rename to vs/libpdcurses/wincon/pdcutil.c diff --git a/vs2015/libpdcurses/wincon/pdcwin.h b/vs/libpdcurses/wincon/pdcwin.h similarity index 100% rename from vs2015/libpdcurses/wincon/pdcwin.h rename to vs/libpdcurses/wincon/pdcwin.h diff --git a/vs2015/libpdcurses/x11/Makefile.in b/vs/libpdcurses/x11/Makefile.in similarity index 100% rename from vs2015/libpdcurses/x11/Makefile.in rename to vs/libpdcurses/x11/Makefile.in diff --git a/vs2015/libpdcurses/x11/README.md b/vs/libpdcurses/x11/README.md similarity index 100% rename from vs2015/libpdcurses/x11/README.md rename to vs/libpdcurses/x11/README.md diff --git a/vs2015/libpdcurses/x11/ScrollBox.c b/vs/libpdcurses/x11/ScrollBox.c similarity index 100% rename from vs2015/libpdcurses/x11/ScrollBox.c rename to vs/libpdcurses/x11/ScrollBox.c diff --git a/vs2015/libpdcurses/x11/ScrollBox.h b/vs/libpdcurses/x11/ScrollBox.h similarity index 100% rename from vs2015/libpdcurses/x11/ScrollBox.h rename to vs/libpdcurses/x11/ScrollBox.h diff --git a/vs2015/libpdcurses/x11/ScrollBoxP.h b/vs/libpdcurses/x11/ScrollBoxP.h similarity index 100% rename from vs2015/libpdcurses/x11/ScrollBoxP.h rename to vs/libpdcurses/x11/ScrollBoxP.h diff --git a/vs2015/libpdcurses/x11/aclocal.m4 b/vs/libpdcurses/x11/aclocal.m4 similarity index 100% rename from vs2015/libpdcurses/x11/aclocal.m4 rename to vs/libpdcurses/x11/aclocal.m4 diff --git a/vs2015/libpdcurses/x11/big_icon.xbm b/vs/libpdcurses/x11/big_icon.xbm similarity index 100% rename from vs2015/libpdcurses/x11/big_icon.xbm rename to vs/libpdcurses/x11/big_icon.xbm diff --git a/vs2015/libpdcurses/x11/compose.h b/vs/libpdcurses/x11/compose.h similarity index 100% rename from vs2015/libpdcurses/x11/compose.h rename to vs/libpdcurses/x11/compose.h diff --git a/vs2015/libpdcurses/x11/config.guess b/vs/libpdcurses/x11/config.guess similarity index 100% rename from vs2015/libpdcurses/x11/config.guess rename to vs/libpdcurses/x11/config.guess diff --git a/vs2015/libpdcurses/x11/config.h.in b/vs/libpdcurses/x11/config.h.in similarity index 100% rename from vs2015/libpdcurses/x11/config.h.in rename to vs/libpdcurses/x11/config.h.in diff --git a/vs2015/libpdcurses/x11/config.sub b/vs/libpdcurses/x11/config.sub similarity index 100% rename from vs2015/libpdcurses/x11/config.sub rename to vs/libpdcurses/x11/config.sub diff --git a/vs2015/libpdcurses/x11/configure b/vs/libpdcurses/x11/configure similarity index 100% rename from vs2015/libpdcurses/x11/configure rename to vs/libpdcurses/x11/configure diff --git a/vs2015/libpdcurses/x11/configure.ac b/vs/libpdcurses/x11/configure.ac similarity index 100% rename from vs2015/libpdcurses/x11/configure.ac rename to vs/libpdcurses/x11/configure.ac diff --git a/vs2015/libpdcurses/x11/install-sh b/vs/libpdcurses/x11/install-sh similarity index 100% rename from vs2015/libpdcurses/x11/install-sh rename to vs/libpdcurses/x11/install-sh diff --git a/vs2015/libpdcurses/x11/little_icon.xbm b/vs/libpdcurses/x11/little_icon.xbm similarity index 100% rename from vs2015/libpdcurses/x11/little_icon.xbm rename to vs/libpdcurses/x11/little_icon.xbm diff --git a/vs2015/libpdcurses/x11/pdcclip.c b/vs/libpdcurses/x11/pdcclip.c similarity index 100% rename from vs2015/libpdcurses/x11/pdcclip.c rename to vs/libpdcurses/x11/pdcclip.c diff --git a/vs2015/libpdcurses/x11/pdcdisp.c b/vs/libpdcurses/x11/pdcdisp.c similarity index 100% rename from vs2015/libpdcurses/x11/pdcdisp.c rename to vs/libpdcurses/x11/pdcdisp.c diff --git a/vs2015/libpdcurses/x11/pdcgetsc.c b/vs/libpdcurses/x11/pdcgetsc.c similarity index 100% rename from vs2015/libpdcurses/x11/pdcgetsc.c rename to vs/libpdcurses/x11/pdcgetsc.c diff --git a/vs2015/libpdcurses/x11/pdckbd.c b/vs/libpdcurses/x11/pdckbd.c similarity index 100% rename from vs2015/libpdcurses/x11/pdckbd.c rename to vs/libpdcurses/x11/pdckbd.c diff --git a/vs2015/libpdcurses/x11/pdcscrn.c b/vs/libpdcurses/x11/pdcscrn.c similarity index 100% rename from vs2015/libpdcurses/x11/pdcscrn.c rename to vs/libpdcurses/x11/pdcscrn.c diff --git a/vs2015/libpdcurses/x11/pdcsetsc.c b/vs/libpdcurses/x11/pdcsetsc.c similarity index 100% rename from vs2015/libpdcurses/x11/pdcsetsc.c rename to vs/libpdcurses/x11/pdcsetsc.c diff --git a/vs2015/libpdcurses/x11/pdcutil.c b/vs/libpdcurses/x11/pdcutil.c similarity index 100% rename from vs2015/libpdcurses/x11/pdcutil.c rename to vs/libpdcurses/x11/pdcutil.c diff --git a/vs2015/libpdcurses/x11/pdcx11.c b/vs/libpdcurses/x11/pdcx11.c similarity index 100% rename from vs2015/libpdcurses/x11/pdcx11.c rename to vs/libpdcurses/x11/pdcx11.c diff --git a/vs2015/libpdcurses/x11/pdcx11.h b/vs/libpdcurses/x11/pdcx11.h similarity index 100% rename from vs2015/libpdcurses/x11/pdcx11.h rename to vs/libpdcurses/x11/pdcx11.h diff --git a/vs2015/libpdcurses/x11/sb.c b/vs/libpdcurses/x11/sb.c similarity index 100% rename from vs2015/libpdcurses/x11/sb.c rename to vs/libpdcurses/x11/sb.c diff --git a/vs2015/libpdcurses/x11/x11.c b/vs/libpdcurses/x11/x11.c similarity index 100% rename from vs2015/libpdcurses/x11/x11.c rename to vs/libpdcurses/x11/x11.c diff --git a/vs2015/libpdcurses/x11/xcurses-config.in b/vs/libpdcurses/x11/xcurses-config.in similarity index 100% rename from vs2015/libpdcurses/x11/xcurses-config.in rename to vs/libpdcurses/x11/xcurses-config.in diff --git a/vs2015/libpng/ANNOUNCE b/vs/libpng/ANNOUNCE similarity index 100% rename from vs2015/libpng/ANNOUNCE rename to vs/libpng/ANNOUNCE diff --git a/vs2015/libpng/CHANGES b/vs/libpng/CHANGES similarity index 100% rename from vs2015/libpng/CHANGES rename to vs/libpng/CHANGES diff --git a/vs2015/libpng/CMakeLists.txt b/vs/libpng/CMakeLists.txt similarity index 100% rename from vs2015/libpng/CMakeLists.txt rename to vs/libpng/CMakeLists.txt diff --git a/vs2015/libpng/INSTALL b/vs/libpng/INSTALL similarity index 100% rename from vs2015/libpng/INSTALL rename to vs/libpng/INSTALL diff --git a/vs2015/libpng/LICENSE b/vs/libpng/LICENSE similarity index 100% rename from vs2015/libpng/LICENSE rename to vs/libpng/LICENSE diff --git a/vs2015/libpng/Makefile.am b/vs/libpng/Makefile.am similarity index 100% rename from vs2015/libpng/Makefile.am rename to vs/libpng/Makefile.am diff --git a/vs2015/libpng/Makefile.in b/vs/libpng/Makefile.in similarity index 100% rename from vs2015/libpng/Makefile.in rename to vs/libpng/Makefile.in diff --git a/vs2015/libpng/README b/vs/libpng/README similarity index 100% rename from vs2015/libpng/README rename to vs/libpng/README diff --git a/vs2015/libpng/TODO b/vs/libpng/TODO similarity index 100% rename from vs2015/libpng/TODO rename to vs/libpng/TODO diff --git a/vs2015/libpng/aclocal.m4 b/vs/libpng/aclocal.m4 similarity index 100% rename from vs2015/libpng/aclocal.m4 rename to vs/libpng/aclocal.m4 diff --git a/vs2015/libpng/arm/arm_init.c b/vs/libpng/arm/arm_init.c similarity index 100% rename from vs2015/libpng/arm/arm_init.c rename to vs/libpng/arm/arm_init.c diff --git a/vs2015/libpng/arm/filter_neon.S b/vs/libpng/arm/filter_neon.S similarity index 100% rename from vs2015/libpng/arm/filter_neon.S rename to vs/libpng/arm/filter_neon.S diff --git a/vs2015/libpng/arm/filter_neon_intrinsics.c b/vs/libpng/arm/filter_neon_intrinsics.c similarity index 100% rename from vs2015/libpng/arm/filter_neon_intrinsics.c rename to vs/libpng/arm/filter_neon_intrinsics.c diff --git a/vs2015/libpng/autogen.sh b/vs/libpng/autogen.sh similarity index 100% rename from vs2015/libpng/autogen.sh rename to vs/libpng/autogen.sh diff --git a/vs2015/libpng/build-dosbox.sh b/vs/libpng/build-dosbox.sh similarity index 100% rename from vs2015/libpng/build-dosbox.sh rename to vs/libpng/build-dosbox.sh diff --git a/vs2015/libpng/compile b/vs/libpng/compile similarity index 100% rename from vs2015/libpng/compile rename to vs/libpng/compile diff --git a/vs2015/libpng/config.guess b/vs/libpng/config.guess similarity index 100% rename from vs2015/libpng/config.guess rename to vs/libpng/config.guess diff --git a/vs2015/libpng/config.h.in b/vs/libpng/config.h.in similarity index 100% rename from vs2015/libpng/config.h.in rename to vs/libpng/config.h.in diff --git a/vs2015/libpng/config.sub b/vs/libpng/config.sub similarity index 100% rename from vs2015/libpng/config.sub rename to vs/libpng/config.sub diff --git a/vs2015/libpng/configure b/vs/libpng/configure similarity index 100% rename from vs2015/libpng/configure rename to vs/libpng/configure diff --git a/vs2015/libpng/configure.ac b/vs/libpng/configure.ac similarity index 100% rename from vs2015/libpng/configure.ac rename to vs/libpng/configure.ac diff --git a/vs2015/libpng/contrib/README.txt b/vs/libpng/contrib/README.txt similarity index 100% rename from vs2015/libpng/contrib/README.txt rename to vs/libpng/contrib/README.txt diff --git a/vs2015/libpng/contrib/arm-neon/README b/vs/libpng/contrib/arm-neon/README similarity index 100% rename from vs2015/libpng/contrib/arm-neon/README rename to vs/libpng/contrib/arm-neon/README diff --git a/vs2015/libpng/contrib/arm-neon/android-ndk.c b/vs/libpng/contrib/arm-neon/android-ndk.c similarity index 100% rename from vs2015/libpng/contrib/arm-neon/android-ndk.c rename to vs/libpng/contrib/arm-neon/android-ndk.c diff --git a/vs2015/libpng/contrib/arm-neon/linux-auxv.c b/vs/libpng/contrib/arm-neon/linux-auxv.c similarity index 100% rename from vs2015/libpng/contrib/arm-neon/linux-auxv.c rename to vs/libpng/contrib/arm-neon/linux-auxv.c diff --git a/vs2015/libpng/contrib/arm-neon/linux.c b/vs/libpng/contrib/arm-neon/linux.c similarity index 100% rename from vs2015/libpng/contrib/arm-neon/linux.c rename to vs/libpng/contrib/arm-neon/linux.c diff --git a/vs2015/libpng/contrib/conftest/README b/vs/libpng/contrib/conftest/README similarity index 100% rename from vs2015/libpng/contrib/conftest/README rename to vs/libpng/contrib/conftest/README diff --git a/vs2015/libpng/contrib/conftest/pngcp.dfa b/vs/libpng/contrib/conftest/pngcp.dfa similarity index 100% rename from vs2015/libpng/contrib/conftest/pngcp.dfa rename to vs/libpng/contrib/conftest/pngcp.dfa diff --git a/vs2015/libpng/contrib/conftest/read.dfa b/vs/libpng/contrib/conftest/read.dfa similarity index 100% rename from vs2015/libpng/contrib/conftest/read.dfa rename to vs/libpng/contrib/conftest/read.dfa diff --git a/vs2015/libpng/contrib/conftest/s_read.dfa b/vs/libpng/contrib/conftest/s_read.dfa similarity index 100% rename from vs2015/libpng/contrib/conftest/s_read.dfa rename to vs/libpng/contrib/conftest/s_read.dfa diff --git a/vs2015/libpng/contrib/conftest/s_write.dfa b/vs/libpng/contrib/conftest/s_write.dfa similarity index 100% rename from vs2015/libpng/contrib/conftest/s_write.dfa rename to vs/libpng/contrib/conftest/s_write.dfa diff --git a/vs2015/libpng/contrib/conftest/simple.dfa b/vs/libpng/contrib/conftest/simple.dfa similarity index 100% rename from vs2015/libpng/contrib/conftest/simple.dfa rename to vs/libpng/contrib/conftest/simple.dfa diff --git a/vs2015/libpng/contrib/conftest/write.dfa b/vs/libpng/contrib/conftest/write.dfa similarity index 100% rename from vs2015/libpng/contrib/conftest/write.dfa rename to vs/libpng/contrib/conftest/write.dfa diff --git a/vs2015/libpng/contrib/examples/README.txt b/vs/libpng/contrib/examples/README.txt similarity index 100% rename from vs2015/libpng/contrib/examples/README.txt rename to vs/libpng/contrib/examples/README.txt diff --git a/vs2015/libpng/contrib/examples/iccfrompng.c b/vs/libpng/contrib/examples/iccfrompng.c similarity index 100% rename from vs2015/libpng/contrib/examples/iccfrompng.c rename to vs/libpng/contrib/examples/iccfrompng.c diff --git a/vs2015/libpng/contrib/examples/pngpixel.c b/vs/libpng/contrib/examples/pngpixel.c similarity index 100% rename from vs2015/libpng/contrib/examples/pngpixel.c rename to vs/libpng/contrib/examples/pngpixel.c diff --git a/vs2015/libpng/contrib/examples/pngtopng.c b/vs/libpng/contrib/examples/pngtopng.c similarity index 100% rename from vs2015/libpng/contrib/examples/pngtopng.c rename to vs/libpng/contrib/examples/pngtopng.c diff --git a/vs2015/libpng/contrib/examples/simpleover.c b/vs/libpng/contrib/examples/simpleover.c similarity index 100% rename from vs2015/libpng/contrib/examples/simpleover.c rename to vs/libpng/contrib/examples/simpleover.c diff --git a/vs2015/libpng/contrib/gregbook/COPYING b/vs/libpng/contrib/gregbook/COPYING similarity index 100% rename from vs2015/libpng/contrib/gregbook/COPYING rename to vs/libpng/contrib/gregbook/COPYING diff --git a/vs2015/libpng/contrib/gregbook/LICENSE b/vs/libpng/contrib/gregbook/LICENSE similarity index 100% rename from vs2015/libpng/contrib/gregbook/LICENSE rename to vs/libpng/contrib/gregbook/LICENSE diff --git a/vs2015/libpng/contrib/gregbook/Makefile.mingw32 b/vs/libpng/contrib/gregbook/Makefile.mingw32 similarity index 100% rename from vs2015/libpng/contrib/gregbook/Makefile.mingw32 rename to vs/libpng/contrib/gregbook/Makefile.mingw32 diff --git a/vs2015/libpng/contrib/gregbook/Makefile.sgi b/vs/libpng/contrib/gregbook/Makefile.sgi similarity index 100% rename from vs2015/libpng/contrib/gregbook/Makefile.sgi rename to vs/libpng/contrib/gregbook/Makefile.sgi diff --git a/vs2015/libpng/contrib/gregbook/Makefile.unx b/vs/libpng/contrib/gregbook/Makefile.unx similarity index 100% rename from vs2015/libpng/contrib/gregbook/Makefile.unx rename to vs/libpng/contrib/gregbook/Makefile.unx diff --git a/vs2015/libpng/contrib/gregbook/Makefile.w32 b/vs/libpng/contrib/gregbook/Makefile.w32 similarity index 100% rename from vs2015/libpng/contrib/gregbook/Makefile.w32 rename to vs/libpng/contrib/gregbook/Makefile.w32 diff --git a/vs2015/libpng/contrib/gregbook/README b/vs/libpng/contrib/gregbook/README similarity index 100% rename from vs2015/libpng/contrib/gregbook/README rename to vs/libpng/contrib/gregbook/README diff --git a/vs2015/libpng/contrib/gregbook/makevms.com b/vs/libpng/contrib/gregbook/makevms.com similarity index 100% rename from vs2015/libpng/contrib/gregbook/makevms.com rename to vs/libpng/contrib/gregbook/makevms.com diff --git a/vs2015/libpng/contrib/gregbook/readpng.c b/vs/libpng/contrib/gregbook/readpng.c similarity index 100% rename from vs2015/libpng/contrib/gregbook/readpng.c rename to vs/libpng/contrib/gregbook/readpng.c diff --git a/vs2015/libpng/contrib/gregbook/readpng.h b/vs/libpng/contrib/gregbook/readpng.h similarity index 100% rename from vs2015/libpng/contrib/gregbook/readpng.h rename to vs/libpng/contrib/gregbook/readpng.h diff --git a/vs2015/libpng/contrib/gregbook/readpng2.c b/vs/libpng/contrib/gregbook/readpng2.c similarity index 100% rename from vs2015/libpng/contrib/gregbook/readpng2.c rename to vs/libpng/contrib/gregbook/readpng2.c diff --git a/vs2015/libpng/contrib/gregbook/readpng2.h b/vs/libpng/contrib/gregbook/readpng2.h similarity index 100% rename from vs2015/libpng/contrib/gregbook/readpng2.h rename to vs/libpng/contrib/gregbook/readpng2.h diff --git a/vs2015/libpng/contrib/gregbook/readppm.c b/vs/libpng/contrib/gregbook/readppm.c similarity index 100% rename from vs2015/libpng/contrib/gregbook/readppm.c rename to vs/libpng/contrib/gregbook/readppm.c diff --git a/vs2015/libpng/contrib/gregbook/rpng-win.c b/vs/libpng/contrib/gregbook/rpng-win.c similarity index 100% rename from vs2015/libpng/contrib/gregbook/rpng-win.c rename to vs/libpng/contrib/gregbook/rpng-win.c diff --git a/vs2015/libpng/contrib/gregbook/rpng-x.c b/vs/libpng/contrib/gregbook/rpng-x.c similarity index 100% rename from vs2015/libpng/contrib/gregbook/rpng-x.c rename to vs/libpng/contrib/gregbook/rpng-x.c diff --git a/vs2015/libpng/contrib/gregbook/rpng2-win.c b/vs/libpng/contrib/gregbook/rpng2-win.c similarity index 100% rename from vs2015/libpng/contrib/gregbook/rpng2-win.c rename to vs/libpng/contrib/gregbook/rpng2-win.c diff --git a/vs2015/libpng/contrib/gregbook/rpng2-x.c b/vs/libpng/contrib/gregbook/rpng2-x.c similarity index 100% rename from vs2015/libpng/contrib/gregbook/rpng2-x.c rename to vs/libpng/contrib/gregbook/rpng2-x.c diff --git a/vs2015/libpng/contrib/gregbook/toucan.png b/vs/libpng/contrib/gregbook/toucan.png similarity index 100% rename from vs2015/libpng/contrib/gregbook/toucan.png rename to vs/libpng/contrib/gregbook/toucan.png diff --git a/vs2015/libpng/contrib/gregbook/wpng.c b/vs/libpng/contrib/gregbook/wpng.c similarity index 100% rename from vs2015/libpng/contrib/gregbook/wpng.c rename to vs/libpng/contrib/gregbook/wpng.c diff --git a/vs2015/libpng/contrib/gregbook/writepng.c b/vs/libpng/contrib/gregbook/writepng.c similarity index 100% rename from vs2015/libpng/contrib/gregbook/writepng.c rename to vs/libpng/contrib/gregbook/writepng.c diff --git a/vs2015/libpng/contrib/gregbook/writepng.h b/vs/libpng/contrib/gregbook/writepng.h similarity index 100% rename from vs2015/libpng/contrib/gregbook/writepng.h rename to vs/libpng/contrib/gregbook/writepng.h diff --git a/vs2015/libpng/contrib/libtests/fakepng.c b/vs/libpng/contrib/libtests/fakepng.c similarity index 100% rename from vs2015/libpng/contrib/libtests/fakepng.c rename to vs/libpng/contrib/libtests/fakepng.c diff --git a/vs2015/libpng/contrib/libtests/gentests.sh b/vs/libpng/contrib/libtests/gentests.sh similarity index 100% rename from vs2015/libpng/contrib/libtests/gentests.sh rename to vs/libpng/contrib/libtests/gentests.sh diff --git a/vs2015/libpng/contrib/libtests/makepng.c b/vs/libpng/contrib/libtests/makepng.c similarity index 100% rename from vs2015/libpng/contrib/libtests/makepng.c rename to vs/libpng/contrib/libtests/makepng.c diff --git a/vs2015/libpng/contrib/libtests/pngimage.c b/vs/libpng/contrib/libtests/pngimage.c similarity index 100% rename from vs2015/libpng/contrib/libtests/pngimage.c rename to vs/libpng/contrib/libtests/pngimage.c diff --git a/vs2015/libpng/contrib/libtests/pngstest-errors.h b/vs/libpng/contrib/libtests/pngstest-errors.h similarity index 100% rename from vs2015/libpng/contrib/libtests/pngstest-errors.h rename to vs/libpng/contrib/libtests/pngstest-errors.h diff --git a/vs2015/libpng/contrib/libtests/pngstest.c b/vs/libpng/contrib/libtests/pngstest.c similarity index 100% rename from vs2015/libpng/contrib/libtests/pngstest.c rename to vs/libpng/contrib/libtests/pngstest.c diff --git a/vs2015/libpng/contrib/libtests/pngunknown.c b/vs/libpng/contrib/libtests/pngunknown.c similarity index 100% rename from vs2015/libpng/contrib/libtests/pngunknown.c rename to vs/libpng/contrib/libtests/pngunknown.c diff --git a/vs2015/libpng/contrib/libtests/pngvalid.c b/vs/libpng/contrib/libtests/pngvalid.c similarity index 100% rename from vs2015/libpng/contrib/libtests/pngvalid.c rename to vs/libpng/contrib/libtests/pngvalid.c diff --git a/vs2015/libpng/contrib/libtests/readpng.c b/vs/libpng/contrib/libtests/readpng.c similarity index 100% rename from vs2015/libpng/contrib/libtests/readpng.c rename to vs/libpng/contrib/libtests/readpng.c diff --git a/vs2015/libpng/contrib/libtests/tarith.c b/vs/libpng/contrib/libtests/tarith.c similarity index 100% rename from vs2015/libpng/contrib/libtests/tarith.c rename to vs/libpng/contrib/libtests/tarith.c diff --git a/vs2015/libpng/contrib/libtests/timepng.c b/vs/libpng/contrib/libtests/timepng.c similarity index 100% rename from vs2015/libpng/contrib/libtests/timepng.c rename to vs/libpng/contrib/libtests/timepng.c diff --git a/vs2015/libpng/contrib/mips-msa/README b/vs/libpng/contrib/mips-msa/README similarity index 100% rename from vs2015/libpng/contrib/mips-msa/README rename to vs/libpng/contrib/mips-msa/README diff --git a/vs2015/libpng/contrib/mips-msa/linux.c b/vs/libpng/contrib/mips-msa/linux.c similarity index 100% rename from vs2015/libpng/contrib/mips-msa/linux.c rename to vs/libpng/contrib/mips-msa/linux.c diff --git a/vs2015/libpng/contrib/oss-fuzz/Dockerfile b/vs/libpng/contrib/oss-fuzz/Dockerfile similarity index 100% rename from vs2015/libpng/contrib/oss-fuzz/Dockerfile rename to vs/libpng/contrib/oss-fuzz/Dockerfile diff --git a/vs2015/libpng/contrib/oss-fuzz/README.txt b/vs/libpng/contrib/oss-fuzz/README.txt similarity index 100% rename from vs2015/libpng/contrib/oss-fuzz/README.txt rename to vs/libpng/contrib/oss-fuzz/README.txt diff --git a/vs2015/libpng/contrib/oss-fuzz/build.sh b/vs/libpng/contrib/oss-fuzz/build.sh similarity index 100% rename from vs2015/libpng/contrib/oss-fuzz/build.sh rename to vs/libpng/contrib/oss-fuzz/build.sh diff --git a/vs2015/libpng/contrib/oss-fuzz/libpng_read_fuzzer.cc b/vs/libpng/contrib/oss-fuzz/libpng_read_fuzzer.cc similarity index 100% rename from vs2015/libpng/contrib/oss-fuzz/libpng_read_fuzzer.cc rename to vs/libpng/contrib/oss-fuzz/libpng_read_fuzzer.cc diff --git a/vs2015/libpng/contrib/oss-fuzz/libpng_read_fuzzer.options b/vs/libpng/contrib/oss-fuzz/libpng_read_fuzzer.options similarity index 100% rename from vs2015/libpng/contrib/oss-fuzz/libpng_read_fuzzer.options rename to vs/libpng/contrib/oss-fuzz/libpng_read_fuzzer.options diff --git a/vs2015/libpng/contrib/oss-fuzz/newcc b/vs/libpng/contrib/oss-fuzz/newcc similarity index 100% rename from vs2015/libpng/contrib/oss-fuzz/newcc rename to vs/libpng/contrib/oss-fuzz/newcc diff --git a/vs2015/libpng/contrib/oss-fuzz/png.dict b/vs/libpng/contrib/oss-fuzz/png.dict similarity index 100% rename from vs2015/libpng/contrib/oss-fuzz/png.dict rename to vs/libpng/contrib/oss-fuzz/png.dict diff --git a/vs2015/libpng/contrib/pngminim/README b/vs/libpng/contrib/pngminim/README similarity index 100% rename from vs2015/libpng/contrib/pngminim/README rename to vs/libpng/contrib/pngminim/README diff --git a/vs2015/libpng/contrib/pngminim/decoder/README b/vs/libpng/contrib/pngminim/decoder/README similarity index 100% rename from vs2015/libpng/contrib/pngminim/decoder/README rename to vs/libpng/contrib/pngminim/decoder/README diff --git a/vs2015/libpng/contrib/pngminim/decoder/makefile b/vs/libpng/contrib/pngminim/decoder/makefile similarity index 100% rename from vs2015/libpng/contrib/pngminim/decoder/makefile rename to vs/libpng/contrib/pngminim/decoder/makefile diff --git a/vs2015/libpng/contrib/pngminim/decoder/pngusr.dfa b/vs/libpng/contrib/pngminim/decoder/pngusr.dfa similarity index 100% rename from vs2015/libpng/contrib/pngminim/decoder/pngusr.dfa rename to vs/libpng/contrib/pngminim/decoder/pngusr.dfa diff --git a/vs2015/libpng/contrib/pngminim/decoder/pngusr.h b/vs/libpng/contrib/pngminim/decoder/pngusr.h similarity index 100% rename from vs2015/libpng/contrib/pngminim/decoder/pngusr.h rename to vs/libpng/contrib/pngminim/decoder/pngusr.h diff --git a/vs2015/libpng/contrib/pngminim/encoder/README b/vs/libpng/contrib/pngminim/encoder/README similarity index 100% rename from vs2015/libpng/contrib/pngminim/encoder/README rename to vs/libpng/contrib/pngminim/encoder/README diff --git a/vs2015/libpng/contrib/pngminim/encoder/makefile b/vs/libpng/contrib/pngminim/encoder/makefile similarity index 100% rename from vs2015/libpng/contrib/pngminim/encoder/makefile rename to vs/libpng/contrib/pngminim/encoder/makefile diff --git a/vs2015/libpng/contrib/pngminim/encoder/pngusr.dfa b/vs/libpng/contrib/pngminim/encoder/pngusr.dfa similarity index 100% rename from vs2015/libpng/contrib/pngminim/encoder/pngusr.dfa rename to vs/libpng/contrib/pngminim/encoder/pngusr.dfa diff --git a/vs2015/libpng/contrib/pngminim/encoder/pngusr.h b/vs/libpng/contrib/pngminim/encoder/pngusr.h similarity index 100% rename from vs2015/libpng/contrib/pngminim/encoder/pngusr.h rename to vs/libpng/contrib/pngminim/encoder/pngusr.h diff --git a/vs2015/libpng/contrib/pngminim/preader/README b/vs/libpng/contrib/pngminim/preader/README similarity index 100% rename from vs2015/libpng/contrib/pngminim/preader/README rename to vs/libpng/contrib/pngminim/preader/README diff --git a/vs2015/libpng/contrib/pngminim/preader/makefile b/vs/libpng/contrib/pngminim/preader/makefile similarity index 100% rename from vs2015/libpng/contrib/pngminim/preader/makefile rename to vs/libpng/contrib/pngminim/preader/makefile diff --git a/vs2015/libpng/contrib/pngminim/preader/pngusr.dfa b/vs/libpng/contrib/pngminim/preader/pngusr.dfa similarity index 100% rename from vs2015/libpng/contrib/pngminim/preader/pngusr.dfa rename to vs/libpng/contrib/pngminim/preader/pngusr.dfa diff --git a/vs2015/libpng/contrib/pngminim/preader/pngusr.h b/vs/libpng/contrib/pngminim/preader/pngusr.h similarity index 100% rename from vs2015/libpng/contrib/pngminim/preader/pngusr.h rename to vs/libpng/contrib/pngminim/preader/pngusr.h diff --git a/vs2015/libpng/contrib/pngminus/README b/vs/libpng/contrib/pngminus/README similarity index 100% rename from vs2015/libpng/contrib/pngminus/README rename to vs/libpng/contrib/pngminus/README diff --git a/vs2015/libpng/contrib/pngminus/makefile.std b/vs/libpng/contrib/pngminus/makefile.std similarity index 100% rename from vs2015/libpng/contrib/pngminus/makefile.std rename to vs/libpng/contrib/pngminus/makefile.std diff --git a/vs2015/libpng/contrib/pngminus/makefile.tc3 b/vs/libpng/contrib/pngminus/makefile.tc3 similarity index 100% rename from vs2015/libpng/contrib/pngminus/makefile.tc3 rename to vs/libpng/contrib/pngminus/makefile.tc3 diff --git a/vs2015/libpng/contrib/pngminus/makevms.com b/vs/libpng/contrib/pngminus/makevms.com similarity index 100% rename from vs2015/libpng/contrib/pngminus/makevms.com rename to vs/libpng/contrib/pngminus/makevms.com diff --git a/vs2015/libpng/contrib/pngminus/png2pnm.bat b/vs/libpng/contrib/pngminus/png2pnm.bat similarity index 100% rename from vs2015/libpng/contrib/pngminus/png2pnm.bat rename to vs/libpng/contrib/pngminus/png2pnm.bat diff --git a/vs2015/libpng/contrib/pngminus/png2pnm.c b/vs/libpng/contrib/pngminus/png2pnm.c similarity index 100% rename from vs2015/libpng/contrib/pngminus/png2pnm.c rename to vs/libpng/contrib/pngminus/png2pnm.c diff --git a/vs2015/libpng/contrib/pngminus/png2pnm.sh b/vs/libpng/contrib/pngminus/png2pnm.sh similarity index 100% rename from vs2015/libpng/contrib/pngminus/png2pnm.sh rename to vs/libpng/contrib/pngminus/png2pnm.sh diff --git a/vs2015/libpng/contrib/pngminus/pngminus.bat b/vs/libpng/contrib/pngminus/pngminus.bat similarity index 100% rename from vs2015/libpng/contrib/pngminus/pngminus.bat rename to vs/libpng/contrib/pngminus/pngminus.bat diff --git a/vs2015/libpng/contrib/pngminus/pngminus.sh b/vs/libpng/contrib/pngminus/pngminus.sh similarity index 100% rename from vs2015/libpng/contrib/pngminus/pngminus.sh rename to vs/libpng/contrib/pngminus/pngminus.sh diff --git a/vs2015/libpng/contrib/pngminus/pnm2png.bat b/vs/libpng/contrib/pngminus/pnm2png.bat similarity index 100% rename from vs2015/libpng/contrib/pngminus/pnm2png.bat rename to vs/libpng/contrib/pngminus/pnm2png.bat diff --git a/vs2015/libpng/contrib/pngminus/pnm2png.c b/vs/libpng/contrib/pngminus/pnm2png.c similarity index 100% rename from vs2015/libpng/contrib/pngminus/pnm2png.c rename to vs/libpng/contrib/pngminus/pnm2png.c diff --git a/vs2015/libpng/contrib/pngminus/pnm2png.sh b/vs/libpng/contrib/pngminus/pnm2png.sh similarity index 100% rename from vs2015/libpng/contrib/pngminus/pnm2png.sh rename to vs/libpng/contrib/pngminus/pnm2png.sh diff --git a/vs2015/libpng/contrib/pngsuite/README b/vs/libpng/contrib/pngsuite/README similarity index 100% rename from vs2015/libpng/contrib/pngsuite/README rename to vs/libpng/contrib/pngsuite/README diff --git a/vs2015/libpng/contrib/pngsuite/basn0g01.png b/vs/libpng/contrib/pngsuite/basn0g01.png similarity index 100% rename from vs2015/libpng/contrib/pngsuite/basn0g01.png rename to vs/libpng/contrib/pngsuite/basn0g01.png diff --git a/vs2015/libpng/contrib/pngsuite/basn0g02.png b/vs/libpng/contrib/pngsuite/basn0g02.png similarity index 100% rename from vs2015/libpng/contrib/pngsuite/basn0g02.png rename to vs/libpng/contrib/pngsuite/basn0g02.png diff --git a/vs2015/libpng/contrib/pngsuite/basn0g04.png b/vs/libpng/contrib/pngsuite/basn0g04.png similarity index 100% rename from vs2015/libpng/contrib/pngsuite/basn0g04.png rename to vs/libpng/contrib/pngsuite/basn0g04.png diff --git a/vs2015/libpng/contrib/pngsuite/basn0g08.png b/vs/libpng/contrib/pngsuite/basn0g08.png similarity index 100% rename from vs2015/libpng/contrib/pngsuite/basn0g08.png rename to vs/libpng/contrib/pngsuite/basn0g08.png diff --git a/vs2015/libpng/contrib/pngsuite/basn0g16.png b/vs/libpng/contrib/pngsuite/basn0g16.png similarity index 100% rename from vs2015/libpng/contrib/pngsuite/basn0g16.png rename to vs/libpng/contrib/pngsuite/basn0g16.png diff --git a/vs2015/libpng/contrib/pngsuite/basn2c08.png b/vs/libpng/contrib/pngsuite/basn2c08.png similarity index 100% rename from vs2015/libpng/contrib/pngsuite/basn2c08.png rename to vs/libpng/contrib/pngsuite/basn2c08.png diff --git a/vs2015/libpng/contrib/pngsuite/basn2c16.png b/vs/libpng/contrib/pngsuite/basn2c16.png similarity index 100% rename from vs2015/libpng/contrib/pngsuite/basn2c16.png rename to vs/libpng/contrib/pngsuite/basn2c16.png diff --git a/vs2015/libpng/contrib/pngsuite/basn3p01.png b/vs/libpng/contrib/pngsuite/basn3p01.png similarity index 100% rename from vs2015/libpng/contrib/pngsuite/basn3p01.png rename to vs/libpng/contrib/pngsuite/basn3p01.png diff --git a/vs2015/libpng/contrib/pngsuite/basn3p02.png b/vs/libpng/contrib/pngsuite/basn3p02.png similarity index 100% rename from vs2015/libpng/contrib/pngsuite/basn3p02.png rename to vs/libpng/contrib/pngsuite/basn3p02.png diff --git a/vs2015/libpng/contrib/pngsuite/basn3p04.png b/vs/libpng/contrib/pngsuite/basn3p04.png similarity index 100% rename from vs2015/libpng/contrib/pngsuite/basn3p04.png rename to vs/libpng/contrib/pngsuite/basn3p04.png diff --git a/vs2015/libpng/contrib/pngsuite/basn3p08.png b/vs/libpng/contrib/pngsuite/basn3p08.png similarity index 100% rename from vs2015/libpng/contrib/pngsuite/basn3p08.png rename to vs/libpng/contrib/pngsuite/basn3p08.png diff --git a/vs2015/libpng/contrib/pngsuite/basn4a08.png b/vs/libpng/contrib/pngsuite/basn4a08.png similarity index 100% rename from vs2015/libpng/contrib/pngsuite/basn4a08.png rename to vs/libpng/contrib/pngsuite/basn4a08.png diff --git a/vs2015/libpng/contrib/pngsuite/basn4a16.png b/vs/libpng/contrib/pngsuite/basn4a16.png similarity index 100% rename from vs2015/libpng/contrib/pngsuite/basn4a16.png rename to vs/libpng/contrib/pngsuite/basn4a16.png diff --git a/vs2015/libpng/contrib/pngsuite/basn6a08.png b/vs/libpng/contrib/pngsuite/basn6a08.png similarity index 100% rename from vs2015/libpng/contrib/pngsuite/basn6a08.png rename to vs/libpng/contrib/pngsuite/basn6a08.png diff --git a/vs2015/libpng/contrib/pngsuite/basn6a16.png b/vs/libpng/contrib/pngsuite/basn6a16.png similarity index 100% rename from vs2015/libpng/contrib/pngsuite/basn6a16.png rename to vs/libpng/contrib/pngsuite/basn6a16.png diff --git a/vs2015/libpng/contrib/pngsuite/ftbbn0g01.png b/vs/libpng/contrib/pngsuite/ftbbn0g01.png similarity index 100% rename from vs2015/libpng/contrib/pngsuite/ftbbn0g01.png rename to vs/libpng/contrib/pngsuite/ftbbn0g01.png diff --git a/vs2015/libpng/contrib/pngsuite/ftbbn0g02.png b/vs/libpng/contrib/pngsuite/ftbbn0g02.png similarity index 100% rename from vs2015/libpng/contrib/pngsuite/ftbbn0g02.png rename to vs/libpng/contrib/pngsuite/ftbbn0g02.png diff --git a/vs2015/libpng/contrib/pngsuite/ftbbn0g04.png b/vs/libpng/contrib/pngsuite/ftbbn0g04.png similarity index 100% rename from vs2015/libpng/contrib/pngsuite/ftbbn0g04.png rename to vs/libpng/contrib/pngsuite/ftbbn0g04.png diff --git a/vs2015/libpng/contrib/pngsuite/ftbbn2c16.png b/vs/libpng/contrib/pngsuite/ftbbn2c16.png similarity index 100% rename from vs2015/libpng/contrib/pngsuite/ftbbn2c16.png rename to vs/libpng/contrib/pngsuite/ftbbn2c16.png diff --git a/vs2015/libpng/contrib/pngsuite/ftbbn3p08.png b/vs/libpng/contrib/pngsuite/ftbbn3p08.png similarity index 100% rename from vs2015/libpng/contrib/pngsuite/ftbbn3p08.png rename to vs/libpng/contrib/pngsuite/ftbbn3p08.png diff --git a/vs2015/libpng/contrib/pngsuite/ftbgn2c16.png b/vs/libpng/contrib/pngsuite/ftbgn2c16.png similarity index 100% rename from vs2015/libpng/contrib/pngsuite/ftbgn2c16.png rename to vs/libpng/contrib/pngsuite/ftbgn2c16.png diff --git a/vs2015/libpng/contrib/pngsuite/ftbgn3p08.png b/vs/libpng/contrib/pngsuite/ftbgn3p08.png similarity index 100% rename from vs2015/libpng/contrib/pngsuite/ftbgn3p08.png rename to vs/libpng/contrib/pngsuite/ftbgn3p08.png diff --git a/vs2015/libpng/contrib/pngsuite/ftbrn2c08.png b/vs/libpng/contrib/pngsuite/ftbrn2c08.png similarity index 100% rename from vs2015/libpng/contrib/pngsuite/ftbrn2c08.png rename to vs/libpng/contrib/pngsuite/ftbrn2c08.png diff --git a/vs2015/libpng/contrib/pngsuite/ftbwn0g16.png b/vs/libpng/contrib/pngsuite/ftbwn0g16.png similarity index 100% rename from vs2015/libpng/contrib/pngsuite/ftbwn0g16.png rename to vs/libpng/contrib/pngsuite/ftbwn0g16.png diff --git a/vs2015/libpng/contrib/pngsuite/ftbwn3p08.png b/vs/libpng/contrib/pngsuite/ftbwn3p08.png similarity index 100% rename from vs2015/libpng/contrib/pngsuite/ftbwn3p08.png rename to vs/libpng/contrib/pngsuite/ftbwn3p08.png diff --git a/vs2015/libpng/contrib/pngsuite/ftbyn3p08.png b/vs/libpng/contrib/pngsuite/ftbyn3p08.png similarity index 100% rename from vs2015/libpng/contrib/pngsuite/ftbyn3p08.png rename to vs/libpng/contrib/pngsuite/ftbyn3p08.png diff --git a/vs2015/libpng/contrib/pngsuite/ftp0n0g08.png b/vs/libpng/contrib/pngsuite/ftp0n0g08.png similarity index 100% rename from vs2015/libpng/contrib/pngsuite/ftp0n0g08.png rename to vs/libpng/contrib/pngsuite/ftp0n0g08.png diff --git a/vs2015/libpng/contrib/pngsuite/ftp0n2c08.png b/vs/libpng/contrib/pngsuite/ftp0n2c08.png similarity index 100% rename from vs2015/libpng/contrib/pngsuite/ftp0n2c08.png rename to vs/libpng/contrib/pngsuite/ftp0n2c08.png diff --git a/vs2015/libpng/contrib/pngsuite/ftp0n3p08.png b/vs/libpng/contrib/pngsuite/ftp0n3p08.png similarity index 100% rename from vs2015/libpng/contrib/pngsuite/ftp0n3p08.png rename to vs/libpng/contrib/pngsuite/ftp0n3p08.png diff --git a/vs2015/libpng/contrib/pngsuite/ftp1n3p08.png b/vs/libpng/contrib/pngsuite/ftp1n3p08.png similarity index 100% rename from vs2015/libpng/contrib/pngsuite/ftp1n3p08.png rename to vs/libpng/contrib/pngsuite/ftp1n3p08.png diff --git a/vs2015/libpng/contrib/powerpc-vsx/README b/vs/libpng/contrib/powerpc-vsx/README similarity index 100% rename from vs2015/libpng/contrib/powerpc-vsx/README rename to vs/libpng/contrib/powerpc-vsx/README diff --git a/vs2015/libpng/contrib/powerpc-vsx/linux.c b/vs/libpng/contrib/powerpc-vsx/linux.c similarity index 100% rename from vs2015/libpng/contrib/powerpc-vsx/linux.c rename to vs/libpng/contrib/powerpc-vsx/linux.c diff --git a/vs2015/libpng/contrib/powerpc-vsx/linux_aux.c b/vs/libpng/contrib/powerpc-vsx/linux_aux.c similarity index 100% rename from vs2015/libpng/contrib/powerpc-vsx/linux_aux.c rename to vs/libpng/contrib/powerpc-vsx/linux_aux.c diff --git a/vs2015/libpng/contrib/testpngs/crashers/bad_iCCP.png b/vs/libpng/contrib/testpngs/crashers/bad_iCCP.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/crashers/bad_iCCP.png rename to vs/libpng/contrib/testpngs/crashers/bad_iCCP.png diff --git a/vs2015/libpng/contrib/testpngs/crashers/badadler.png b/vs/libpng/contrib/testpngs/crashers/badadler.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/crashers/badadler.png rename to vs/libpng/contrib/testpngs/crashers/badadler.png diff --git a/vs2015/libpng/contrib/testpngs/crashers/badcrc.png b/vs/libpng/contrib/testpngs/crashers/badcrc.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/crashers/badcrc.png rename to vs/libpng/contrib/testpngs/crashers/badcrc.png diff --git a/vs2015/libpng/contrib/testpngs/crashers/empty_ancillary_chunks.png b/vs/libpng/contrib/testpngs/crashers/empty_ancillary_chunks.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/crashers/empty_ancillary_chunks.png rename to vs/libpng/contrib/testpngs/crashers/empty_ancillary_chunks.png diff --git a/vs2015/libpng/contrib/testpngs/crashers/huge_IDAT.png b/vs/libpng/contrib/testpngs/crashers/huge_IDAT.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/crashers/huge_IDAT.png rename to vs/libpng/contrib/testpngs/crashers/huge_IDAT.png diff --git a/vs2015/libpng/contrib/testpngs/crashers/huge_bKGD_chunk.png b/vs/libpng/contrib/testpngs/crashers/huge_bKGD_chunk.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/crashers/huge_bKGD_chunk.png rename to vs/libpng/contrib/testpngs/crashers/huge_bKGD_chunk.png diff --git a/vs2015/libpng/contrib/testpngs/crashers/huge_cHRM_chunk.png b/vs/libpng/contrib/testpngs/crashers/huge_cHRM_chunk.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/crashers/huge_cHRM_chunk.png rename to vs/libpng/contrib/testpngs/crashers/huge_cHRM_chunk.png diff --git a/vs2015/libpng/contrib/testpngs/crashers/huge_eXIf_chunk.png b/vs/libpng/contrib/testpngs/crashers/huge_eXIf_chunk.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/crashers/huge_eXIf_chunk.png rename to vs/libpng/contrib/testpngs/crashers/huge_eXIf_chunk.png diff --git a/vs2015/libpng/contrib/testpngs/crashers/huge_gAMA_chunk.png b/vs/libpng/contrib/testpngs/crashers/huge_gAMA_chunk.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/crashers/huge_gAMA_chunk.png rename to vs/libpng/contrib/testpngs/crashers/huge_gAMA_chunk.png diff --git a/vs2015/libpng/contrib/testpngs/crashers/huge_hIST_chunk.png b/vs/libpng/contrib/testpngs/crashers/huge_hIST_chunk.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/crashers/huge_hIST_chunk.png rename to vs/libpng/contrib/testpngs/crashers/huge_hIST_chunk.png diff --git a/vs2015/libpng/contrib/testpngs/crashers/huge_iCCP_chunk.png b/vs/libpng/contrib/testpngs/crashers/huge_iCCP_chunk.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/crashers/huge_iCCP_chunk.png rename to vs/libpng/contrib/testpngs/crashers/huge_iCCP_chunk.png diff --git a/vs2015/libpng/contrib/testpngs/crashers/huge_iTXt_chunk.png b/vs/libpng/contrib/testpngs/crashers/huge_iTXt_chunk.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/crashers/huge_iTXt_chunk.png rename to vs/libpng/contrib/testpngs/crashers/huge_iTXt_chunk.png diff --git a/vs2015/libpng/contrib/testpngs/crashers/huge_juNK_unsafe_to_copy.png b/vs/libpng/contrib/testpngs/crashers/huge_juNK_unsafe_to_copy.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/crashers/huge_juNK_unsafe_to_copy.png rename to vs/libpng/contrib/testpngs/crashers/huge_juNK_unsafe_to_copy.png diff --git a/vs2015/libpng/contrib/testpngs/crashers/huge_juNk_safe_to_copy.png b/vs/libpng/contrib/testpngs/crashers/huge_juNk_safe_to_copy.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/crashers/huge_juNk_safe_to_copy.png rename to vs/libpng/contrib/testpngs/crashers/huge_juNk_safe_to_copy.png diff --git a/vs2015/libpng/contrib/testpngs/crashers/huge_pCAL_chunk.png b/vs/libpng/contrib/testpngs/crashers/huge_pCAL_chunk.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/crashers/huge_pCAL_chunk.png rename to vs/libpng/contrib/testpngs/crashers/huge_pCAL_chunk.png diff --git a/vs2015/libpng/contrib/testpngs/crashers/huge_pHYs_chunk.png b/vs/libpng/contrib/testpngs/crashers/huge_pHYs_chunk.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/crashers/huge_pHYs_chunk.png rename to vs/libpng/contrib/testpngs/crashers/huge_pHYs_chunk.png diff --git a/vs2015/libpng/contrib/testpngs/crashers/huge_sCAL_chunk.png b/vs/libpng/contrib/testpngs/crashers/huge_sCAL_chunk.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/crashers/huge_sCAL_chunk.png rename to vs/libpng/contrib/testpngs/crashers/huge_sCAL_chunk.png diff --git a/vs2015/libpng/contrib/testpngs/crashers/huge_sPLT_chunk.png b/vs/libpng/contrib/testpngs/crashers/huge_sPLT_chunk.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/crashers/huge_sPLT_chunk.png rename to vs/libpng/contrib/testpngs/crashers/huge_sPLT_chunk.png diff --git a/vs2015/libpng/contrib/testpngs/crashers/huge_sRGB_chunk.png b/vs/libpng/contrib/testpngs/crashers/huge_sRGB_chunk.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/crashers/huge_sRGB_chunk.png rename to vs/libpng/contrib/testpngs/crashers/huge_sRGB_chunk.png diff --git a/vs2015/libpng/contrib/testpngs/crashers/huge_sTER_chunk.png b/vs/libpng/contrib/testpngs/crashers/huge_sTER_chunk.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/crashers/huge_sTER_chunk.png rename to vs/libpng/contrib/testpngs/crashers/huge_sTER_chunk.png diff --git a/vs2015/libpng/contrib/testpngs/crashers/huge_tEXt_chunk.png b/vs/libpng/contrib/testpngs/crashers/huge_tEXt_chunk.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/crashers/huge_tEXt_chunk.png rename to vs/libpng/contrib/testpngs/crashers/huge_tEXt_chunk.png diff --git a/vs2015/libpng/contrib/testpngs/crashers/huge_tIME_chunk.png b/vs/libpng/contrib/testpngs/crashers/huge_tIME_chunk.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/crashers/huge_tIME_chunk.png rename to vs/libpng/contrib/testpngs/crashers/huge_tIME_chunk.png diff --git a/vs2015/libpng/contrib/testpngs/crashers/huge_zTXt_chunk.png b/vs/libpng/contrib/testpngs/crashers/huge_zTXt_chunk.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/crashers/huge_zTXt_chunk.png rename to vs/libpng/contrib/testpngs/crashers/huge_zTXt_chunk.png diff --git a/vs2015/libpng/contrib/testpngs/gray-1-1.8-tRNS.png b/vs/libpng/contrib/testpngs/gray-1-1.8-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-1-1.8-tRNS.png rename to vs/libpng/contrib/testpngs/gray-1-1.8-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/gray-1-1.8.png b/vs/libpng/contrib/testpngs/gray-1-1.8.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-1-1.8.png rename to vs/libpng/contrib/testpngs/gray-1-1.8.png diff --git a/vs2015/libpng/contrib/testpngs/gray-1-linear-tRNS.png b/vs/libpng/contrib/testpngs/gray-1-linear-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-1-linear-tRNS.png rename to vs/libpng/contrib/testpngs/gray-1-linear-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/gray-1-linear.png b/vs/libpng/contrib/testpngs/gray-1-linear.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-1-linear.png rename to vs/libpng/contrib/testpngs/gray-1-linear.png diff --git a/vs2015/libpng/contrib/testpngs/gray-1-sRGB-tRNS.png b/vs/libpng/contrib/testpngs/gray-1-sRGB-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-1-sRGB-tRNS.png rename to vs/libpng/contrib/testpngs/gray-1-sRGB-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/gray-1-sRGB.png b/vs/libpng/contrib/testpngs/gray-1-sRGB.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-1-sRGB.png rename to vs/libpng/contrib/testpngs/gray-1-sRGB.png diff --git a/vs2015/libpng/contrib/testpngs/gray-1-tRNS.png b/vs/libpng/contrib/testpngs/gray-1-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-1-tRNS.png rename to vs/libpng/contrib/testpngs/gray-1-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/gray-1.png b/vs/libpng/contrib/testpngs/gray-1.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-1.png rename to vs/libpng/contrib/testpngs/gray-1.png diff --git a/vs2015/libpng/contrib/testpngs/gray-16-1.8-tRNS.png b/vs/libpng/contrib/testpngs/gray-16-1.8-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-16-1.8-tRNS.png rename to vs/libpng/contrib/testpngs/gray-16-1.8-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/gray-16-1.8.png b/vs/libpng/contrib/testpngs/gray-16-1.8.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-16-1.8.png rename to vs/libpng/contrib/testpngs/gray-16-1.8.png diff --git a/vs2015/libpng/contrib/testpngs/gray-16-linear-tRNS.png b/vs/libpng/contrib/testpngs/gray-16-linear-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-16-linear-tRNS.png rename to vs/libpng/contrib/testpngs/gray-16-linear-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/gray-16-linear.png b/vs/libpng/contrib/testpngs/gray-16-linear.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-16-linear.png rename to vs/libpng/contrib/testpngs/gray-16-linear.png diff --git a/vs2015/libpng/contrib/testpngs/gray-16-sRGB-tRNS.png b/vs/libpng/contrib/testpngs/gray-16-sRGB-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-16-sRGB-tRNS.png rename to vs/libpng/contrib/testpngs/gray-16-sRGB-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/gray-16-sRGB.png b/vs/libpng/contrib/testpngs/gray-16-sRGB.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-16-sRGB.png rename to vs/libpng/contrib/testpngs/gray-16-sRGB.png diff --git a/vs2015/libpng/contrib/testpngs/gray-16-tRNS.png b/vs/libpng/contrib/testpngs/gray-16-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-16-tRNS.png rename to vs/libpng/contrib/testpngs/gray-16-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/gray-16.png b/vs/libpng/contrib/testpngs/gray-16.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-16.png rename to vs/libpng/contrib/testpngs/gray-16.png diff --git a/vs2015/libpng/contrib/testpngs/gray-2-1.8-tRNS.png b/vs/libpng/contrib/testpngs/gray-2-1.8-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-2-1.8-tRNS.png rename to vs/libpng/contrib/testpngs/gray-2-1.8-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/gray-2-1.8.png b/vs/libpng/contrib/testpngs/gray-2-1.8.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-2-1.8.png rename to vs/libpng/contrib/testpngs/gray-2-1.8.png diff --git a/vs2015/libpng/contrib/testpngs/gray-2-linear-tRNS.png b/vs/libpng/contrib/testpngs/gray-2-linear-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-2-linear-tRNS.png rename to vs/libpng/contrib/testpngs/gray-2-linear-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/gray-2-linear.png b/vs/libpng/contrib/testpngs/gray-2-linear.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-2-linear.png rename to vs/libpng/contrib/testpngs/gray-2-linear.png diff --git a/vs2015/libpng/contrib/testpngs/gray-2-sRGB-tRNS.png b/vs/libpng/contrib/testpngs/gray-2-sRGB-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-2-sRGB-tRNS.png rename to vs/libpng/contrib/testpngs/gray-2-sRGB-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/gray-2-sRGB.png b/vs/libpng/contrib/testpngs/gray-2-sRGB.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-2-sRGB.png rename to vs/libpng/contrib/testpngs/gray-2-sRGB.png diff --git a/vs2015/libpng/contrib/testpngs/gray-2-tRNS.png b/vs/libpng/contrib/testpngs/gray-2-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-2-tRNS.png rename to vs/libpng/contrib/testpngs/gray-2-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/gray-2.png b/vs/libpng/contrib/testpngs/gray-2.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-2.png rename to vs/libpng/contrib/testpngs/gray-2.png diff --git a/vs2015/libpng/contrib/testpngs/gray-4-1.8-tRNS.png b/vs/libpng/contrib/testpngs/gray-4-1.8-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-4-1.8-tRNS.png rename to vs/libpng/contrib/testpngs/gray-4-1.8-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/gray-4-1.8.png b/vs/libpng/contrib/testpngs/gray-4-1.8.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-4-1.8.png rename to vs/libpng/contrib/testpngs/gray-4-1.8.png diff --git a/vs2015/libpng/contrib/testpngs/gray-4-linear-tRNS.png b/vs/libpng/contrib/testpngs/gray-4-linear-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-4-linear-tRNS.png rename to vs/libpng/contrib/testpngs/gray-4-linear-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/gray-4-linear.png b/vs/libpng/contrib/testpngs/gray-4-linear.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-4-linear.png rename to vs/libpng/contrib/testpngs/gray-4-linear.png diff --git a/vs2015/libpng/contrib/testpngs/gray-4-sRGB-tRNS.png b/vs/libpng/contrib/testpngs/gray-4-sRGB-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-4-sRGB-tRNS.png rename to vs/libpng/contrib/testpngs/gray-4-sRGB-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/gray-4-sRGB.png b/vs/libpng/contrib/testpngs/gray-4-sRGB.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-4-sRGB.png rename to vs/libpng/contrib/testpngs/gray-4-sRGB.png diff --git a/vs2015/libpng/contrib/testpngs/gray-4-tRNS.png b/vs/libpng/contrib/testpngs/gray-4-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-4-tRNS.png rename to vs/libpng/contrib/testpngs/gray-4-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/gray-4.png b/vs/libpng/contrib/testpngs/gray-4.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-4.png rename to vs/libpng/contrib/testpngs/gray-4.png diff --git a/vs2015/libpng/contrib/testpngs/gray-8-1.8-tRNS.png b/vs/libpng/contrib/testpngs/gray-8-1.8-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-8-1.8-tRNS.png rename to vs/libpng/contrib/testpngs/gray-8-1.8-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/gray-8-1.8.png b/vs/libpng/contrib/testpngs/gray-8-1.8.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-8-1.8.png rename to vs/libpng/contrib/testpngs/gray-8-1.8.png diff --git a/vs2015/libpng/contrib/testpngs/gray-8-linear-tRNS.png b/vs/libpng/contrib/testpngs/gray-8-linear-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-8-linear-tRNS.png rename to vs/libpng/contrib/testpngs/gray-8-linear-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/gray-8-linear.png b/vs/libpng/contrib/testpngs/gray-8-linear.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-8-linear.png rename to vs/libpng/contrib/testpngs/gray-8-linear.png diff --git a/vs2015/libpng/contrib/testpngs/gray-8-sRGB-tRNS.png b/vs/libpng/contrib/testpngs/gray-8-sRGB-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-8-sRGB-tRNS.png rename to vs/libpng/contrib/testpngs/gray-8-sRGB-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/gray-8-sRGB.png b/vs/libpng/contrib/testpngs/gray-8-sRGB.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-8-sRGB.png rename to vs/libpng/contrib/testpngs/gray-8-sRGB.png diff --git a/vs2015/libpng/contrib/testpngs/gray-8-tRNS.png b/vs/libpng/contrib/testpngs/gray-8-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-8-tRNS.png rename to vs/libpng/contrib/testpngs/gray-8-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/gray-8.png b/vs/libpng/contrib/testpngs/gray-8.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-8.png rename to vs/libpng/contrib/testpngs/gray-8.png diff --git a/vs2015/libpng/contrib/testpngs/gray-alpha-16-1.8.png b/vs/libpng/contrib/testpngs/gray-alpha-16-1.8.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-alpha-16-1.8.png rename to vs/libpng/contrib/testpngs/gray-alpha-16-1.8.png diff --git a/vs2015/libpng/contrib/testpngs/gray-alpha-16-linear.png b/vs/libpng/contrib/testpngs/gray-alpha-16-linear.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-alpha-16-linear.png rename to vs/libpng/contrib/testpngs/gray-alpha-16-linear.png diff --git a/vs2015/libpng/contrib/testpngs/gray-alpha-16-sRGB.png b/vs/libpng/contrib/testpngs/gray-alpha-16-sRGB.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-alpha-16-sRGB.png rename to vs/libpng/contrib/testpngs/gray-alpha-16-sRGB.png diff --git a/vs2015/libpng/contrib/testpngs/gray-alpha-16.png b/vs/libpng/contrib/testpngs/gray-alpha-16.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-alpha-16.png rename to vs/libpng/contrib/testpngs/gray-alpha-16.png diff --git a/vs2015/libpng/contrib/testpngs/gray-alpha-8-1.8.png b/vs/libpng/contrib/testpngs/gray-alpha-8-1.8.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-alpha-8-1.8.png rename to vs/libpng/contrib/testpngs/gray-alpha-8-1.8.png diff --git a/vs2015/libpng/contrib/testpngs/gray-alpha-8-linear.png b/vs/libpng/contrib/testpngs/gray-alpha-8-linear.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-alpha-8-linear.png rename to vs/libpng/contrib/testpngs/gray-alpha-8-linear.png diff --git a/vs2015/libpng/contrib/testpngs/gray-alpha-8-sRGB.png b/vs/libpng/contrib/testpngs/gray-alpha-8-sRGB.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-alpha-8-sRGB.png rename to vs/libpng/contrib/testpngs/gray-alpha-8-sRGB.png diff --git a/vs2015/libpng/contrib/testpngs/gray-alpha-8.png b/vs/libpng/contrib/testpngs/gray-alpha-8.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/gray-alpha-8.png rename to vs/libpng/contrib/testpngs/gray-alpha-8.png diff --git a/vs2015/libpng/contrib/testpngs/makepngs.sh b/vs/libpng/contrib/testpngs/makepngs.sh similarity index 100% rename from vs2015/libpng/contrib/testpngs/makepngs.sh rename to vs/libpng/contrib/testpngs/makepngs.sh diff --git a/vs2015/libpng/contrib/testpngs/palette-1-1.8-tRNS.png b/vs/libpng/contrib/testpngs/palette-1-1.8-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/palette-1-1.8-tRNS.png rename to vs/libpng/contrib/testpngs/palette-1-1.8-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/palette-1-1.8.png b/vs/libpng/contrib/testpngs/palette-1-1.8.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/palette-1-1.8.png rename to vs/libpng/contrib/testpngs/palette-1-1.8.png diff --git a/vs2015/libpng/contrib/testpngs/palette-1-linear-tRNS.png b/vs/libpng/contrib/testpngs/palette-1-linear-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/palette-1-linear-tRNS.png rename to vs/libpng/contrib/testpngs/palette-1-linear-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/palette-1-linear.png b/vs/libpng/contrib/testpngs/palette-1-linear.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/palette-1-linear.png rename to vs/libpng/contrib/testpngs/palette-1-linear.png diff --git a/vs2015/libpng/contrib/testpngs/palette-1-sRGB-tRNS.png b/vs/libpng/contrib/testpngs/palette-1-sRGB-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/palette-1-sRGB-tRNS.png rename to vs/libpng/contrib/testpngs/palette-1-sRGB-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/palette-1-sRGB.png b/vs/libpng/contrib/testpngs/palette-1-sRGB.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/palette-1-sRGB.png rename to vs/libpng/contrib/testpngs/palette-1-sRGB.png diff --git a/vs2015/libpng/contrib/testpngs/palette-1-tRNS.png b/vs/libpng/contrib/testpngs/palette-1-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/palette-1-tRNS.png rename to vs/libpng/contrib/testpngs/palette-1-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/palette-1.png b/vs/libpng/contrib/testpngs/palette-1.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/palette-1.png rename to vs/libpng/contrib/testpngs/palette-1.png diff --git a/vs2015/libpng/contrib/testpngs/palette-2-1.8-tRNS.png b/vs/libpng/contrib/testpngs/palette-2-1.8-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/palette-2-1.8-tRNS.png rename to vs/libpng/contrib/testpngs/palette-2-1.8-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/palette-2-1.8.png b/vs/libpng/contrib/testpngs/palette-2-1.8.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/palette-2-1.8.png rename to vs/libpng/contrib/testpngs/palette-2-1.8.png diff --git a/vs2015/libpng/contrib/testpngs/palette-2-linear-tRNS.png b/vs/libpng/contrib/testpngs/palette-2-linear-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/palette-2-linear-tRNS.png rename to vs/libpng/contrib/testpngs/palette-2-linear-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/palette-2-linear.png b/vs/libpng/contrib/testpngs/palette-2-linear.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/palette-2-linear.png rename to vs/libpng/contrib/testpngs/palette-2-linear.png diff --git a/vs2015/libpng/contrib/testpngs/palette-2-sRGB-tRNS.png b/vs/libpng/contrib/testpngs/palette-2-sRGB-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/palette-2-sRGB-tRNS.png rename to vs/libpng/contrib/testpngs/palette-2-sRGB-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/palette-2-sRGB.png b/vs/libpng/contrib/testpngs/palette-2-sRGB.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/palette-2-sRGB.png rename to vs/libpng/contrib/testpngs/palette-2-sRGB.png diff --git a/vs2015/libpng/contrib/testpngs/palette-2-tRNS.png b/vs/libpng/contrib/testpngs/palette-2-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/palette-2-tRNS.png rename to vs/libpng/contrib/testpngs/palette-2-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/palette-2.png b/vs/libpng/contrib/testpngs/palette-2.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/palette-2.png rename to vs/libpng/contrib/testpngs/palette-2.png diff --git a/vs2015/libpng/contrib/testpngs/palette-4-1.8-tRNS.png b/vs/libpng/contrib/testpngs/palette-4-1.8-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/palette-4-1.8-tRNS.png rename to vs/libpng/contrib/testpngs/palette-4-1.8-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/palette-4-1.8.png b/vs/libpng/contrib/testpngs/palette-4-1.8.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/palette-4-1.8.png rename to vs/libpng/contrib/testpngs/palette-4-1.8.png diff --git a/vs2015/libpng/contrib/testpngs/palette-4-linear-tRNS.png b/vs/libpng/contrib/testpngs/palette-4-linear-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/palette-4-linear-tRNS.png rename to vs/libpng/contrib/testpngs/palette-4-linear-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/palette-4-linear.png b/vs/libpng/contrib/testpngs/palette-4-linear.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/palette-4-linear.png rename to vs/libpng/contrib/testpngs/palette-4-linear.png diff --git a/vs2015/libpng/contrib/testpngs/palette-4-sRGB-tRNS.png b/vs/libpng/contrib/testpngs/palette-4-sRGB-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/palette-4-sRGB-tRNS.png rename to vs/libpng/contrib/testpngs/palette-4-sRGB-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/palette-4-sRGB.png b/vs/libpng/contrib/testpngs/palette-4-sRGB.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/palette-4-sRGB.png rename to vs/libpng/contrib/testpngs/palette-4-sRGB.png diff --git a/vs2015/libpng/contrib/testpngs/palette-4-tRNS.png b/vs/libpng/contrib/testpngs/palette-4-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/palette-4-tRNS.png rename to vs/libpng/contrib/testpngs/palette-4-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/palette-4.png b/vs/libpng/contrib/testpngs/palette-4.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/palette-4.png rename to vs/libpng/contrib/testpngs/palette-4.png diff --git a/vs2015/libpng/contrib/testpngs/palette-8-1.8-tRNS.png b/vs/libpng/contrib/testpngs/palette-8-1.8-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/palette-8-1.8-tRNS.png rename to vs/libpng/contrib/testpngs/palette-8-1.8-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/palette-8-1.8.png b/vs/libpng/contrib/testpngs/palette-8-1.8.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/palette-8-1.8.png rename to vs/libpng/contrib/testpngs/palette-8-1.8.png diff --git a/vs2015/libpng/contrib/testpngs/palette-8-linear-tRNS.png b/vs/libpng/contrib/testpngs/palette-8-linear-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/palette-8-linear-tRNS.png rename to vs/libpng/contrib/testpngs/palette-8-linear-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/palette-8-linear.png b/vs/libpng/contrib/testpngs/palette-8-linear.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/palette-8-linear.png rename to vs/libpng/contrib/testpngs/palette-8-linear.png diff --git a/vs2015/libpng/contrib/testpngs/palette-8-sRGB-tRNS.png b/vs/libpng/contrib/testpngs/palette-8-sRGB-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/palette-8-sRGB-tRNS.png rename to vs/libpng/contrib/testpngs/palette-8-sRGB-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/palette-8-sRGB.png b/vs/libpng/contrib/testpngs/palette-8-sRGB.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/palette-8-sRGB.png rename to vs/libpng/contrib/testpngs/palette-8-sRGB.png diff --git a/vs2015/libpng/contrib/testpngs/palette-8-tRNS.png b/vs/libpng/contrib/testpngs/palette-8-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/palette-8-tRNS.png rename to vs/libpng/contrib/testpngs/palette-8-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/palette-8.png b/vs/libpng/contrib/testpngs/palette-8.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/palette-8.png rename to vs/libpng/contrib/testpngs/palette-8.png diff --git a/vs2015/libpng/contrib/testpngs/rgb-16-1.8-tRNS.png b/vs/libpng/contrib/testpngs/rgb-16-1.8-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/rgb-16-1.8-tRNS.png rename to vs/libpng/contrib/testpngs/rgb-16-1.8-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/rgb-16-1.8.png b/vs/libpng/contrib/testpngs/rgb-16-1.8.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/rgb-16-1.8.png rename to vs/libpng/contrib/testpngs/rgb-16-1.8.png diff --git a/vs2015/libpng/contrib/testpngs/rgb-16-linear-tRNS.png b/vs/libpng/contrib/testpngs/rgb-16-linear-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/rgb-16-linear-tRNS.png rename to vs/libpng/contrib/testpngs/rgb-16-linear-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/rgb-16-linear.png b/vs/libpng/contrib/testpngs/rgb-16-linear.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/rgb-16-linear.png rename to vs/libpng/contrib/testpngs/rgb-16-linear.png diff --git a/vs2015/libpng/contrib/testpngs/rgb-16-sRGB-tRNS.png b/vs/libpng/contrib/testpngs/rgb-16-sRGB-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/rgb-16-sRGB-tRNS.png rename to vs/libpng/contrib/testpngs/rgb-16-sRGB-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/rgb-16-sRGB.png b/vs/libpng/contrib/testpngs/rgb-16-sRGB.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/rgb-16-sRGB.png rename to vs/libpng/contrib/testpngs/rgb-16-sRGB.png diff --git a/vs2015/libpng/contrib/testpngs/rgb-16-tRNS.png b/vs/libpng/contrib/testpngs/rgb-16-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/rgb-16-tRNS.png rename to vs/libpng/contrib/testpngs/rgb-16-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/rgb-16.png b/vs/libpng/contrib/testpngs/rgb-16.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/rgb-16.png rename to vs/libpng/contrib/testpngs/rgb-16.png diff --git a/vs2015/libpng/contrib/testpngs/rgb-8-1.8-tRNS.png b/vs/libpng/contrib/testpngs/rgb-8-1.8-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/rgb-8-1.8-tRNS.png rename to vs/libpng/contrib/testpngs/rgb-8-1.8-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/rgb-8-1.8.png b/vs/libpng/contrib/testpngs/rgb-8-1.8.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/rgb-8-1.8.png rename to vs/libpng/contrib/testpngs/rgb-8-1.8.png diff --git a/vs2015/libpng/contrib/testpngs/rgb-8-linear-tRNS.png b/vs/libpng/contrib/testpngs/rgb-8-linear-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/rgb-8-linear-tRNS.png rename to vs/libpng/contrib/testpngs/rgb-8-linear-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/rgb-8-linear.png b/vs/libpng/contrib/testpngs/rgb-8-linear.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/rgb-8-linear.png rename to vs/libpng/contrib/testpngs/rgb-8-linear.png diff --git a/vs2015/libpng/contrib/testpngs/rgb-8-sRGB-tRNS.png b/vs/libpng/contrib/testpngs/rgb-8-sRGB-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/rgb-8-sRGB-tRNS.png rename to vs/libpng/contrib/testpngs/rgb-8-sRGB-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/rgb-8-sRGB.png b/vs/libpng/contrib/testpngs/rgb-8-sRGB.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/rgb-8-sRGB.png rename to vs/libpng/contrib/testpngs/rgb-8-sRGB.png diff --git a/vs2015/libpng/contrib/testpngs/rgb-8-tRNS.png b/vs/libpng/contrib/testpngs/rgb-8-tRNS.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/rgb-8-tRNS.png rename to vs/libpng/contrib/testpngs/rgb-8-tRNS.png diff --git a/vs2015/libpng/contrib/testpngs/rgb-8.png b/vs/libpng/contrib/testpngs/rgb-8.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/rgb-8.png rename to vs/libpng/contrib/testpngs/rgb-8.png diff --git a/vs2015/libpng/contrib/testpngs/rgb-alpha-16-1.8.png b/vs/libpng/contrib/testpngs/rgb-alpha-16-1.8.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/rgb-alpha-16-1.8.png rename to vs/libpng/contrib/testpngs/rgb-alpha-16-1.8.png diff --git a/vs2015/libpng/contrib/testpngs/rgb-alpha-16-linear.png b/vs/libpng/contrib/testpngs/rgb-alpha-16-linear.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/rgb-alpha-16-linear.png rename to vs/libpng/contrib/testpngs/rgb-alpha-16-linear.png diff --git a/vs2015/libpng/contrib/testpngs/rgb-alpha-16-sRGB.png b/vs/libpng/contrib/testpngs/rgb-alpha-16-sRGB.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/rgb-alpha-16-sRGB.png rename to vs/libpng/contrib/testpngs/rgb-alpha-16-sRGB.png diff --git a/vs2015/libpng/contrib/testpngs/rgb-alpha-16.png b/vs/libpng/contrib/testpngs/rgb-alpha-16.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/rgb-alpha-16.png rename to vs/libpng/contrib/testpngs/rgb-alpha-16.png diff --git a/vs2015/libpng/contrib/testpngs/rgb-alpha-8-1.8.png b/vs/libpng/contrib/testpngs/rgb-alpha-8-1.8.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/rgb-alpha-8-1.8.png rename to vs/libpng/contrib/testpngs/rgb-alpha-8-1.8.png diff --git a/vs2015/libpng/contrib/testpngs/rgb-alpha-8-linear.png b/vs/libpng/contrib/testpngs/rgb-alpha-8-linear.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/rgb-alpha-8-linear.png rename to vs/libpng/contrib/testpngs/rgb-alpha-8-linear.png diff --git a/vs2015/libpng/contrib/testpngs/rgb-alpha-8-sRGB.png b/vs/libpng/contrib/testpngs/rgb-alpha-8-sRGB.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/rgb-alpha-8-sRGB.png rename to vs/libpng/contrib/testpngs/rgb-alpha-8-sRGB.png diff --git a/vs2015/libpng/contrib/testpngs/rgb-alpha-8.png b/vs/libpng/contrib/testpngs/rgb-alpha-8.png similarity index 100% rename from vs2015/libpng/contrib/testpngs/rgb-alpha-8.png rename to vs/libpng/contrib/testpngs/rgb-alpha-8.png diff --git a/vs2015/libpng/contrib/tools/README.txt b/vs/libpng/contrib/tools/README.txt similarity index 100% rename from vs2015/libpng/contrib/tools/README.txt rename to vs/libpng/contrib/tools/README.txt diff --git a/vs2015/libpng/contrib/tools/checksum-icc.c b/vs/libpng/contrib/tools/checksum-icc.c similarity index 100% rename from vs2015/libpng/contrib/tools/checksum-icc.c rename to vs/libpng/contrib/tools/checksum-icc.c diff --git a/vs2015/libpng/contrib/tools/chkfmt b/vs/libpng/contrib/tools/chkfmt similarity index 100% rename from vs2015/libpng/contrib/tools/chkfmt rename to vs/libpng/contrib/tools/chkfmt diff --git a/vs2015/libpng/contrib/tools/cvtcolor.c b/vs/libpng/contrib/tools/cvtcolor.c similarity index 100% rename from vs2015/libpng/contrib/tools/cvtcolor.c rename to vs/libpng/contrib/tools/cvtcolor.c diff --git a/vs2015/libpng/contrib/tools/genpng.c b/vs/libpng/contrib/tools/genpng.c similarity index 100% rename from vs2015/libpng/contrib/tools/genpng.c rename to vs/libpng/contrib/tools/genpng.c diff --git a/vs2015/libpng/contrib/tools/intgamma.sh b/vs/libpng/contrib/tools/intgamma.sh similarity index 100% rename from vs2015/libpng/contrib/tools/intgamma.sh rename to vs/libpng/contrib/tools/intgamma.sh diff --git a/vs2015/libpng/contrib/tools/makesRGB.c b/vs/libpng/contrib/tools/makesRGB.c similarity index 100% rename from vs2015/libpng/contrib/tools/makesRGB.c rename to vs/libpng/contrib/tools/makesRGB.c diff --git a/vs2015/libpng/contrib/tools/png-fix-itxt.c b/vs/libpng/contrib/tools/png-fix-itxt.c similarity index 100% rename from vs2015/libpng/contrib/tools/png-fix-itxt.c rename to vs/libpng/contrib/tools/png-fix-itxt.c diff --git a/vs2015/libpng/contrib/tools/pngcp.c b/vs/libpng/contrib/tools/pngcp.c similarity index 100% rename from vs2015/libpng/contrib/tools/pngcp.c rename to vs/libpng/contrib/tools/pngcp.c diff --git a/vs2015/libpng/contrib/tools/pngfix.c b/vs/libpng/contrib/tools/pngfix.c similarity index 100% rename from vs2015/libpng/contrib/tools/pngfix.c rename to vs/libpng/contrib/tools/pngfix.c diff --git a/vs2015/libpng/contrib/tools/reindent b/vs/libpng/contrib/tools/reindent similarity index 100% rename from vs2015/libpng/contrib/tools/reindent rename to vs/libpng/contrib/tools/reindent diff --git a/vs2015/libpng/contrib/tools/sRGB.h b/vs/libpng/contrib/tools/sRGB.h similarity index 100% rename from vs2015/libpng/contrib/tools/sRGB.h rename to vs/libpng/contrib/tools/sRGB.h diff --git a/vs2015/libpng/contrib/visupng/PngFile.c b/vs/libpng/contrib/visupng/PngFile.c similarity index 100% rename from vs2015/libpng/contrib/visupng/PngFile.c rename to vs/libpng/contrib/visupng/PngFile.c diff --git a/vs2015/libpng/contrib/visupng/PngFile.h b/vs/libpng/contrib/visupng/PngFile.h similarity index 100% rename from vs2015/libpng/contrib/visupng/PngFile.h rename to vs/libpng/contrib/visupng/PngFile.h diff --git a/vs2015/libpng/contrib/visupng/README.txt b/vs/libpng/contrib/visupng/README.txt similarity index 100% rename from vs2015/libpng/contrib/visupng/README.txt rename to vs/libpng/contrib/visupng/README.txt diff --git a/vs2015/libpng/contrib/visupng/VisualPng.c b/vs/libpng/contrib/visupng/VisualPng.c similarity index 100% rename from vs2015/libpng/contrib/visupng/VisualPng.c rename to vs/libpng/contrib/visupng/VisualPng.c diff --git a/vs2015/libpng/contrib/visupng/VisualPng.dsp b/vs/libpng/contrib/visupng/VisualPng.dsp similarity index 100% rename from vs2015/libpng/contrib/visupng/VisualPng.dsp rename to vs/libpng/contrib/visupng/VisualPng.dsp diff --git a/vs2015/libpng/contrib/visupng/VisualPng.dsw b/vs/libpng/contrib/visupng/VisualPng.dsw similarity index 100% rename from vs2015/libpng/contrib/visupng/VisualPng.dsw rename to vs/libpng/contrib/visupng/VisualPng.dsw diff --git a/vs2015/libpng/contrib/visupng/VisualPng.ico b/vs/libpng/contrib/visupng/VisualPng.ico similarity index 100% rename from vs2015/libpng/contrib/visupng/VisualPng.ico rename to vs/libpng/contrib/visupng/VisualPng.ico diff --git a/vs2015/libpng/contrib/visupng/VisualPng.png b/vs/libpng/contrib/visupng/VisualPng.png similarity index 100% rename from vs2015/libpng/contrib/visupng/VisualPng.png rename to vs/libpng/contrib/visupng/VisualPng.png diff --git a/vs2015/libpng/contrib/visupng/VisualPng.rc b/vs/libpng/contrib/visupng/VisualPng.rc similarity index 100% rename from vs2015/libpng/contrib/visupng/VisualPng.rc rename to vs/libpng/contrib/visupng/VisualPng.rc diff --git a/vs2015/libpng/contrib/visupng/cexcept.h b/vs/libpng/contrib/visupng/cexcept.h similarity index 100% rename from vs2015/libpng/contrib/visupng/cexcept.h rename to vs/libpng/contrib/visupng/cexcept.h diff --git a/vs2015/libpng/contrib/visupng/resource.h b/vs/libpng/contrib/visupng/resource.h similarity index 100% rename from vs2015/libpng/contrib/visupng/resource.h rename to vs/libpng/contrib/visupng/resource.h diff --git a/vs2015/libpng/depcomp b/vs/libpng/depcomp similarity index 100% rename from vs2015/libpng/depcomp rename to vs/libpng/depcomp diff --git a/vs2015/libpng/example.c b/vs/libpng/example.c similarity index 100% rename from vs2015/libpng/example.c rename to vs/libpng/example.c diff --git a/vs2015/libpng/install-sh b/vs/libpng/install-sh similarity index 100% rename from vs2015/libpng/install-sh rename to vs/libpng/install-sh diff --git a/vs2015/libpng/intel/filter_sse2_intrinsics.c b/vs/libpng/intel/filter_sse2_intrinsics.c similarity index 100% rename from vs2015/libpng/intel/filter_sse2_intrinsics.c rename to vs/libpng/intel/filter_sse2_intrinsics.c diff --git a/vs2015/libpng/intel/intel_init.c b/vs/libpng/intel/intel_init.c similarity index 100% rename from vs2015/libpng/intel/intel_init.c rename to vs/libpng/intel/intel_init.c diff --git a/vs2015/libpng/libpng-config.in b/vs/libpng/libpng-config.in similarity index 100% rename from vs2015/libpng/libpng-config.in rename to vs/libpng/libpng-config.in diff --git a/vs2015/libpng/libpng-manual.txt b/vs/libpng/libpng-manual.txt similarity index 100% rename from vs2015/libpng/libpng-manual.txt rename to vs/libpng/libpng-manual.txt diff --git a/vs2015/libpng/libpng.3 b/vs/libpng/libpng.3 similarity index 100% rename from vs2015/libpng/libpng.3 rename to vs/libpng/libpng.3 diff --git a/vs2015/libpng/libpng.pc.in b/vs/libpng/libpng.pc.in similarity index 100% rename from vs2015/libpng/libpng.pc.in rename to vs/libpng/libpng.pc.in diff --git a/vs2015/libpng/libpngpf.3 b/vs/libpng/libpngpf.3 similarity index 100% rename from vs2015/libpng/libpngpf.3 rename to vs/libpng/libpngpf.3 diff --git a/vs2015/libpng/ltmain.sh b/vs/libpng/ltmain.sh similarity index 100% rename from vs2015/libpng/ltmain.sh rename to vs/libpng/ltmain.sh diff --git a/vs2015/libpng/mips/filter_msa_intrinsics.c b/vs/libpng/mips/filter_msa_intrinsics.c similarity index 100% rename from vs2015/libpng/mips/filter_msa_intrinsics.c rename to vs/libpng/mips/filter_msa_intrinsics.c diff --git a/vs2015/libpng/mips/mips_init.c b/vs/libpng/mips/mips_init.c similarity index 100% rename from vs2015/libpng/mips/mips_init.c rename to vs/libpng/mips/mips_init.c diff --git a/vs2015/libpng/missing b/vs/libpng/missing similarity index 100% rename from vs2015/libpng/missing rename to vs/libpng/missing diff --git a/vs2015/libpng/png.5 b/vs/libpng/png.5 similarity index 100% rename from vs2015/libpng/png.5 rename to vs/libpng/png.5 diff --git a/vs2015/libpng/png.c b/vs/libpng/png.c similarity index 100% rename from vs2015/libpng/png.c rename to vs/libpng/png.c diff --git a/vs2015/libpng/png.h b/vs/libpng/png.h similarity index 100% rename from vs2015/libpng/png.h rename to vs/libpng/png.h diff --git a/vs2015/libpng/pngbar.jpg b/vs/libpng/pngbar.jpg similarity index 100% rename from vs2015/libpng/pngbar.jpg rename to vs/libpng/pngbar.jpg diff --git a/vs2015/libpng/pngbar.png b/vs/libpng/pngbar.png similarity index 100% rename from vs2015/libpng/pngbar.png rename to vs/libpng/pngbar.png diff --git a/vs2015/libpng/pngconf.h b/vs/libpng/pngconf.h similarity index 100% rename from vs2015/libpng/pngconf.h rename to vs/libpng/pngconf.h diff --git a/vs2015/libpng/pngdebug.h b/vs/libpng/pngdebug.h similarity index 100% rename from vs2015/libpng/pngdebug.h rename to vs/libpng/pngdebug.h diff --git a/vs2015/libpng/pngerror.c b/vs/libpng/pngerror.c similarity index 100% rename from vs2015/libpng/pngerror.c rename to vs/libpng/pngerror.c diff --git a/vs2015/libpng/pngget.c b/vs/libpng/pngget.c similarity index 100% rename from vs2015/libpng/pngget.c rename to vs/libpng/pngget.c diff --git a/vs2015/libpng/pnginfo.h b/vs/libpng/pnginfo.h similarity index 100% rename from vs2015/libpng/pnginfo.h rename to vs/libpng/pnginfo.h diff --git a/vs2015/libpng/pnglibconf.h b/vs/libpng/pnglibconf.h similarity index 100% rename from vs2015/libpng/pnglibconf.h rename to vs/libpng/pnglibconf.h diff --git a/vs2015/libpng/pngmem.c b/vs/libpng/pngmem.c similarity index 100% rename from vs2015/libpng/pngmem.c rename to vs/libpng/pngmem.c diff --git a/vs2015/libpng/pngnow.png b/vs/libpng/pngnow.png similarity index 100% rename from vs2015/libpng/pngnow.png rename to vs/libpng/pngnow.png diff --git a/vs2015/libpng/pngpread.c b/vs/libpng/pngpread.c similarity index 100% rename from vs2015/libpng/pngpread.c rename to vs/libpng/pngpread.c diff --git a/vs2015/libpng/pngpriv.h b/vs/libpng/pngpriv.h similarity index 100% rename from vs2015/libpng/pngpriv.h rename to vs/libpng/pngpriv.h diff --git a/vs2015/libpng/pngread.c b/vs/libpng/pngread.c similarity index 100% rename from vs2015/libpng/pngread.c rename to vs/libpng/pngread.c diff --git a/vs2015/libpng/pngrio.c b/vs/libpng/pngrio.c similarity index 100% rename from vs2015/libpng/pngrio.c rename to vs/libpng/pngrio.c diff --git a/vs2015/libpng/pngrtran.c b/vs/libpng/pngrtran.c similarity index 100% rename from vs2015/libpng/pngrtran.c rename to vs/libpng/pngrtran.c diff --git a/vs2015/libpng/pngrutil.c b/vs/libpng/pngrutil.c similarity index 100% rename from vs2015/libpng/pngrutil.c rename to vs/libpng/pngrutil.c diff --git a/vs2015/libpng/pngset.c b/vs/libpng/pngset.c similarity index 100% rename from vs2015/libpng/pngset.c rename to vs/libpng/pngset.c diff --git a/vs2015/libpng/pngstruct.h b/vs/libpng/pngstruct.h similarity index 100% rename from vs2015/libpng/pngstruct.h rename to vs/libpng/pngstruct.h diff --git a/vs2015/libpng/pngtest.c b/vs/libpng/pngtest.c similarity index 100% rename from vs2015/libpng/pngtest.c rename to vs/libpng/pngtest.c diff --git a/vs2015/libpng/pngtest.png b/vs/libpng/pngtest.png similarity index 100% rename from vs2015/libpng/pngtest.png rename to vs/libpng/pngtest.png diff --git a/vs2015/libpng/pngtrans.c b/vs/libpng/pngtrans.c similarity index 100% rename from vs2015/libpng/pngtrans.c rename to vs/libpng/pngtrans.c diff --git a/vs2015/libpng/pngusr.dfa b/vs/libpng/pngusr.dfa similarity index 100% rename from vs2015/libpng/pngusr.dfa rename to vs/libpng/pngusr.dfa diff --git a/vs2015/libpng/pngwio.c b/vs/libpng/pngwio.c similarity index 100% rename from vs2015/libpng/pngwio.c rename to vs/libpng/pngwio.c diff --git a/vs2015/libpng/pngwrite.c b/vs/libpng/pngwrite.c similarity index 100% rename from vs2015/libpng/pngwrite.c rename to vs/libpng/pngwrite.c diff --git a/vs2015/libpng/pngwtran.c b/vs/libpng/pngwtran.c similarity index 100% rename from vs2015/libpng/pngwtran.c rename to vs/libpng/pngwtran.c diff --git a/vs2015/libpng/pngwutil.c b/vs/libpng/pngwutil.c similarity index 100% rename from vs2015/libpng/pngwutil.c rename to vs/libpng/pngwutil.c diff --git a/vs2015/libpng/powerpc/filter_vsx_intrinsics.c b/vs/libpng/powerpc/filter_vsx_intrinsics.c similarity index 100% rename from vs2015/libpng/powerpc/filter_vsx_intrinsics.c rename to vs/libpng/powerpc/filter_vsx_intrinsics.c diff --git a/vs2015/libpng/powerpc/powerpc_init.c b/vs/libpng/powerpc/powerpc_init.c similarity index 100% rename from vs2015/libpng/powerpc/powerpc_init.c rename to vs/libpng/powerpc/powerpc_init.c diff --git a/vs2015/libpng/projects/owatcom/libpng.tgt b/vs/libpng/projects/owatcom/libpng.tgt similarity index 100% rename from vs2015/libpng/projects/owatcom/libpng.tgt rename to vs/libpng/projects/owatcom/libpng.tgt diff --git a/vs2015/libpng/projects/owatcom/libpng.wpj b/vs/libpng/projects/owatcom/libpng.wpj similarity index 100% rename from vs2015/libpng/projects/owatcom/libpng.wpj rename to vs/libpng/projects/owatcom/libpng.wpj diff --git a/vs2015/libpng/projects/owatcom/pngconfig.mak b/vs/libpng/projects/owatcom/pngconfig.mak similarity index 100% rename from vs2015/libpng/projects/owatcom/pngconfig.mak rename to vs/libpng/projects/owatcom/pngconfig.mak diff --git a/vs2015/libpng/projects/owatcom/pngstest.tgt b/vs/libpng/projects/owatcom/pngstest.tgt similarity index 100% rename from vs2015/libpng/projects/owatcom/pngstest.tgt rename to vs/libpng/projects/owatcom/pngstest.tgt diff --git a/vs2015/libpng/projects/owatcom/pngtest.tgt b/vs/libpng/projects/owatcom/pngtest.tgt similarity index 100% rename from vs2015/libpng/projects/owatcom/pngtest.tgt rename to vs/libpng/projects/owatcom/pngtest.tgt diff --git a/vs2015/libpng/projects/owatcom/pngvalid.tgt b/vs/libpng/projects/owatcom/pngvalid.tgt similarity index 100% rename from vs2015/libpng/projects/owatcom/pngvalid.tgt rename to vs/libpng/projects/owatcom/pngvalid.tgt diff --git a/vs2015/libpng/projects/visualc71/PRJ0041.mak b/vs/libpng/projects/visualc71/PRJ0041.mak similarity index 100% rename from vs2015/libpng/projects/visualc71/PRJ0041.mak rename to vs/libpng/projects/visualc71/PRJ0041.mak diff --git a/vs2015/libpng/projects/visualc71/README.txt b/vs/libpng/projects/visualc71/README.txt similarity index 100% rename from vs2015/libpng/projects/visualc71/README.txt rename to vs/libpng/projects/visualc71/README.txt diff --git a/vs2015/libpng/projects/visualc71/README_zlib.txt b/vs/libpng/projects/visualc71/README_zlib.txt similarity index 100% rename from vs2015/libpng/projects/visualc71/README_zlib.txt rename to vs/libpng/projects/visualc71/README_zlib.txt diff --git a/vs2015/libpng/projects/visualc71/libpng.sln b/vs/libpng/projects/visualc71/libpng.sln similarity index 100% rename from vs2015/libpng/projects/visualc71/libpng.sln rename to vs/libpng/projects/visualc71/libpng.sln diff --git a/vs2015/libpng/projects/visualc71/libpng.vcproj b/vs/libpng/projects/visualc71/libpng.vcproj similarity index 100% rename from vs2015/libpng/projects/visualc71/libpng.vcproj rename to vs/libpng/projects/visualc71/libpng.vcproj diff --git a/vs2015/libpng/projects/visualc71/pngtest.vcproj b/vs/libpng/projects/visualc71/pngtest.vcproj similarity index 100% rename from vs2015/libpng/projects/visualc71/pngtest.vcproj rename to vs/libpng/projects/visualc71/pngtest.vcproj diff --git a/vs2015/libpng/projects/visualc71/zlib.vcproj b/vs/libpng/projects/visualc71/zlib.vcproj similarity index 100% rename from vs2015/libpng/projects/visualc71/zlib.vcproj rename to vs/libpng/projects/visualc71/zlib.vcproj diff --git a/vs2015/libpng/projects/vstudio/README.txt b/vs/libpng/projects/vstudio/README.txt similarity index 100% rename from vs2015/libpng/projects/vstudio/README.txt rename to vs/libpng/projects/vstudio/README.txt diff --git a/vs2015/libpng/projects/vstudio/libpng/libpng.vcxproj b/vs/libpng/projects/vstudio/libpng/libpng.vcxproj similarity index 100% rename from vs2015/libpng/projects/vstudio/libpng/libpng.vcxproj rename to vs/libpng/projects/vstudio/libpng/libpng.vcxproj diff --git a/vs2015/libpng/projects/vstudio/pnglibconf/pnglibconf.vcxproj b/vs/libpng/projects/vstudio/pnglibconf/pnglibconf.vcxproj similarity index 100% rename from vs2015/libpng/projects/vstudio/pnglibconf/pnglibconf.vcxproj rename to vs/libpng/projects/vstudio/pnglibconf/pnglibconf.vcxproj diff --git a/vs2015/libpng/projects/vstudio/pngstest/pngstest.vcxproj b/vs/libpng/projects/vstudio/pngstest/pngstest.vcxproj similarity index 100% rename from vs2015/libpng/projects/vstudio/pngstest/pngstest.vcxproj rename to vs/libpng/projects/vstudio/pngstest/pngstest.vcxproj diff --git a/vs2015/libpng/projects/vstudio/pngtest/pngtest.vcxproj b/vs/libpng/projects/vstudio/pngtest/pngtest.vcxproj similarity index 100% rename from vs2015/libpng/projects/vstudio/pngtest/pngtest.vcxproj rename to vs/libpng/projects/vstudio/pngtest/pngtest.vcxproj diff --git a/vs2015/libpng/projects/vstudio/pngunknown/pngunknown.vcxproj b/vs/libpng/projects/vstudio/pngunknown/pngunknown.vcxproj similarity index 100% rename from vs2015/libpng/projects/vstudio/pngunknown/pngunknown.vcxproj rename to vs/libpng/projects/vstudio/pngunknown/pngunknown.vcxproj diff --git a/vs2015/libpng/projects/vstudio/pngvalid/pngvalid.vcxproj b/vs/libpng/projects/vstudio/pngvalid/pngvalid.vcxproj similarity index 100% rename from vs2015/libpng/projects/vstudio/pngvalid/pngvalid.vcxproj rename to vs/libpng/projects/vstudio/pngvalid/pngvalid.vcxproj diff --git a/vs2015/libpng/projects/vstudio/vstudio.sln b/vs/libpng/projects/vstudio/vstudio.sln similarity index 100% rename from vs2015/libpng/projects/vstudio/vstudio.sln rename to vs/libpng/projects/vstudio/vstudio.sln diff --git a/vs2015/libpng/projects/vstudio/zlib.props b/vs/libpng/projects/vstudio/zlib.props similarity index 100% rename from vs2015/libpng/projects/vstudio/zlib.props rename to vs/libpng/projects/vstudio/zlib.props diff --git a/vs2015/libpng/projects/vstudio/zlib/zlib.vcxproj b/vs/libpng/projects/vstudio/zlib/zlib.vcxproj similarity index 100% rename from vs2015/libpng/projects/vstudio/zlib/zlib.vcxproj rename to vs/libpng/projects/vstudio/zlib/zlib.vcxproj diff --git a/vs2015/libpng/scripts/README.txt b/vs/libpng/scripts/README.txt similarity index 100% rename from vs2015/libpng/scripts/README.txt rename to vs/libpng/scripts/README.txt diff --git a/vs2015/libpng/scripts/SCOPTIONS.ppc b/vs/libpng/scripts/SCOPTIONS.ppc similarity index 100% rename from vs2015/libpng/scripts/SCOPTIONS.ppc rename to vs/libpng/scripts/SCOPTIONS.ppc diff --git a/vs2015/libpng/scripts/checksym.awk b/vs/libpng/scripts/checksym.awk similarity index 100% rename from vs2015/libpng/scripts/checksym.awk rename to vs/libpng/scripts/checksym.awk diff --git a/vs2015/libpng/scripts/def.c b/vs/libpng/scripts/def.c similarity index 100% rename from vs2015/libpng/scripts/def.c rename to vs/libpng/scripts/def.c diff --git a/vs2015/libpng/scripts/descrip.mms b/vs/libpng/scripts/descrip.mms similarity index 100% rename from vs2015/libpng/scripts/descrip.mms rename to vs/libpng/scripts/descrip.mms diff --git a/vs2015/libpng/scripts/dfn.awk b/vs/libpng/scripts/dfn.awk similarity index 100% rename from vs2015/libpng/scripts/dfn.awk rename to vs/libpng/scripts/dfn.awk diff --git a/vs2015/libpng/scripts/intprefix.c b/vs/libpng/scripts/intprefix.c similarity index 100% rename from vs2015/libpng/scripts/intprefix.c rename to vs/libpng/scripts/intprefix.c diff --git a/vs2015/libpng/scripts/libtool.m4 b/vs/libpng/scripts/libtool.m4 similarity index 100% rename from vs2015/libpng/scripts/libtool.m4 rename to vs/libpng/scripts/libtool.m4 diff --git a/vs2015/libpng/scripts/ltoptions.m4 b/vs/libpng/scripts/ltoptions.m4 similarity index 100% rename from vs2015/libpng/scripts/ltoptions.m4 rename to vs/libpng/scripts/ltoptions.m4 diff --git a/vs2015/libpng/scripts/ltsugar.m4 b/vs/libpng/scripts/ltsugar.m4 similarity index 100% rename from vs2015/libpng/scripts/ltsugar.m4 rename to vs/libpng/scripts/ltsugar.m4 diff --git a/vs2015/libpng/scripts/ltversion.m4 b/vs/libpng/scripts/ltversion.m4 similarity index 100% rename from vs2015/libpng/scripts/ltversion.m4 rename to vs/libpng/scripts/ltversion.m4 diff --git a/vs2015/libpng/scripts/lt~obsolete.m4 b/vs/libpng/scripts/lt~obsolete.m4 similarity index 100% rename from vs2015/libpng/scripts/lt~obsolete.m4 rename to vs/libpng/scripts/lt~obsolete.m4 diff --git a/vs2015/libpng/scripts/macro.lst b/vs/libpng/scripts/macro.lst similarity index 100% rename from vs2015/libpng/scripts/macro.lst rename to vs/libpng/scripts/macro.lst diff --git a/vs2015/libpng/scripts/makefile.32sunu b/vs/libpng/scripts/makefile.32sunu similarity index 100% rename from vs2015/libpng/scripts/makefile.32sunu rename to vs/libpng/scripts/makefile.32sunu diff --git a/vs2015/libpng/scripts/makefile.64sunu b/vs/libpng/scripts/makefile.64sunu similarity index 100% rename from vs2015/libpng/scripts/makefile.64sunu rename to vs/libpng/scripts/makefile.64sunu diff --git a/vs2015/libpng/scripts/makefile.acorn b/vs/libpng/scripts/makefile.acorn similarity index 100% rename from vs2015/libpng/scripts/makefile.acorn rename to vs/libpng/scripts/makefile.acorn diff --git a/vs2015/libpng/scripts/makefile.aix b/vs/libpng/scripts/makefile.aix similarity index 100% rename from vs2015/libpng/scripts/makefile.aix rename to vs/libpng/scripts/makefile.aix diff --git a/vs2015/libpng/scripts/makefile.amiga b/vs/libpng/scripts/makefile.amiga similarity index 100% rename from vs2015/libpng/scripts/makefile.amiga rename to vs/libpng/scripts/makefile.amiga diff --git a/vs2015/libpng/scripts/makefile.atari b/vs/libpng/scripts/makefile.atari similarity index 100% rename from vs2015/libpng/scripts/makefile.atari rename to vs/libpng/scripts/makefile.atari diff --git a/vs2015/libpng/scripts/makefile.bc32 b/vs/libpng/scripts/makefile.bc32 similarity index 100% rename from vs2015/libpng/scripts/makefile.bc32 rename to vs/libpng/scripts/makefile.bc32 diff --git a/vs2015/libpng/scripts/makefile.beos b/vs/libpng/scripts/makefile.beos similarity index 100% rename from vs2015/libpng/scripts/makefile.beos rename to vs/libpng/scripts/makefile.beos diff --git a/vs2015/libpng/scripts/makefile.bor b/vs/libpng/scripts/makefile.bor similarity index 100% rename from vs2015/libpng/scripts/makefile.bor rename to vs/libpng/scripts/makefile.bor diff --git a/vs2015/libpng/scripts/makefile.cegcc b/vs/libpng/scripts/makefile.cegcc similarity index 100% rename from vs2015/libpng/scripts/makefile.cegcc rename to vs/libpng/scripts/makefile.cegcc diff --git a/vs2015/libpng/scripts/makefile.darwin b/vs/libpng/scripts/makefile.darwin similarity index 100% rename from vs2015/libpng/scripts/makefile.darwin rename to vs/libpng/scripts/makefile.darwin diff --git a/vs2015/libpng/scripts/makefile.dec b/vs/libpng/scripts/makefile.dec similarity index 100% rename from vs2015/libpng/scripts/makefile.dec rename to vs/libpng/scripts/makefile.dec diff --git a/vs2015/libpng/scripts/makefile.dj2 b/vs/libpng/scripts/makefile.dj2 similarity index 100% rename from vs2015/libpng/scripts/makefile.dj2 rename to vs/libpng/scripts/makefile.dj2 diff --git a/vs2015/libpng/scripts/makefile.freebsd b/vs/libpng/scripts/makefile.freebsd similarity index 100% rename from vs2015/libpng/scripts/makefile.freebsd rename to vs/libpng/scripts/makefile.freebsd diff --git a/vs2015/libpng/scripts/makefile.gcc b/vs/libpng/scripts/makefile.gcc similarity index 100% rename from vs2015/libpng/scripts/makefile.gcc rename to vs/libpng/scripts/makefile.gcc diff --git a/vs2015/libpng/scripts/makefile.hp64 b/vs/libpng/scripts/makefile.hp64 similarity index 100% rename from vs2015/libpng/scripts/makefile.hp64 rename to vs/libpng/scripts/makefile.hp64 diff --git a/vs2015/libpng/scripts/makefile.hpgcc b/vs/libpng/scripts/makefile.hpgcc similarity index 100% rename from vs2015/libpng/scripts/makefile.hpgcc rename to vs/libpng/scripts/makefile.hpgcc diff --git a/vs2015/libpng/scripts/makefile.hpux b/vs/libpng/scripts/makefile.hpux similarity index 100% rename from vs2015/libpng/scripts/makefile.hpux rename to vs/libpng/scripts/makefile.hpux diff --git a/vs2015/libpng/scripts/makefile.ibmc b/vs/libpng/scripts/makefile.ibmc similarity index 100% rename from vs2015/libpng/scripts/makefile.ibmc rename to vs/libpng/scripts/makefile.ibmc diff --git a/vs2015/libpng/scripts/makefile.intel b/vs/libpng/scripts/makefile.intel similarity index 100% rename from vs2015/libpng/scripts/makefile.intel rename to vs/libpng/scripts/makefile.intel diff --git a/vs2015/libpng/scripts/makefile.knr b/vs/libpng/scripts/makefile.knr similarity index 100% rename from vs2015/libpng/scripts/makefile.knr rename to vs/libpng/scripts/makefile.knr diff --git a/vs2015/libpng/scripts/makefile.linux b/vs/libpng/scripts/makefile.linux similarity index 100% rename from vs2015/libpng/scripts/makefile.linux rename to vs/libpng/scripts/makefile.linux diff --git a/vs2015/libpng/scripts/makefile.linux-opt b/vs/libpng/scripts/makefile.linux-opt similarity index 100% rename from vs2015/libpng/scripts/makefile.linux-opt rename to vs/libpng/scripts/makefile.linux-opt diff --git a/vs2015/libpng/scripts/makefile.mips b/vs/libpng/scripts/makefile.mips similarity index 100% rename from vs2015/libpng/scripts/makefile.mips rename to vs/libpng/scripts/makefile.mips diff --git a/vs2015/libpng/scripts/makefile.msc b/vs/libpng/scripts/makefile.msc similarity index 100% rename from vs2015/libpng/scripts/makefile.msc rename to vs/libpng/scripts/makefile.msc diff --git a/vs2015/libpng/scripts/makefile.msys b/vs/libpng/scripts/makefile.msys similarity index 100% rename from vs2015/libpng/scripts/makefile.msys rename to vs/libpng/scripts/makefile.msys diff --git a/vs2015/libpng/scripts/makefile.ne12bsd b/vs/libpng/scripts/makefile.ne12bsd similarity index 100% rename from vs2015/libpng/scripts/makefile.ne12bsd rename to vs/libpng/scripts/makefile.ne12bsd diff --git a/vs2015/libpng/scripts/makefile.netbsd b/vs/libpng/scripts/makefile.netbsd similarity index 100% rename from vs2015/libpng/scripts/makefile.netbsd rename to vs/libpng/scripts/makefile.netbsd diff --git a/vs2015/libpng/scripts/makefile.openbsd b/vs/libpng/scripts/makefile.openbsd similarity index 100% rename from vs2015/libpng/scripts/makefile.openbsd rename to vs/libpng/scripts/makefile.openbsd diff --git a/vs2015/libpng/scripts/makefile.sco b/vs/libpng/scripts/makefile.sco similarity index 100% rename from vs2015/libpng/scripts/makefile.sco rename to vs/libpng/scripts/makefile.sco diff --git a/vs2015/libpng/scripts/makefile.sggcc b/vs/libpng/scripts/makefile.sggcc similarity index 100% rename from vs2015/libpng/scripts/makefile.sggcc rename to vs/libpng/scripts/makefile.sggcc diff --git a/vs2015/libpng/scripts/makefile.sgi b/vs/libpng/scripts/makefile.sgi similarity index 100% rename from vs2015/libpng/scripts/makefile.sgi rename to vs/libpng/scripts/makefile.sgi diff --git a/vs2015/libpng/scripts/makefile.so9 b/vs/libpng/scripts/makefile.so9 similarity index 100% rename from vs2015/libpng/scripts/makefile.so9 rename to vs/libpng/scripts/makefile.so9 diff --git a/vs2015/libpng/scripts/makefile.solaris b/vs/libpng/scripts/makefile.solaris similarity index 100% rename from vs2015/libpng/scripts/makefile.solaris rename to vs/libpng/scripts/makefile.solaris diff --git a/vs2015/libpng/scripts/makefile.solaris-x86 b/vs/libpng/scripts/makefile.solaris-x86 similarity index 100% rename from vs2015/libpng/scripts/makefile.solaris-x86 rename to vs/libpng/scripts/makefile.solaris-x86 diff --git a/vs2015/libpng/scripts/makefile.std b/vs/libpng/scripts/makefile.std similarity index 100% rename from vs2015/libpng/scripts/makefile.std rename to vs/libpng/scripts/makefile.std diff --git a/vs2015/libpng/scripts/makefile.sunos b/vs/libpng/scripts/makefile.sunos similarity index 100% rename from vs2015/libpng/scripts/makefile.sunos rename to vs/libpng/scripts/makefile.sunos diff --git a/vs2015/libpng/scripts/makefile.tc3 b/vs/libpng/scripts/makefile.tc3 similarity index 100% rename from vs2015/libpng/scripts/makefile.tc3 rename to vs/libpng/scripts/makefile.tc3 diff --git a/vs2015/libpng/scripts/makefile.vcwin32 b/vs/libpng/scripts/makefile.vcwin32 similarity index 100% rename from vs2015/libpng/scripts/makefile.vcwin32 rename to vs/libpng/scripts/makefile.vcwin32 diff --git a/vs2015/libpng/scripts/makevms.com b/vs/libpng/scripts/makevms.com similarity index 100% rename from vs2015/libpng/scripts/makevms.com rename to vs/libpng/scripts/makevms.com diff --git a/vs2015/libpng/scripts/options.awk b/vs/libpng/scripts/options.awk similarity index 100% rename from vs2015/libpng/scripts/options.awk rename to vs/libpng/scripts/options.awk diff --git a/vs2015/libpng/scripts/pnglibconf.dfa b/vs/libpng/scripts/pnglibconf.dfa similarity index 100% rename from vs2015/libpng/scripts/pnglibconf.dfa rename to vs/libpng/scripts/pnglibconf.dfa diff --git a/vs2015/libpng/scripts/pnglibconf.h.prebuilt b/vs/libpng/scripts/pnglibconf.h.prebuilt similarity index 100% rename from vs2015/libpng/scripts/pnglibconf.h.prebuilt rename to vs/libpng/scripts/pnglibconf.h.prebuilt diff --git a/vs2015/libpng/scripts/pnglibconf.mak b/vs/libpng/scripts/pnglibconf.mak similarity index 100% rename from vs2015/libpng/scripts/pnglibconf.mak rename to vs/libpng/scripts/pnglibconf.mak diff --git a/vs2015/libpng/scripts/pngwin.rc b/vs/libpng/scripts/pngwin.rc similarity index 100% rename from vs2015/libpng/scripts/pngwin.rc rename to vs/libpng/scripts/pngwin.rc diff --git a/vs2015/libpng/scripts/prefix.c b/vs/libpng/scripts/prefix.c similarity index 100% rename from vs2015/libpng/scripts/prefix.c rename to vs/libpng/scripts/prefix.c diff --git a/vs2015/libpng/scripts/smakefile.ppc b/vs/libpng/scripts/smakefile.ppc similarity index 100% rename from vs2015/libpng/scripts/smakefile.ppc rename to vs/libpng/scripts/smakefile.ppc diff --git a/vs2015/libpng/scripts/sym.c b/vs/libpng/scripts/sym.c similarity index 100% rename from vs2015/libpng/scripts/sym.c rename to vs/libpng/scripts/sym.c diff --git a/vs2015/libpng/scripts/symbols.c b/vs/libpng/scripts/symbols.c similarity index 100% rename from vs2015/libpng/scripts/symbols.c rename to vs/libpng/scripts/symbols.c diff --git a/vs2015/libpng/scripts/symbols.def b/vs/libpng/scripts/symbols.def similarity index 100% rename from vs2015/libpng/scripts/symbols.def rename to vs/libpng/scripts/symbols.def diff --git a/vs2015/libpng/scripts/vers.c b/vs/libpng/scripts/vers.c similarity index 100% rename from vs2015/libpng/scripts/vers.c rename to vs/libpng/scripts/vers.c diff --git a/vs2015/libpng/test-driver b/vs/libpng/test-driver similarity index 100% rename from vs2015/libpng/test-driver rename to vs/libpng/test-driver diff --git a/vs2015/libpng/tests/pngimage-full b/vs/libpng/tests/pngimage-full similarity index 100% rename from vs2015/libpng/tests/pngimage-full rename to vs/libpng/tests/pngimage-full diff --git a/vs2015/libpng/tests/pngimage-quick b/vs/libpng/tests/pngimage-quick similarity index 100% rename from vs2015/libpng/tests/pngimage-quick rename to vs/libpng/tests/pngimage-quick diff --git a/vs2015/libpng/tests/pngstest b/vs/libpng/tests/pngstest similarity index 100% rename from vs2015/libpng/tests/pngstest rename to vs/libpng/tests/pngstest diff --git a/vs2015/libpng/tests/pngstest-1.8 b/vs/libpng/tests/pngstest-1.8 similarity index 100% rename from vs2015/libpng/tests/pngstest-1.8 rename to vs/libpng/tests/pngstest-1.8 diff --git a/vs2015/libpng/tests/pngstest-1.8-alpha b/vs/libpng/tests/pngstest-1.8-alpha similarity index 100% rename from vs2015/libpng/tests/pngstest-1.8-alpha rename to vs/libpng/tests/pngstest-1.8-alpha diff --git a/vs2015/libpng/tests/pngstest-linear b/vs/libpng/tests/pngstest-linear similarity index 100% rename from vs2015/libpng/tests/pngstest-linear rename to vs/libpng/tests/pngstest-linear diff --git a/vs2015/libpng/tests/pngstest-linear-alpha b/vs/libpng/tests/pngstest-linear-alpha similarity index 100% rename from vs2015/libpng/tests/pngstest-linear-alpha rename to vs/libpng/tests/pngstest-linear-alpha diff --git a/vs2015/libpng/tests/pngstest-none b/vs/libpng/tests/pngstest-none similarity index 100% rename from vs2015/libpng/tests/pngstest-none rename to vs/libpng/tests/pngstest-none diff --git a/vs2015/libpng/tests/pngstest-none-alpha b/vs/libpng/tests/pngstest-none-alpha similarity index 100% rename from vs2015/libpng/tests/pngstest-none-alpha rename to vs/libpng/tests/pngstest-none-alpha diff --git a/vs2015/libpng/tests/pngstest-sRGB b/vs/libpng/tests/pngstest-sRGB similarity index 100% rename from vs2015/libpng/tests/pngstest-sRGB rename to vs/libpng/tests/pngstest-sRGB diff --git a/vs2015/libpng/tests/pngstest-sRGB-alpha b/vs/libpng/tests/pngstest-sRGB-alpha similarity index 100% rename from vs2015/libpng/tests/pngstest-sRGB-alpha rename to vs/libpng/tests/pngstest-sRGB-alpha diff --git a/vs2015/libpng/tests/pngtest b/vs/libpng/tests/pngtest similarity index 100% rename from vs2015/libpng/tests/pngtest rename to vs/libpng/tests/pngtest diff --git a/vs2015/libpng/tests/pngtest-badpngs b/vs/libpng/tests/pngtest-badpngs similarity index 100% rename from vs2015/libpng/tests/pngtest-badpngs rename to vs/libpng/tests/pngtest-badpngs diff --git a/vs2015/libpng/tests/pngunknown-IDAT b/vs/libpng/tests/pngunknown-IDAT similarity index 100% rename from vs2015/libpng/tests/pngunknown-IDAT rename to vs/libpng/tests/pngunknown-IDAT diff --git a/vs2015/libpng/tests/pngunknown-discard b/vs/libpng/tests/pngunknown-discard similarity index 100% rename from vs2015/libpng/tests/pngunknown-discard rename to vs/libpng/tests/pngunknown-discard diff --git a/vs2015/libpng/tests/pngunknown-if-safe b/vs/libpng/tests/pngunknown-if-safe similarity index 100% rename from vs2015/libpng/tests/pngunknown-if-safe rename to vs/libpng/tests/pngunknown-if-safe diff --git a/vs2015/libpng/tests/pngunknown-sAPI b/vs/libpng/tests/pngunknown-sAPI similarity index 100% rename from vs2015/libpng/tests/pngunknown-sAPI rename to vs/libpng/tests/pngunknown-sAPI diff --git a/vs2015/libpng/tests/pngunknown-sTER b/vs/libpng/tests/pngunknown-sTER similarity index 100% rename from vs2015/libpng/tests/pngunknown-sTER rename to vs/libpng/tests/pngunknown-sTER diff --git a/vs2015/libpng/tests/pngunknown-save b/vs/libpng/tests/pngunknown-save similarity index 100% rename from vs2015/libpng/tests/pngunknown-save rename to vs/libpng/tests/pngunknown-save diff --git a/vs2015/libpng/tests/pngunknown-vpAg b/vs/libpng/tests/pngunknown-vpAg similarity index 100% rename from vs2015/libpng/tests/pngunknown-vpAg rename to vs/libpng/tests/pngunknown-vpAg diff --git a/vs2015/libpng/tests/pngvalid-gamma-16-to-8 b/vs/libpng/tests/pngvalid-gamma-16-to-8 similarity index 100% rename from vs2015/libpng/tests/pngvalid-gamma-16-to-8 rename to vs/libpng/tests/pngvalid-gamma-16-to-8 diff --git a/vs2015/libpng/tests/pngvalid-gamma-alpha-mode b/vs/libpng/tests/pngvalid-gamma-alpha-mode similarity index 100% rename from vs2015/libpng/tests/pngvalid-gamma-alpha-mode rename to vs/libpng/tests/pngvalid-gamma-alpha-mode diff --git a/vs2015/libpng/tests/pngvalid-gamma-background b/vs/libpng/tests/pngvalid-gamma-background similarity index 100% rename from vs2015/libpng/tests/pngvalid-gamma-background rename to vs/libpng/tests/pngvalid-gamma-background diff --git a/vs2015/libpng/tests/pngvalid-gamma-expand16-alpha-mode b/vs/libpng/tests/pngvalid-gamma-expand16-alpha-mode similarity index 100% rename from vs2015/libpng/tests/pngvalid-gamma-expand16-alpha-mode rename to vs/libpng/tests/pngvalid-gamma-expand16-alpha-mode diff --git a/vs2015/libpng/tests/pngvalid-gamma-expand16-background b/vs/libpng/tests/pngvalid-gamma-expand16-background similarity index 100% rename from vs2015/libpng/tests/pngvalid-gamma-expand16-background rename to vs/libpng/tests/pngvalid-gamma-expand16-background diff --git a/vs2015/libpng/tests/pngvalid-gamma-expand16-transform b/vs/libpng/tests/pngvalid-gamma-expand16-transform similarity index 100% rename from vs2015/libpng/tests/pngvalid-gamma-expand16-transform rename to vs/libpng/tests/pngvalid-gamma-expand16-transform diff --git a/vs2015/libpng/tests/pngvalid-gamma-sbit b/vs/libpng/tests/pngvalid-gamma-sbit similarity index 100% rename from vs2015/libpng/tests/pngvalid-gamma-sbit rename to vs/libpng/tests/pngvalid-gamma-sbit diff --git a/vs2015/libpng/tests/pngvalid-gamma-threshold b/vs/libpng/tests/pngvalid-gamma-threshold similarity index 100% rename from vs2015/libpng/tests/pngvalid-gamma-threshold rename to vs/libpng/tests/pngvalid-gamma-threshold diff --git a/vs2015/libpng/tests/pngvalid-gamma-transform b/vs/libpng/tests/pngvalid-gamma-transform similarity index 100% rename from vs2015/libpng/tests/pngvalid-gamma-transform rename to vs/libpng/tests/pngvalid-gamma-transform diff --git a/vs2015/libpng/tests/pngvalid-progressive-interlace-standard b/vs/libpng/tests/pngvalid-progressive-interlace-standard similarity index 100% rename from vs2015/libpng/tests/pngvalid-progressive-interlace-standard rename to vs/libpng/tests/pngvalid-progressive-interlace-standard diff --git a/vs2015/libpng/tests/pngvalid-progressive-size b/vs/libpng/tests/pngvalid-progressive-size similarity index 100% rename from vs2015/libpng/tests/pngvalid-progressive-size rename to vs/libpng/tests/pngvalid-progressive-size diff --git a/vs2015/libpng/tests/pngvalid-progressive-standard b/vs/libpng/tests/pngvalid-progressive-standard similarity index 100% rename from vs2015/libpng/tests/pngvalid-progressive-standard rename to vs/libpng/tests/pngvalid-progressive-standard diff --git a/vs2015/libpng/tests/pngvalid-standard b/vs/libpng/tests/pngvalid-standard similarity index 100% rename from vs2015/libpng/tests/pngvalid-standard rename to vs/libpng/tests/pngvalid-standard diff --git a/vs2015/libpng/tests/pngvalid-transform b/vs/libpng/tests/pngvalid-transform similarity index 100% rename from vs2015/libpng/tests/pngvalid-transform rename to vs/libpng/tests/pngvalid-transform diff --git a/vs2015/pcap/Packet32.h b/vs/pcap/Packet32.h similarity index 100% rename from vs2015/pcap/Packet32.h rename to vs/pcap/Packet32.h diff --git a/vs2015/pcap/Win32-Extensions.h b/vs/pcap/Win32-Extensions.h similarity index 100% rename from vs2015/pcap/Win32-Extensions.h rename to vs/pcap/Win32-Extensions.h diff --git a/vs2015/pcap/bittypes.h b/vs/pcap/bittypes.h similarity index 100% rename from vs2015/pcap/bittypes.h rename to vs/pcap/bittypes.h diff --git a/vs2015/pcap/ip6_misc.h b/vs/pcap/ip6_misc.h similarity index 100% rename from vs2015/pcap/ip6_misc.h rename to vs/pcap/ip6_misc.h diff --git a/vs2015/pcap/pcap-bpf.h b/vs/pcap/pcap-bpf.h similarity index 100% rename from vs2015/pcap/pcap-bpf.h rename to vs/pcap/pcap-bpf.h diff --git a/vs2015/pcap/pcap-namedb.h b/vs/pcap/pcap-namedb.h similarity index 100% rename from vs2015/pcap/pcap-namedb.h rename to vs/pcap/pcap-namedb.h diff --git a/vs2015/pcap/pcap-stdinc.h b/vs/pcap/pcap-stdinc.h similarity index 100% rename from vs2015/pcap/pcap-stdinc.h rename to vs/pcap/pcap-stdinc.h diff --git a/vs2015/pcap/pcap.h b/vs/pcap/pcap.h similarity index 100% rename from vs2015/pcap/pcap.h rename to vs/pcap/pcap.h diff --git a/vs2015/pcap/pcap/bluetooth.h b/vs/pcap/pcap/bluetooth.h similarity index 100% rename from vs2015/pcap/pcap/bluetooth.h rename to vs/pcap/pcap/bluetooth.h diff --git a/vs2015/pcap/pcap/bpf.h b/vs/pcap/pcap/bpf.h similarity index 100% rename from vs2015/pcap/pcap/bpf.h rename to vs/pcap/pcap/bpf.h diff --git a/vs2015/pcap/pcap/namedb.h b/vs/pcap/pcap/namedb.h similarity index 100% rename from vs2015/pcap/pcap/namedb.h rename to vs/pcap/pcap/namedb.h diff --git a/vs2015/pcap/pcap/pcap.h b/vs/pcap/pcap/pcap.h similarity index 100% rename from vs2015/pcap/pcap/pcap.h rename to vs/pcap/pcap/pcap.h diff --git a/vs2015/pcap/pcap/sll.h b/vs/pcap/pcap/sll.h similarity index 100% rename from vs2015/pcap/pcap/sll.h rename to vs/pcap/pcap/sll.h diff --git a/vs2015/pcap/pcap/usb.h b/vs/pcap/pcap/usb.h similarity index 100% rename from vs2015/pcap/pcap/usb.h rename to vs/pcap/pcap/usb.h diff --git a/vs2015/pcap/pcap/vlan.h b/vs/pcap/pcap/vlan.h similarity index 100% rename from vs2015/pcap/pcap/vlan.h rename to vs/pcap/pcap/vlan.h diff --git a/vs2015/pcap/remote-ext.h b/vs/pcap/remote-ext.h similarity index 100% rename from vs2015/pcap/remote-ext.h rename to vs/pcap/remote-ext.h diff --git a/vs2015/pehdr-lite/SOURCE.TXT b/vs/pehdr-lite/SOURCE.TXT similarity index 100% rename from vs2015/pehdr-lite/SOURCE.TXT rename to vs/pehdr-lite/SOURCE.TXT diff --git a/vs2015/pehdr-lite/pehdr-lite.c b/vs/pehdr-lite/pehdr-lite.c similarity index 100% rename from vs2015/pehdr-lite/pehdr-lite.c rename to vs/pehdr-lite/pehdr-lite.c diff --git a/vs2015/pehdr-lite/pehdrlite.vcxproj b/vs/pehdr-lite/pehdrlite.vcxproj similarity index 100% rename from vs2015/pehdr-lite/pehdrlite.vcxproj rename to vs/pehdr-lite/pehdrlite.vcxproj diff --git a/vs2015/sdl/BUGS b/vs/sdl/BUGS similarity index 100% rename from vs2015/sdl/BUGS rename to vs/sdl/BUGS diff --git a/vs2015/sdl/COPYING b/vs/sdl/COPYING similarity index 100% rename from vs2015/sdl/COPYING rename to vs/sdl/COPYING diff --git a/vs2015/sdl/CREDITS b/vs/sdl/CREDITS similarity index 100% rename from vs2015/sdl/CREDITS rename to vs/sdl/CREDITS diff --git a/vs2015/sdl/CWprojects.sea.bin b/vs/sdl/CWprojects.sea.bin similarity index 100% rename from vs2015/sdl/CWprojects.sea.bin rename to vs/sdl/CWprojects.sea.bin diff --git a/vs2015/sdl/INSTALL b/vs/sdl/INSTALL similarity index 100% rename from vs2015/sdl/INSTALL rename to vs/sdl/INSTALL diff --git a/vs2015/sdl/MPWmake.sea.bin b/vs/sdl/MPWmake.sea.bin similarity index 100% rename from vs2015/sdl/MPWmake.sea.bin rename to vs/sdl/MPWmake.sea.bin diff --git a/vs2015/sdl/Makefile.dc b/vs/sdl/Makefile.dc similarity index 100% rename from vs2015/sdl/Makefile.dc rename to vs/sdl/Makefile.dc diff --git a/vs2015/sdl/Makefile.in b/vs/sdl/Makefile.in similarity index 100% rename from vs2015/sdl/Makefile.in rename to vs/sdl/Makefile.in diff --git a/vs2015/sdl/Makefile.minimal b/vs/sdl/Makefile.minimal similarity index 100% rename from vs2015/sdl/Makefile.minimal rename to vs/sdl/Makefile.minimal diff --git a/vs2015/sdl/README b/vs/sdl/README similarity index 100% rename from vs2015/sdl/README rename to vs/sdl/README diff --git a/vs2015/sdl/README-SDL.txt b/vs/sdl/README-SDL.txt similarity index 100% rename from vs2015/sdl/README-SDL.txt rename to vs/sdl/README-SDL.txt diff --git a/vs2015/sdl/README.AmigaOS b/vs/sdl/README.AmigaOS similarity index 100% rename from vs2015/sdl/README.AmigaOS rename to vs/sdl/README.AmigaOS diff --git a/vs2015/sdl/README.BeOS b/vs/sdl/README.BeOS similarity index 100% rename from vs2015/sdl/README.BeOS rename to vs/sdl/README.BeOS diff --git a/vs2015/sdl/README.DC b/vs/sdl/README.DC similarity index 100% rename from vs2015/sdl/README.DC rename to vs/sdl/README.DC diff --git a/vs2015/sdl/README.HG b/vs/sdl/README.HG similarity index 100% rename from vs2015/sdl/README.HG rename to vs/sdl/README.HG diff --git a/vs2015/sdl/README.MacOS b/vs/sdl/README.MacOS similarity index 100% rename from vs2015/sdl/README.MacOS rename to vs/sdl/README.MacOS diff --git a/vs2015/sdl/README.MacOSX b/vs/sdl/README.MacOSX similarity index 100% rename from vs2015/sdl/README.MacOSX rename to vs/sdl/README.MacOSX diff --git a/vs2015/sdl/README.MiNT b/vs/sdl/README.MiNT similarity index 100% rename from vs2015/sdl/README.MiNT rename to vs/sdl/README.MiNT diff --git a/vs2015/sdl/README.NDS b/vs/sdl/README.NDS similarity index 100% rename from vs2015/sdl/README.NDS rename to vs/sdl/README.NDS diff --git a/vs2015/sdl/README.NanoX b/vs/sdl/README.NanoX similarity index 100% rename from vs2015/sdl/README.NanoX rename to vs/sdl/README.NanoX diff --git a/vs2015/sdl/README.OS2 b/vs/sdl/README.OS2 similarity index 100% rename from vs2015/sdl/README.OS2 rename to vs/sdl/README.OS2 diff --git a/vs2015/sdl/README.PS3 b/vs/sdl/README.PS3 similarity index 100% rename from vs2015/sdl/README.PS3 rename to vs/sdl/README.PS3 diff --git a/vs2015/sdl/README.PicoGUI b/vs/sdl/README.PicoGUI similarity index 100% rename from vs2015/sdl/README.PicoGUI rename to vs/sdl/README.PicoGUI diff --git a/vs2015/sdl/README.Porting b/vs/sdl/README.Porting similarity index 100% rename from vs2015/sdl/README.Porting rename to vs/sdl/README.Porting diff --git a/vs2015/sdl/README.QNX b/vs/sdl/README.QNX similarity index 100% rename from vs2015/sdl/README.QNX rename to vs/sdl/README.QNX diff --git a/vs2015/sdl/README.Qtopia b/vs/sdl/README.Qtopia similarity index 100% rename from vs2015/sdl/README.Qtopia rename to vs/sdl/README.Qtopia diff --git a/vs2015/sdl/README.RISCOS b/vs/sdl/README.RISCOS similarity index 100% rename from vs2015/sdl/README.RISCOS rename to vs/sdl/README.RISCOS diff --git a/vs2015/sdl/README.Symbian b/vs/sdl/README.Symbian similarity index 100% rename from vs2015/sdl/README.Symbian rename to vs/sdl/README.Symbian diff --git a/vs2015/sdl/README.Watcom b/vs/sdl/README.Watcom similarity index 100% rename from vs2015/sdl/README.Watcom rename to vs/sdl/README.Watcom diff --git a/vs2015/sdl/README.WinCE b/vs/sdl/README.WinCE similarity index 100% rename from vs2015/sdl/README.WinCE rename to vs/sdl/README.WinCE diff --git a/vs2015/sdl/README.wscons b/vs/sdl/README.wscons similarity index 100% rename from vs2015/sdl/README.wscons rename to vs/sdl/README.wscons diff --git a/vs2015/sdl/SDL.qpg.in b/vs/sdl/SDL.qpg.in similarity index 100% rename from vs2015/sdl/SDL.qpg.in rename to vs/sdl/SDL.qpg.in diff --git a/vs2015/sdl/SDL.spec b/vs/sdl/SDL.spec similarity index 100% rename from vs2015/sdl/SDL.spec rename to vs/sdl/SDL.spec diff --git a/vs2015/sdl/SDL.spec.in b/vs/sdl/SDL.spec.in similarity index 100% rename from vs2015/sdl/SDL.spec.in rename to vs/sdl/SDL.spec.in diff --git a/vs2015/sdl/TODO b/vs/sdl/TODO similarity index 100% rename from vs2015/sdl/TODO rename to vs/sdl/TODO diff --git a/vs2015/sdl/VisualC/SDL.dsw b/vs/sdl/VisualC/SDL.dsw similarity index 100% rename from vs2015/sdl/VisualC/SDL.dsw rename to vs/sdl/VisualC/SDL.dsw diff --git a/vs2015/sdl/VisualC/SDL.sln b/vs/sdl/VisualC/SDL.sln similarity index 100% rename from vs2015/sdl/VisualC/SDL.sln rename to vs/sdl/VisualC/SDL.sln diff --git a/vs2015/sdl/VisualC/SDL.suo b/vs/sdl/VisualC/SDL.suo similarity index 100% rename from vs2015/sdl/VisualC/SDL.suo rename to vs/sdl/VisualC/SDL.suo diff --git a/vs2015/sdl/VisualC/SDL/SDL.dsp b/vs/sdl/VisualC/SDL/SDL.dsp similarity index 100% rename from vs2015/sdl/VisualC/SDL/SDL.dsp rename to vs/sdl/VisualC/SDL/SDL.dsp diff --git a/vs2015/sdl/VisualC/SDL/SDL.vcproj b/vs/sdl/VisualC/SDL/SDL.vcproj similarity index 100% rename from vs2015/sdl/VisualC/SDL/SDL.vcproj rename to vs/sdl/VisualC/SDL/SDL.vcproj diff --git a/vs2015/sdl/VisualC/SDL/SDL.vcxproj b/vs/sdl/VisualC/SDL/SDL.vcxproj similarity index 100% rename from vs2015/sdl/VisualC/SDL/SDL.vcxproj rename to vs/sdl/VisualC/SDL/SDL.vcxproj diff --git a/vs2015/sdl/VisualC/SDL/Version.rc b/vs/sdl/VisualC/SDL/Version.rc similarity index 100% rename from vs2015/sdl/VisualC/SDL/Version.rc rename to vs/sdl/VisualC/SDL/Version.rc diff --git a/vs2015/sdl/VisualC/SDL/resource.h b/vs/sdl/VisualC/SDL/resource.h similarity index 100% rename from vs2015/sdl/VisualC/SDL/resource.h rename to vs/sdl/VisualC/SDL/resource.h diff --git a/vs2015/sdl/VisualC/SDLmain/SDLmain.dsp b/vs/sdl/VisualC/SDLmain/SDLmain.dsp similarity index 100% rename from vs2015/sdl/VisualC/SDLmain/SDLmain.dsp rename to vs/sdl/VisualC/SDLmain/SDLmain.dsp diff --git a/vs2015/sdl/VisualC/SDLmain/SDLmain.vcproj b/vs/sdl/VisualC/SDLmain/SDLmain.vcproj similarity index 100% rename from vs2015/sdl/VisualC/SDLmain/SDLmain.vcproj rename to vs/sdl/VisualC/SDLmain/SDLmain.vcproj diff --git a/vs2015/sdl/VisualC/SDLmain/SDLmain.vcxproj b/vs/sdl/VisualC/SDLmain/SDLmain.vcxproj similarity index 100% rename from vs2015/sdl/VisualC/SDLmain/SDLmain.vcxproj rename to vs/sdl/VisualC/SDLmain/SDLmain.vcxproj diff --git a/vs2015/sdl/WhatsNew b/vs/sdl/WhatsNew similarity index 100% rename from vs2015/sdl/WhatsNew rename to vs/sdl/WhatsNew diff --git a/vs2015/sdl/autogen.sh b/vs/sdl/autogen.sh similarity index 100% rename from vs2015/sdl/autogen.sh rename to vs/sdl/autogen.sh diff --git a/vs2015/sdl/build-dosbox.sh b/vs/sdl/build-dosbox.sh similarity index 100% rename from vs2015/sdl/build-dosbox.sh rename to vs/sdl/build-dosbox.sh diff --git a/vs2015/sdl/build-scripts/config.guess b/vs/sdl/build-scripts/config.guess similarity index 100% rename from vs2015/sdl/build-scripts/config.guess rename to vs/sdl/build-scripts/config.guess diff --git a/vs2015/sdl/build-scripts/config.sub b/vs/sdl/build-scripts/config.sub similarity index 100% rename from vs2015/sdl/build-scripts/config.sub rename to vs/sdl/build-scripts/config.sub diff --git a/vs2015/sdl/build-scripts/fatbuild.sh b/vs/sdl/build-scripts/fatbuild.sh similarity index 100% rename from vs2015/sdl/build-scripts/fatbuild.sh rename to vs/sdl/build-scripts/fatbuild.sh diff --git a/vs2015/sdl/build-scripts/install-sh b/vs/sdl/build-scripts/install-sh similarity index 100% rename from vs2015/sdl/build-scripts/install-sh rename to vs/sdl/build-scripts/install-sh diff --git a/vs2015/sdl/build-scripts/ltmain.sh b/vs/sdl/build-scripts/ltmain.sh similarity index 100% rename from vs2015/sdl/build-scripts/ltmain.sh rename to vs/sdl/build-scripts/ltmain.sh diff --git a/vs2015/sdl/build-scripts/makedep.sh b/vs/sdl/build-scripts/makedep.sh similarity index 100% rename from vs2015/sdl/build-scripts/makedep.sh rename to vs/sdl/build-scripts/makedep.sh diff --git a/vs2015/sdl/build-scripts/mkinstalldirs b/vs/sdl/build-scripts/mkinstalldirs similarity index 100% rename from vs2015/sdl/build-scripts/mkinstalldirs rename to vs/sdl/build-scripts/mkinstalldirs diff --git a/vs2015/sdl/build-scripts/strip_fPIC.sh b/vs/sdl/build-scripts/strip_fPIC.sh similarity index 100% rename from vs2015/sdl/build-scripts/strip_fPIC.sh rename to vs/sdl/build-scripts/strip_fPIC.sh diff --git a/vs2015/sdl/configure b/vs/sdl/configure similarity index 100% rename from vs2015/sdl/configure rename to vs/sdl/configure diff --git a/vs2015/sdl/configure.ac b/vs/sdl/configure.ac similarity index 100% rename from vs2015/sdl/configure.ac rename to vs/sdl/configure.ac diff --git a/vs2015/sdl/docs.html b/vs/sdl/docs.html similarity index 100% rename from vs2015/sdl/docs.html rename to vs/sdl/docs.html diff --git a/vs2015/sdl/docs/man3/dummy.3 b/vs/sdl/docs/man3/dummy.3 similarity index 100% rename from vs2015/sdl/docs/man3/dummy.3 rename to vs/sdl/docs/man3/dummy.3 diff --git a/vs2015/sdl/include/SDL.h b/vs/sdl/include/SDL.h similarity index 100% rename from vs2015/sdl/include/SDL.h rename to vs/sdl/include/SDL.h diff --git a/vs2015/sdl/include/SDL_active.h b/vs/sdl/include/SDL_active.h similarity index 100% rename from vs2015/sdl/include/SDL_active.h rename to vs/sdl/include/SDL_active.h diff --git a/vs2015/sdl/include/SDL_audio.h b/vs/sdl/include/SDL_audio.h similarity index 100% rename from vs2015/sdl/include/SDL_audio.h rename to vs/sdl/include/SDL_audio.h diff --git a/vs2015/sdl/include/SDL_byteorder.h b/vs/sdl/include/SDL_byteorder.h similarity index 100% rename from vs2015/sdl/include/SDL_byteorder.h rename to vs/sdl/include/SDL_byteorder.h diff --git a/vs2015/sdl/include/SDL_cdrom.h b/vs/sdl/include/SDL_cdrom.h similarity index 100% rename from vs2015/sdl/include/SDL_cdrom.h rename to vs/sdl/include/SDL_cdrom.h diff --git a/vs2015/sdl/include/SDL_config.h b/vs/sdl/include/SDL_config.h similarity index 100% rename from vs2015/sdl/include/SDL_config.h rename to vs/sdl/include/SDL_config.h diff --git a/vs2015/sdl/include/SDL_config.h.default b/vs/sdl/include/SDL_config.h.default similarity index 100% rename from vs2015/sdl/include/SDL_config.h.default rename to vs/sdl/include/SDL_config.h.default diff --git a/vs2015/sdl/include/SDL_config.h.in b/vs/sdl/include/SDL_config.h.in similarity index 100% rename from vs2015/sdl/include/SDL_config.h.in rename to vs/sdl/include/SDL_config.h.in diff --git a/vs2015/sdl/include/SDL_config_dreamcast.h b/vs/sdl/include/SDL_config_dreamcast.h similarity index 100% rename from vs2015/sdl/include/SDL_config_dreamcast.h rename to vs/sdl/include/SDL_config_dreamcast.h diff --git a/vs2015/sdl/include/SDL_config_macos.h b/vs/sdl/include/SDL_config_macos.h similarity index 100% rename from vs2015/sdl/include/SDL_config_macos.h rename to vs/sdl/include/SDL_config_macos.h diff --git a/vs2015/sdl/include/SDL_config_macosx.h b/vs/sdl/include/SDL_config_macosx.h similarity index 100% rename from vs2015/sdl/include/SDL_config_macosx.h rename to vs/sdl/include/SDL_config_macosx.h diff --git a/vs2015/sdl/include/SDL_config_minimal.h b/vs/sdl/include/SDL_config_minimal.h similarity index 100% rename from vs2015/sdl/include/SDL_config_minimal.h rename to vs/sdl/include/SDL_config_minimal.h diff --git a/vs2015/sdl/include/SDL_config_nds.h b/vs/sdl/include/SDL_config_nds.h similarity index 100% rename from vs2015/sdl/include/SDL_config_nds.h rename to vs/sdl/include/SDL_config_nds.h diff --git a/vs2015/sdl/include/SDL_config_os2.h b/vs/sdl/include/SDL_config_os2.h similarity index 100% rename from vs2015/sdl/include/SDL_config_os2.h rename to vs/sdl/include/SDL_config_os2.h diff --git a/vs2015/sdl/include/SDL_config_symbian.h b/vs/sdl/include/SDL_config_symbian.h similarity index 100% rename from vs2015/sdl/include/SDL_config_symbian.h rename to vs/sdl/include/SDL_config_symbian.h diff --git a/vs2015/sdl/include/SDL_config_win32.h b/vs/sdl/include/SDL_config_win32.h similarity index 100% rename from vs2015/sdl/include/SDL_config_win32.h rename to vs/sdl/include/SDL_config_win32.h diff --git a/vs2015/sdl/include/SDL_copying.h b/vs/sdl/include/SDL_copying.h similarity index 100% rename from vs2015/sdl/include/SDL_copying.h rename to vs/sdl/include/SDL_copying.h diff --git a/vs2015/sdl/include/SDL_cpuinfo.h b/vs/sdl/include/SDL_cpuinfo.h similarity index 100% rename from vs2015/sdl/include/SDL_cpuinfo.h rename to vs/sdl/include/SDL_cpuinfo.h diff --git a/vs2015/sdl/include/SDL_endian.h b/vs/sdl/include/SDL_endian.h similarity index 100% rename from vs2015/sdl/include/SDL_endian.h rename to vs/sdl/include/SDL_endian.h diff --git a/vs2015/sdl/include/SDL_error.h b/vs/sdl/include/SDL_error.h similarity index 100% rename from vs2015/sdl/include/SDL_error.h rename to vs/sdl/include/SDL_error.h diff --git a/vs2015/sdl/include/SDL_events.h b/vs/sdl/include/SDL_events.h similarity index 100% rename from vs2015/sdl/include/SDL_events.h rename to vs/sdl/include/SDL_events.h diff --git a/vs2015/sdl/include/SDL_getenv.h b/vs/sdl/include/SDL_getenv.h similarity index 100% rename from vs2015/sdl/include/SDL_getenv.h rename to vs/sdl/include/SDL_getenv.h diff --git a/vs2015/sdl/include/SDL_joystick.h b/vs/sdl/include/SDL_joystick.h similarity index 100% rename from vs2015/sdl/include/SDL_joystick.h rename to vs/sdl/include/SDL_joystick.h diff --git a/vs2015/sdl/include/SDL_keyboard.h b/vs/sdl/include/SDL_keyboard.h similarity index 100% rename from vs2015/sdl/include/SDL_keyboard.h rename to vs/sdl/include/SDL_keyboard.h diff --git a/vs2015/sdl/include/SDL_keysym.h b/vs/sdl/include/SDL_keysym.h similarity index 100% rename from vs2015/sdl/include/SDL_keysym.h rename to vs/sdl/include/SDL_keysym.h diff --git a/vs2015/sdl/include/SDL_loadso.h b/vs/sdl/include/SDL_loadso.h similarity index 100% rename from vs2015/sdl/include/SDL_loadso.h rename to vs/sdl/include/SDL_loadso.h diff --git a/vs2015/sdl/include/SDL_main.h b/vs/sdl/include/SDL_main.h similarity index 100% rename from vs2015/sdl/include/SDL_main.h rename to vs/sdl/include/SDL_main.h diff --git a/vs2015/sdl/include/SDL_mouse.h b/vs/sdl/include/SDL_mouse.h similarity index 100% rename from vs2015/sdl/include/SDL_mouse.h rename to vs/sdl/include/SDL_mouse.h diff --git a/vs2015/sdl/include/SDL_mutex.h b/vs/sdl/include/SDL_mutex.h similarity index 100% rename from vs2015/sdl/include/SDL_mutex.h rename to vs/sdl/include/SDL_mutex.h diff --git a/vs2015/sdl/include/SDL_name.h b/vs/sdl/include/SDL_name.h similarity index 100% rename from vs2015/sdl/include/SDL_name.h rename to vs/sdl/include/SDL_name.h diff --git a/vs2015/sdl/include/SDL_opengl.h b/vs/sdl/include/SDL_opengl.h similarity index 100% rename from vs2015/sdl/include/SDL_opengl.h rename to vs/sdl/include/SDL_opengl.h diff --git a/vs2015/sdl/include/SDL_platform.h b/vs/sdl/include/SDL_platform.h similarity index 100% rename from vs2015/sdl/include/SDL_platform.h rename to vs/sdl/include/SDL_platform.h diff --git a/vs2015/sdl/include/SDL_quit.h b/vs/sdl/include/SDL_quit.h similarity index 100% rename from vs2015/sdl/include/SDL_quit.h rename to vs/sdl/include/SDL_quit.h diff --git a/vs2015/sdl/include/SDL_rwops.h b/vs/sdl/include/SDL_rwops.h similarity index 100% rename from vs2015/sdl/include/SDL_rwops.h rename to vs/sdl/include/SDL_rwops.h diff --git a/vs2015/sdl/include/SDL_stdinc.h b/vs/sdl/include/SDL_stdinc.h similarity index 100% rename from vs2015/sdl/include/SDL_stdinc.h rename to vs/sdl/include/SDL_stdinc.h diff --git a/vs2015/sdl/include/SDL_syswm.h b/vs/sdl/include/SDL_syswm.h similarity index 100% rename from vs2015/sdl/include/SDL_syswm.h rename to vs/sdl/include/SDL_syswm.h diff --git a/vs2015/sdl/include/SDL_thread.h b/vs/sdl/include/SDL_thread.h similarity index 100% rename from vs2015/sdl/include/SDL_thread.h rename to vs/sdl/include/SDL_thread.h diff --git a/vs2015/sdl/include/SDL_timer.h b/vs/sdl/include/SDL_timer.h similarity index 100% rename from vs2015/sdl/include/SDL_timer.h rename to vs/sdl/include/SDL_timer.h diff --git a/vs2015/sdl/include/SDL_types.h b/vs/sdl/include/SDL_types.h similarity index 100% rename from vs2015/sdl/include/SDL_types.h rename to vs/sdl/include/SDL_types.h diff --git a/vs2015/sdl/include/SDL_version.h b/vs/sdl/include/SDL_version.h similarity index 100% rename from vs2015/sdl/include/SDL_version.h rename to vs/sdl/include/SDL_version.h diff --git a/vs2015/sdl/include/SDL_video.h b/vs/sdl/include/SDL_video.h similarity index 100% rename from vs2015/sdl/include/SDL_video.h rename to vs/sdl/include/SDL_video.h diff --git a/vs2015/sdl/include/begin_code.h b/vs/sdl/include/begin_code.h similarity index 100% rename from vs2015/sdl/include/begin_code.h rename to vs/sdl/include/begin_code.h diff --git a/vs2015/sdl/include/close_code.h b/vs/sdl/include/close_code.h similarity index 100% rename from vs2015/sdl/include/close_code.h rename to vs/sdl/include/close_code.h diff --git a/vs2015/sdl/include/doxyfile b/vs/sdl/include/doxyfile similarity index 100% rename from vs2015/sdl/include/doxyfile rename to vs/sdl/include/doxyfile diff --git a/vs2015/sdl/sdl-config.in b/vs/sdl/sdl-config.in similarity index 100% rename from vs2015/sdl/sdl-config.in rename to vs/sdl/sdl-config.in diff --git a/vs2015/sdl/sdl.m4 b/vs/sdl/sdl.m4 similarity index 100% rename from vs2015/sdl/sdl.m4 rename to vs/sdl/sdl.m4 diff --git a/vs2015/sdl/sdl.pc.in b/vs/sdl/sdl.pc.in similarity index 100% rename from vs2015/sdl/sdl.pc.in rename to vs/sdl/sdl.pc.in diff --git a/vs2015/sdl/src/SDL.c b/vs/sdl/src/SDL.c similarity index 100% rename from vs2015/sdl/src/SDL.c rename to vs/sdl/src/SDL.c diff --git a/vs2015/sdl/src/SDL_error.c b/vs/sdl/src/SDL_error.c similarity index 100% rename from vs2015/sdl/src/SDL_error.c rename to vs/sdl/src/SDL_error.c diff --git a/vs2015/sdl/src/SDL_error_c.h b/vs/sdl/src/SDL_error_c.h similarity index 100% rename from vs2015/sdl/src/SDL_error_c.h rename to vs/sdl/src/SDL_error_c.h diff --git a/vs2015/sdl/src/SDL_fatal.c b/vs/sdl/src/SDL_fatal.c similarity index 100% rename from vs2015/sdl/src/SDL_fatal.c rename to vs/sdl/src/SDL_fatal.c diff --git a/vs2015/sdl/src/SDL_fatal.h b/vs/sdl/src/SDL_fatal.h similarity index 100% rename from vs2015/sdl/src/SDL_fatal.h rename to vs/sdl/src/SDL_fatal.h diff --git a/vs2015/sdl/src/audio/SDL_audio.c b/vs/sdl/src/audio/SDL_audio.c similarity index 100% rename from vs2015/sdl/src/audio/SDL_audio.c rename to vs/sdl/src/audio/SDL_audio.c diff --git a/vs2015/sdl/src/audio/SDL_audio_c.h b/vs/sdl/src/audio/SDL_audio_c.h similarity index 100% rename from vs2015/sdl/src/audio/SDL_audio_c.h rename to vs/sdl/src/audio/SDL_audio_c.h diff --git a/vs2015/sdl/src/audio/SDL_audiocvt.c b/vs/sdl/src/audio/SDL_audiocvt.c similarity index 100% rename from vs2015/sdl/src/audio/SDL_audiocvt.c rename to vs/sdl/src/audio/SDL_audiocvt.c diff --git a/vs2015/sdl/src/audio/SDL_audiodev.c b/vs/sdl/src/audio/SDL_audiodev.c similarity index 100% rename from vs2015/sdl/src/audio/SDL_audiodev.c rename to vs/sdl/src/audio/SDL_audiodev.c diff --git a/vs2015/sdl/src/audio/SDL_audiodev_c.h b/vs/sdl/src/audio/SDL_audiodev_c.h similarity index 100% rename from vs2015/sdl/src/audio/SDL_audiodev_c.h rename to vs/sdl/src/audio/SDL_audiodev_c.h diff --git a/vs2015/sdl/src/audio/SDL_audiomem.h b/vs/sdl/src/audio/SDL_audiomem.h similarity index 100% rename from vs2015/sdl/src/audio/SDL_audiomem.h rename to vs/sdl/src/audio/SDL_audiomem.h diff --git a/vs2015/sdl/src/audio/SDL_mixer.c b/vs/sdl/src/audio/SDL_mixer.c similarity index 100% rename from vs2015/sdl/src/audio/SDL_mixer.c rename to vs/sdl/src/audio/SDL_mixer.c diff --git a/vs2015/sdl/src/audio/SDL_mixer_MMX.c b/vs/sdl/src/audio/SDL_mixer_MMX.c similarity index 100% rename from vs2015/sdl/src/audio/SDL_mixer_MMX.c rename to vs/sdl/src/audio/SDL_mixer_MMX.c diff --git a/vs2015/sdl/src/audio/SDL_mixer_MMX.h b/vs/sdl/src/audio/SDL_mixer_MMX.h similarity index 100% rename from vs2015/sdl/src/audio/SDL_mixer_MMX.h rename to vs/sdl/src/audio/SDL_mixer_MMX.h diff --git a/vs2015/sdl/src/audio/SDL_mixer_MMX_VC.c b/vs/sdl/src/audio/SDL_mixer_MMX_VC.c similarity index 100% rename from vs2015/sdl/src/audio/SDL_mixer_MMX_VC.c rename to vs/sdl/src/audio/SDL_mixer_MMX_VC.c diff --git a/vs2015/sdl/src/audio/SDL_mixer_MMX_VC.h b/vs/sdl/src/audio/SDL_mixer_MMX_VC.h similarity index 100% rename from vs2015/sdl/src/audio/SDL_mixer_MMX_VC.h rename to vs/sdl/src/audio/SDL_mixer_MMX_VC.h diff --git a/vs2015/sdl/src/audio/SDL_mixer_m68k.c b/vs/sdl/src/audio/SDL_mixer_m68k.c similarity index 100% rename from vs2015/sdl/src/audio/SDL_mixer_m68k.c rename to vs/sdl/src/audio/SDL_mixer_m68k.c diff --git a/vs2015/sdl/src/audio/SDL_mixer_m68k.h b/vs/sdl/src/audio/SDL_mixer_m68k.h similarity index 100% rename from vs2015/sdl/src/audio/SDL_mixer_m68k.h rename to vs/sdl/src/audio/SDL_mixer_m68k.h diff --git a/vs2015/sdl/src/audio/SDL_sysaudio.h b/vs/sdl/src/audio/SDL_sysaudio.h similarity index 100% rename from vs2015/sdl/src/audio/SDL_sysaudio.h rename to vs/sdl/src/audio/SDL_sysaudio.h diff --git a/vs2015/sdl/src/audio/SDL_wave.c b/vs/sdl/src/audio/SDL_wave.c similarity index 100% rename from vs2015/sdl/src/audio/SDL_wave.c rename to vs/sdl/src/audio/SDL_wave.c diff --git a/vs2015/sdl/src/audio/SDL_wave.h b/vs/sdl/src/audio/SDL_wave.h similarity index 100% rename from vs2015/sdl/src/audio/SDL_wave.h rename to vs/sdl/src/audio/SDL_wave.h diff --git a/vs2015/sdl/src/audio/alsa/SDL_alsa_audio.c b/vs/sdl/src/audio/alsa/SDL_alsa_audio.c similarity index 100% rename from vs2015/sdl/src/audio/alsa/SDL_alsa_audio.c rename to vs/sdl/src/audio/alsa/SDL_alsa_audio.c diff --git a/vs2015/sdl/src/audio/alsa/SDL_alsa_audio.h b/vs/sdl/src/audio/alsa/SDL_alsa_audio.h similarity index 100% rename from vs2015/sdl/src/audio/alsa/SDL_alsa_audio.h rename to vs/sdl/src/audio/alsa/SDL_alsa_audio.h diff --git a/vs2015/sdl/src/audio/arts/SDL_artsaudio.c b/vs/sdl/src/audio/arts/SDL_artsaudio.c similarity index 100% rename from vs2015/sdl/src/audio/arts/SDL_artsaudio.c rename to vs/sdl/src/audio/arts/SDL_artsaudio.c diff --git a/vs2015/sdl/src/audio/arts/SDL_artsaudio.h b/vs/sdl/src/audio/arts/SDL_artsaudio.h similarity index 100% rename from vs2015/sdl/src/audio/arts/SDL_artsaudio.h rename to vs/sdl/src/audio/arts/SDL_artsaudio.h diff --git a/vs2015/sdl/src/audio/baudio/SDL_beaudio.cc b/vs/sdl/src/audio/baudio/SDL_beaudio.cc similarity index 100% rename from vs2015/sdl/src/audio/baudio/SDL_beaudio.cc rename to vs/sdl/src/audio/baudio/SDL_beaudio.cc diff --git a/vs2015/sdl/src/audio/baudio/SDL_beaudio.h b/vs/sdl/src/audio/baudio/SDL_beaudio.h similarity index 100% rename from vs2015/sdl/src/audio/baudio/SDL_beaudio.h rename to vs/sdl/src/audio/baudio/SDL_beaudio.h diff --git a/vs2015/sdl/src/audio/bsd/SDL_bsdaudio.c b/vs/sdl/src/audio/bsd/SDL_bsdaudio.c similarity index 100% rename from vs2015/sdl/src/audio/bsd/SDL_bsdaudio.c rename to vs/sdl/src/audio/bsd/SDL_bsdaudio.c diff --git a/vs2015/sdl/src/audio/bsd/SDL_bsdaudio.h b/vs/sdl/src/audio/bsd/SDL_bsdaudio.h similarity index 100% rename from vs2015/sdl/src/audio/bsd/SDL_bsdaudio.h rename to vs/sdl/src/audio/bsd/SDL_bsdaudio.h diff --git a/vs2015/sdl/src/audio/dart/SDL_dart.c b/vs/sdl/src/audio/dart/SDL_dart.c similarity index 100% rename from vs2015/sdl/src/audio/dart/SDL_dart.c rename to vs/sdl/src/audio/dart/SDL_dart.c diff --git a/vs2015/sdl/src/audio/dart/SDL_dart.h b/vs/sdl/src/audio/dart/SDL_dart.h similarity index 100% rename from vs2015/sdl/src/audio/dart/SDL_dart.h rename to vs/sdl/src/audio/dart/SDL_dart.h diff --git a/vs2015/sdl/src/audio/dc/SDL_dcaudio.c b/vs/sdl/src/audio/dc/SDL_dcaudio.c similarity index 100% rename from vs2015/sdl/src/audio/dc/SDL_dcaudio.c rename to vs/sdl/src/audio/dc/SDL_dcaudio.c diff --git a/vs2015/sdl/src/audio/dc/SDL_dcaudio.h b/vs/sdl/src/audio/dc/SDL_dcaudio.h similarity index 100% rename from vs2015/sdl/src/audio/dc/SDL_dcaudio.h rename to vs/sdl/src/audio/dc/SDL_dcaudio.h diff --git a/vs2015/sdl/src/audio/dc/aica.c b/vs/sdl/src/audio/dc/aica.c similarity index 100% rename from vs2015/sdl/src/audio/dc/aica.c rename to vs/sdl/src/audio/dc/aica.c diff --git a/vs2015/sdl/src/audio/dc/aica.h b/vs/sdl/src/audio/dc/aica.h similarity index 100% rename from vs2015/sdl/src/audio/dc/aica.h rename to vs/sdl/src/audio/dc/aica.h diff --git a/vs2015/sdl/src/audio/disk/SDL_diskaudio.c b/vs/sdl/src/audio/disk/SDL_diskaudio.c similarity index 100% rename from vs2015/sdl/src/audio/disk/SDL_diskaudio.c rename to vs/sdl/src/audio/disk/SDL_diskaudio.c diff --git a/vs2015/sdl/src/audio/disk/SDL_diskaudio.h b/vs/sdl/src/audio/disk/SDL_diskaudio.h similarity index 100% rename from vs2015/sdl/src/audio/disk/SDL_diskaudio.h rename to vs/sdl/src/audio/disk/SDL_diskaudio.h diff --git a/vs2015/sdl/src/audio/dma/SDL_dmaaudio.c b/vs/sdl/src/audio/dma/SDL_dmaaudio.c similarity index 100% rename from vs2015/sdl/src/audio/dma/SDL_dmaaudio.c rename to vs/sdl/src/audio/dma/SDL_dmaaudio.c diff --git a/vs2015/sdl/src/audio/dma/SDL_dmaaudio.h b/vs/sdl/src/audio/dma/SDL_dmaaudio.h similarity index 100% rename from vs2015/sdl/src/audio/dma/SDL_dmaaudio.h rename to vs/sdl/src/audio/dma/SDL_dmaaudio.h diff --git a/vs2015/sdl/src/audio/dmedia/SDL_irixaudio.c b/vs/sdl/src/audio/dmedia/SDL_irixaudio.c similarity index 100% rename from vs2015/sdl/src/audio/dmedia/SDL_irixaudio.c rename to vs/sdl/src/audio/dmedia/SDL_irixaudio.c diff --git a/vs2015/sdl/src/audio/dmedia/SDL_irixaudio.h b/vs/sdl/src/audio/dmedia/SDL_irixaudio.h similarity index 100% rename from vs2015/sdl/src/audio/dmedia/SDL_irixaudio.h rename to vs/sdl/src/audio/dmedia/SDL_irixaudio.h diff --git a/vs2015/sdl/src/audio/dsp/SDL_dspaudio.c b/vs/sdl/src/audio/dsp/SDL_dspaudio.c similarity index 100% rename from vs2015/sdl/src/audio/dsp/SDL_dspaudio.c rename to vs/sdl/src/audio/dsp/SDL_dspaudio.c diff --git a/vs2015/sdl/src/audio/dsp/SDL_dspaudio.h b/vs/sdl/src/audio/dsp/SDL_dspaudio.h similarity index 100% rename from vs2015/sdl/src/audio/dsp/SDL_dspaudio.h rename to vs/sdl/src/audio/dsp/SDL_dspaudio.h diff --git a/vs2015/sdl/src/audio/dummy/SDL_dummyaudio.c b/vs/sdl/src/audio/dummy/SDL_dummyaudio.c similarity index 100% rename from vs2015/sdl/src/audio/dummy/SDL_dummyaudio.c rename to vs/sdl/src/audio/dummy/SDL_dummyaudio.c diff --git a/vs2015/sdl/src/audio/dummy/SDL_dummyaudio.h b/vs/sdl/src/audio/dummy/SDL_dummyaudio.h similarity index 100% rename from vs2015/sdl/src/audio/dummy/SDL_dummyaudio.h rename to vs/sdl/src/audio/dummy/SDL_dummyaudio.h diff --git a/vs2015/sdl/src/audio/esd/SDL_esdaudio.c b/vs/sdl/src/audio/esd/SDL_esdaudio.c similarity index 100% rename from vs2015/sdl/src/audio/esd/SDL_esdaudio.c rename to vs/sdl/src/audio/esd/SDL_esdaudio.c diff --git a/vs2015/sdl/src/audio/esd/SDL_esdaudio.h b/vs/sdl/src/audio/esd/SDL_esdaudio.h similarity index 100% rename from vs2015/sdl/src/audio/esd/SDL_esdaudio.h rename to vs/sdl/src/audio/esd/SDL_esdaudio.h diff --git a/vs2015/sdl/src/audio/macosx/SDL_coreaudio.c b/vs/sdl/src/audio/macosx/SDL_coreaudio.c similarity index 100% rename from vs2015/sdl/src/audio/macosx/SDL_coreaudio.c rename to vs/sdl/src/audio/macosx/SDL_coreaudio.c diff --git a/vs2015/sdl/src/audio/macosx/SDL_coreaudio.h b/vs/sdl/src/audio/macosx/SDL_coreaudio.h similarity index 100% rename from vs2015/sdl/src/audio/macosx/SDL_coreaudio.h rename to vs/sdl/src/audio/macosx/SDL_coreaudio.h diff --git a/vs2015/sdl/src/audio/macrom/SDL_romaudio.c b/vs/sdl/src/audio/macrom/SDL_romaudio.c similarity index 100% rename from vs2015/sdl/src/audio/macrom/SDL_romaudio.c rename to vs/sdl/src/audio/macrom/SDL_romaudio.c diff --git a/vs2015/sdl/src/audio/macrom/SDL_romaudio.h b/vs/sdl/src/audio/macrom/SDL_romaudio.h similarity index 100% rename from vs2015/sdl/src/audio/macrom/SDL_romaudio.h rename to vs/sdl/src/audio/macrom/SDL_romaudio.h diff --git a/vs2015/sdl/src/audio/mint/SDL_mintaudio.c b/vs/sdl/src/audio/mint/SDL_mintaudio.c similarity index 100% rename from vs2015/sdl/src/audio/mint/SDL_mintaudio.c rename to vs/sdl/src/audio/mint/SDL_mintaudio.c diff --git a/vs2015/sdl/src/audio/mint/SDL_mintaudio.h b/vs/sdl/src/audio/mint/SDL_mintaudio.h similarity index 100% rename from vs2015/sdl/src/audio/mint/SDL_mintaudio.h rename to vs/sdl/src/audio/mint/SDL_mintaudio.h diff --git a/vs2015/sdl/src/audio/mint/SDL_mintaudio_dma8.c b/vs/sdl/src/audio/mint/SDL_mintaudio_dma8.c similarity index 100% rename from vs2015/sdl/src/audio/mint/SDL_mintaudio_dma8.c rename to vs/sdl/src/audio/mint/SDL_mintaudio_dma8.c diff --git a/vs2015/sdl/src/audio/mint/SDL_mintaudio_dma8.h b/vs/sdl/src/audio/mint/SDL_mintaudio_dma8.h similarity index 100% rename from vs2015/sdl/src/audio/mint/SDL_mintaudio_dma8.h rename to vs/sdl/src/audio/mint/SDL_mintaudio_dma8.h diff --git a/vs2015/sdl/src/audio/mint/SDL_mintaudio_gsxb.c b/vs/sdl/src/audio/mint/SDL_mintaudio_gsxb.c similarity index 100% rename from vs2015/sdl/src/audio/mint/SDL_mintaudio_gsxb.c rename to vs/sdl/src/audio/mint/SDL_mintaudio_gsxb.c diff --git a/vs2015/sdl/src/audio/mint/SDL_mintaudio_gsxb.h b/vs/sdl/src/audio/mint/SDL_mintaudio_gsxb.h similarity index 100% rename from vs2015/sdl/src/audio/mint/SDL_mintaudio_gsxb.h rename to vs/sdl/src/audio/mint/SDL_mintaudio_gsxb.h diff --git a/vs2015/sdl/src/audio/mint/SDL_mintaudio_it.S b/vs/sdl/src/audio/mint/SDL_mintaudio_it.S similarity index 100% rename from vs2015/sdl/src/audio/mint/SDL_mintaudio_it.S rename to vs/sdl/src/audio/mint/SDL_mintaudio_it.S diff --git a/vs2015/sdl/src/audio/mint/SDL_mintaudio_mcsn.c b/vs/sdl/src/audio/mint/SDL_mintaudio_mcsn.c similarity index 100% rename from vs2015/sdl/src/audio/mint/SDL_mintaudio_mcsn.c rename to vs/sdl/src/audio/mint/SDL_mintaudio_mcsn.c diff --git a/vs2015/sdl/src/audio/mint/SDL_mintaudio_mcsn.h b/vs/sdl/src/audio/mint/SDL_mintaudio_mcsn.h similarity index 100% rename from vs2015/sdl/src/audio/mint/SDL_mintaudio_mcsn.h rename to vs/sdl/src/audio/mint/SDL_mintaudio_mcsn.h diff --git a/vs2015/sdl/src/audio/mint/SDL_mintaudio_stfa.c b/vs/sdl/src/audio/mint/SDL_mintaudio_stfa.c similarity index 100% rename from vs2015/sdl/src/audio/mint/SDL_mintaudio_stfa.c rename to vs/sdl/src/audio/mint/SDL_mintaudio_stfa.c diff --git a/vs2015/sdl/src/audio/mint/SDL_mintaudio_stfa.h b/vs/sdl/src/audio/mint/SDL_mintaudio_stfa.h similarity index 100% rename from vs2015/sdl/src/audio/mint/SDL_mintaudio_stfa.h rename to vs/sdl/src/audio/mint/SDL_mintaudio_stfa.h diff --git a/vs2015/sdl/src/audio/mint/SDL_mintaudio_xbios.c b/vs/sdl/src/audio/mint/SDL_mintaudio_xbios.c similarity index 100% rename from vs2015/sdl/src/audio/mint/SDL_mintaudio_xbios.c rename to vs/sdl/src/audio/mint/SDL_mintaudio_xbios.c diff --git a/vs2015/sdl/src/audio/mme/SDL_mmeaudio.c b/vs/sdl/src/audio/mme/SDL_mmeaudio.c similarity index 100% rename from vs2015/sdl/src/audio/mme/SDL_mmeaudio.c rename to vs/sdl/src/audio/mme/SDL_mmeaudio.c diff --git a/vs2015/sdl/src/audio/mme/SDL_mmeaudio.h b/vs/sdl/src/audio/mme/SDL_mmeaudio.h similarity index 100% rename from vs2015/sdl/src/audio/mme/SDL_mmeaudio.h rename to vs/sdl/src/audio/mme/SDL_mmeaudio.h diff --git a/vs2015/sdl/src/audio/nas/SDL_nasaudio.c b/vs/sdl/src/audio/nas/SDL_nasaudio.c similarity index 100% rename from vs2015/sdl/src/audio/nas/SDL_nasaudio.c rename to vs/sdl/src/audio/nas/SDL_nasaudio.c diff --git a/vs2015/sdl/src/audio/nas/SDL_nasaudio.h b/vs/sdl/src/audio/nas/SDL_nasaudio.h similarity index 100% rename from vs2015/sdl/src/audio/nas/SDL_nasaudio.h rename to vs/sdl/src/audio/nas/SDL_nasaudio.h diff --git a/vs2015/sdl/src/audio/nds/SDL_ndsaudio.c b/vs/sdl/src/audio/nds/SDL_ndsaudio.c similarity index 100% rename from vs2015/sdl/src/audio/nds/SDL_ndsaudio.c rename to vs/sdl/src/audio/nds/SDL_ndsaudio.c diff --git a/vs2015/sdl/src/audio/nds/SDL_ndsaudio.h b/vs/sdl/src/audio/nds/SDL_ndsaudio.h similarity index 100% rename from vs2015/sdl/src/audio/nds/SDL_ndsaudio.h rename to vs/sdl/src/audio/nds/SDL_ndsaudio.h diff --git a/vs2015/sdl/src/audio/nds/sound9.c b/vs/sdl/src/audio/nds/sound9.c similarity index 100% rename from vs2015/sdl/src/audio/nds/sound9.c rename to vs/sdl/src/audio/nds/sound9.c diff --git a/vs2015/sdl/src/audio/nds/soundcommon.h b/vs/sdl/src/audio/nds/soundcommon.h similarity index 100% rename from vs2015/sdl/src/audio/nds/soundcommon.h rename to vs/sdl/src/audio/nds/soundcommon.h diff --git a/vs2015/sdl/src/audio/nto/SDL_nto_audio.c b/vs/sdl/src/audio/nto/SDL_nto_audio.c similarity index 100% rename from vs2015/sdl/src/audio/nto/SDL_nto_audio.c rename to vs/sdl/src/audio/nto/SDL_nto_audio.c diff --git a/vs2015/sdl/src/audio/nto/SDL_nto_audio.h b/vs/sdl/src/audio/nto/SDL_nto_audio.h similarity index 100% rename from vs2015/sdl/src/audio/nto/SDL_nto_audio.h rename to vs/sdl/src/audio/nto/SDL_nto_audio.h diff --git a/vs2015/sdl/src/audio/paudio/SDL_paudio.c b/vs/sdl/src/audio/paudio/SDL_paudio.c similarity index 100% rename from vs2015/sdl/src/audio/paudio/SDL_paudio.c rename to vs/sdl/src/audio/paudio/SDL_paudio.c diff --git a/vs2015/sdl/src/audio/paudio/SDL_paudio.h b/vs/sdl/src/audio/paudio/SDL_paudio.h similarity index 100% rename from vs2015/sdl/src/audio/paudio/SDL_paudio.h rename to vs/sdl/src/audio/paudio/SDL_paudio.h diff --git a/vs2015/sdl/src/audio/pulse/SDL_pulseaudio.c b/vs/sdl/src/audio/pulse/SDL_pulseaudio.c similarity index 100% rename from vs2015/sdl/src/audio/pulse/SDL_pulseaudio.c rename to vs/sdl/src/audio/pulse/SDL_pulseaudio.c diff --git a/vs2015/sdl/src/audio/pulse/SDL_pulseaudio.h b/vs/sdl/src/audio/pulse/SDL_pulseaudio.h similarity index 100% rename from vs2015/sdl/src/audio/pulse/SDL_pulseaudio.h rename to vs/sdl/src/audio/pulse/SDL_pulseaudio.h diff --git a/vs2015/sdl/src/audio/sun/SDL_sunaudio.c b/vs/sdl/src/audio/sun/SDL_sunaudio.c similarity index 100% rename from vs2015/sdl/src/audio/sun/SDL_sunaudio.c rename to vs/sdl/src/audio/sun/SDL_sunaudio.c diff --git a/vs2015/sdl/src/audio/sun/SDL_sunaudio.h b/vs/sdl/src/audio/sun/SDL_sunaudio.h similarity index 100% rename from vs2015/sdl/src/audio/sun/SDL_sunaudio.h rename to vs/sdl/src/audio/sun/SDL_sunaudio.h diff --git a/vs2015/sdl/src/audio/symbian/SDL_epocaudio.cpp b/vs/sdl/src/audio/symbian/SDL_epocaudio.cpp similarity index 100% rename from vs2015/sdl/src/audio/symbian/SDL_epocaudio.cpp rename to vs/sdl/src/audio/symbian/SDL_epocaudio.cpp diff --git a/vs2015/sdl/src/audio/symbian/SDL_epocaudio.h b/vs/sdl/src/audio/symbian/SDL_epocaudio.h similarity index 100% rename from vs2015/sdl/src/audio/symbian/SDL_epocaudio.h rename to vs/sdl/src/audio/symbian/SDL_epocaudio.h diff --git a/vs2015/sdl/src/audio/symbian/streamplayer.cpp b/vs/sdl/src/audio/symbian/streamplayer.cpp similarity index 100% rename from vs2015/sdl/src/audio/symbian/streamplayer.cpp rename to vs/sdl/src/audio/symbian/streamplayer.cpp diff --git a/vs2015/sdl/src/audio/symbian/streamplayer.h b/vs/sdl/src/audio/symbian/streamplayer.h similarity index 100% rename from vs2015/sdl/src/audio/symbian/streamplayer.h rename to vs/sdl/src/audio/symbian/streamplayer.h diff --git a/vs2015/sdl/src/audio/ums/SDL_umsaudio.c b/vs/sdl/src/audio/ums/SDL_umsaudio.c similarity index 100% rename from vs2015/sdl/src/audio/ums/SDL_umsaudio.c rename to vs/sdl/src/audio/ums/SDL_umsaudio.c diff --git a/vs2015/sdl/src/audio/ums/SDL_umsaudio.h b/vs/sdl/src/audio/ums/SDL_umsaudio.h similarity index 100% rename from vs2015/sdl/src/audio/ums/SDL_umsaudio.h rename to vs/sdl/src/audio/ums/SDL_umsaudio.h diff --git a/vs2015/sdl/src/audio/windib/SDL_dibaudio.c b/vs/sdl/src/audio/windib/SDL_dibaudio.c similarity index 100% rename from vs2015/sdl/src/audio/windib/SDL_dibaudio.c rename to vs/sdl/src/audio/windib/SDL_dibaudio.c diff --git a/vs2015/sdl/src/audio/windib/SDL_dibaudio.h b/vs/sdl/src/audio/windib/SDL_dibaudio.h similarity index 100% rename from vs2015/sdl/src/audio/windib/SDL_dibaudio.h rename to vs/sdl/src/audio/windib/SDL_dibaudio.h diff --git a/vs2015/sdl/src/audio/windx5/SDL_dx5audio.c b/vs/sdl/src/audio/windx5/SDL_dx5audio.c similarity index 100% rename from vs2015/sdl/src/audio/windx5/SDL_dx5audio.c rename to vs/sdl/src/audio/windx5/SDL_dx5audio.c diff --git a/vs2015/sdl/src/audio/windx5/SDL_dx5audio.h b/vs/sdl/src/audio/windx5/SDL_dx5audio.h similarity index 100% rename from vs2015/sdl/src/audio/windx5/SDL_dx5audio.h rename to vs/sdl/src/audio/windx5/SDL_dx5audio.h diff --git a/vs2015/sdl/src/audio/windx5/directx.h b/vs/sdl/src/audio/windx5/directx.h similarity index 100% rename from vs2015/sdl/src/audio/windx5/directx.h rename to vs/sdl/src/audio/windx5/directx.h diff --git a/vs2015/sdl/src/cdrom/SDL_cdrom.c b/vs/sdl/src/cdrom/SDL_cdrom.c similarity index 100% rename from vs2015/sdl/src/cdrom/SDL_cdrom.c rename to vs/sdl/src/cdrom/SDL_cdrom.c diff --git a/vs2015/sdl/src/cdrom/SDL_syscdrom.h b/vs/sdl/src/cdrom/SDL_syscdrom.h similarity index 100% rename from vs2015/sdl/src/cdrom/SDL_syscdrom.h rename to vs/sdl/src/cdrom/SDL_syscdrom.h diff --git a/vs2015/sdl/src/cdrom/aix/SDL_syscdrom.c b/vs/sdl/src/cdrom/aix/SDL_syscdrom.c similarity index 100% rename from vs2015/sdl/src/cdrom/aix/SDL_syscdrom.c rename to vs/sdl/src/cdrom/aix/SDL_syscdrom.c diff --git a/vs2015/sdl/src/cdrom/beos/SDL_syscdrom.cc b/vs/sdl/src/cdrom/beos/SDL_syscdrom.cc similarity index 100% rename from vs2015/sdl/src/cdrom/beos/SDL_syscdrom.cc rename to vs/sdl/src/cdrom/beos/SDL_syscdrom.cc diff --git a/vs2015/sdl/src/cdrom/bsdi/SDL_syscdrom.c b/vs/sdl/src/cdrom/bsdi/SDL_syscdrom.c similarity index 100% rename from vs2015/sdl/src/cdrom/bsdi/SDL_syscdrom.c rename to vs/sdl/src/cdrom/bsdi/SDL_syscdrom.c diff --git a/vs2015/sdl/src/cdrom/compat_SDL_cdrom.c b/vs/sdl/src/cdrom/compat_SDL_cdrom.c similarity index 100% rename from vs2015/sdl/src/cdrom/compat_SDL_cdrom.c rename to vs/sdl/src/cdrom/compat_SDL_cdrom.c diff --git a/vs2015/sdl/src/cdrom/compat_SDL_cdrom.h b/vs/sdl/src/cdrom/compat_SDL_cdrom.h similarity index 100% rename from vs2015/sdl/src/cdrom/compat_SDL_cdrom.h rename to vs/sdl/src/cdrom/compat_SDL_cdrom.h diff --git a/vs2015/sdl/src/cdrom/dc/SDL_syscdrom.c b/vs/sdl/src/cdrom/dc/SDL_syscdrom.c similarity index 100% rename from vs2015/sdl/src/cdrom/dc/SDL_syscdrom.c rename to vs/sdl/src/cdrom/dc/SDL_syscdrom.c diff --git a/vs2015/sdl/src/cdrom/dummy/SDL_syscdrom.c b/vs/sdl/src/cdrom/dummy/SDL_syscdrom.c similarity index 100% rename from vs2015/sdl/src/cdrom/dummy/SDL_syscdrom.c rename to vs/sdl/src/cdrom/dummy/SDL_syscdrom.c diff --git a/vs2015/sdl/src/cdrom/freebsd/SDL_syscdrom.c b/vs/sdl/src/cdrom/freebsd/SDL_syscdrom.c similarity index 100% rename from vs2015/sdl/src/cdrom/freebsd/SDL_syscdrom.c rename to vs/sdl/src/cdrom/freebsd/SDL_syscdrom.c diff --git a/vs2015/sdl/src/cdrom/linux/SDL_syscdrom.c b/vs/sdl/src/cdrom/linux/SDL_syscdrom.c similarity index 100% rename from vs2015/sdl/src/cdrom/linux/SDL_syscdrom.c rename to vs/sdl/src/cdrom/linux/SDL_syscdrom.c diff --git a/vs2015/sdl/src/cdrom/macos/SDL_syscdrom.c b/vs/sdl/src/cdrom/macos/SDL_syscdrom.c similarity index 100% rename from vs2015/sdl/src/cdrom/macos/SDL_syscdrom.c rename to vs/sdl/src/cdrom/macos/SDL_syscdrom.c diff --git a/vs2015/sdl/src/cdrom/macos/SDL_syscdrom_c.h b/vs/sdl/src/cdrom/macos/SDL_syscdrom_c.h similarity index 100% rename from vs2015/sdl/src/cdrom/macos/SDL_syscdrom_c.h rename to vs/sdl/src/cdrom/macos/SDL_syscdrom_c.h diff --git a/vs2015/sdl/src/cdrom/macosx/AudioFilePlayer.c b/vs/sdl/src/cdrom/macosx/AudioFilePlayer.c similarity index 100% rename from vs2015/sdl/src/cdrom/macosx/AudioFilePlayer.c rename to vs/sdl/src/cdrom/macosx/AudioFilePlayer.c diff --git a/vs2015/sdl/src/cdrom/macosx/AudioFilePlayer.h b/vs/sdl/src/cdrom/macosx/AudioFilePlayer.h similarity index 100% rename from vs2015/sdl/src/cdrom/macosx/AudioFilePlayer.h rename to vs/sdl/src/cdrom/macosx/AudioFilePlayer.h diff --git a/vs2015/sdl/src/cdrom/macosx/AudioFileReaderThread.c b/vs/sdl/src/cdrom/macosx/AudioFileReaderThread.c similarity index 100% rename from vs2015/sdl/src/cdrom/macosx/AudioFileReaderThread.c rename to vs/sdl/src/cdrom/macosx/AudioFileReaderThread.c diff --git a/vs2015/sdl/src/cdrom/macosx/CDPlayer.c b/vs/sdl/src/cdrom/macosx/CDPlayer.c similarity index 100% rename from vs2015/sdl/src/cdrom/macosx/CDPlayer.c rename to vs/sdl/src/cdrom/macosx/CDPlayer.c diff --git a/vs2015/sdl/src/cdrom/macosx/CDPlayer.h b/vs/sdl/src/cdrom/macosx/CDPlayer.h similarity index 100% rename from vs2015/sdl/src/cdrom/macosx/CDPlayer.h rename to vs/sdl/src/cdrom/macosx/CDPlayer.h diff --git a/vs2015/sdl/src/cdrom/macosx/SDLOSXCAGuard.c b/vs/sdl/src/cdrom/macosx/SDLOSXCAGuard.c similarity index 100% rename from vs2015/sdl/src/cdrom/macosx/SDLOSXCAGuard.c rename to vs/sdl/src/cdrom/macosx/SDLOSXCAGuard.c diff --git a/vs2015/sdl/src/cdrom/macosx/SDLOSXCAGuard.h b/vs/sdl/src/cdrom/macosx/SDLOSXCAGuard.h similarity index 100% rename from vs2015/sdl/src/cdrom/macosx/SDLOSXCAGuard.h rename to vs/sdl/src/cdrom/macosx/SDLOSXCAGuard.h diff --git a/vs2015/sdl/src/cdrom/macosx/SDL_syscdrom.c b/vs/sdl/src/cdrom/macosx/SDL_syscdrom.c similarity index 100% rename from vs2015/sdl/src/cdrom/macosx/SDL_syscdrom.c rename to vs/sdl/src/cdrom/macosx/SDL_syscdrom.c diff --git a/vs2015/sdl/src/cdrom/macosx/SDL_syscdrom_c.h b/vs/sdl/src/cdrom/macosx/SDL_syscdrom_c.h similarity index 100% rename from vs2015/sdl/src/cdrom/macosx/SDL_syscdrom_c.h rename to vs/sdl/src/cdrom/macosx/SDL_syscdrom_c.h diff --git a/vs2015/sdl/src/cdrom/mint/SDL_syscdrom.c b/vs/sdl/src/cdrom/mint/SDL_syscdrom.c similarity index 100% rename from vs2015/sdl/src/cdrom/mint/SDL_syscdrom.c rename to vs/sdl/src/cdrom/mint/SDL_syscdrom.c diff --git a/vs2015/sdl/src/cdrom/openbsd/SDL_syscdrom.c b/vs/sdl/src/cdrom/openbsd/SDL_syscdrom.c similarity index 100% rename from vs2015/sdl/src/cdrom/openbsd/SDL_syscdrom.c rename to vs/sdl/src/cdrom/openbsd/SDL_syscdrom.c diff --git a/vs2015/sdl/src/cdrom/os2/SDL_syscdrom.c b/vs/sdl/src/cdrom/os2/SDL_syscdrom.c similarity index 100% rename from vs2015/sdl/src/cdrom/os2/SDL_syscdrom.c rename to vs/sdl/src/cdrom/os2/SDL_syscdrom.c diff --git a/vs2015/sdl/src/cdrom/osf/SDL_syscdrom.c b/vs/sdl/src/cdrom/osf/SDL_syscdrom.c similarity index 100% rename from vs2015/sdl/src/cdrom/osf/SDL_syscdrom.c rename to vs/sdl/src/cdrom/osf/SDL_syscdrom.c diff --git a/vs2015/sdl/src/cdrom/qnx/SDL_syscdrom.c b/vs/sdl/src/cdrom/qnx/SDL_syscdrom.c similarity index 100% rename from vs2015/sdl/src/cdrom/qnx/SDL_syscdrom.c rename to vs/sdl/src/cdrom/qnx/SDL_syscdrom.c diff --git a/vs2015/sdl/src/cdrom/win32/SDL_syscdrom.c b/vs/sdl/src/cdrom/win32/SDL_syscdrom.c similarity index 100% rename from vs2015/sdl/src/cdrom/win32/SDL_syscdrom.c rename to vs/sdl/src/cdrom/win32/SDL_syscdrom.c diff --git a/vs2015/sdl/src/cpuinfo/SDL_cpuinfo.c b/vs/sdl/src/cpuinfo/SDL_cpuinfo.c similarity index 100% rename from vs2015/sdl/src/cpuinfo/SDL_cpuinfo.c rename to vs/sdl/src/cpuinfo/SDL_cpuinfo.c diff --git a/vs2015/sdl/src/events/SDL_active.c b/vs/sdl/src/events/SDL_active.c similarity index 100% rename from vs2015/sdl/src/events/SDL_active.c rename to vs/sdl/src/events/SDL_active.c diff --git a/vs2015/sdl/src/events/SDL_events.c b/vs/sdl/src/events/SDL_events.c similarity index 100% rename from vs2015/sdl/src/events/SDL_events.c rename to vs/sdl/src/events/SDL_events.c diff --git a/vs2015/sdl/src/events/SDL_events_c.h b/vs/sdl/src/events/SDL_events_c.h similarity index 100% rename from vs2015/sdl/src/events/SDL_events_c.h rename to vs/sdl/src/events/SDL_events_c.h diff --git a/vs2015/sdl/src/events/SDL_expose.c b/vs/sdl/src/events/SDL_expose.c similarity index 100% rename from vs2015/sdl/src/events/SDL_expose.c rename to vs/sdl/src/events/SDL_expose.c diff --git a/vs2015/sdl/src/events/SDL_keyboard.c b/vs/sdl/src/events/SDL_keyboard.c similarity index 100% rename from vs2015/sdl/src/events/SDL_keyboard.c rename to vs/sdl/src/events/SDL_keyboard.c diff --git a/vs2015/sdl/src/events/SDL_mouse.c b/vs/sdl/src/events/SDL_mouse.c similarity index 100% rename from vs2015/sdl/src/events/SDL_mouse.c rename to vs/sdl/src/events/SDL_mouse.c diff --git a/vs2015/sdl/src/events/SDL_quit.c b/vs/sdl/src/events/SDL_quit.c similarity index 100% rename from vs2015/sdl/src/events/SDL_quit.c rename to vs/sdl/src/events/SDL_quit.c diff --git a/vs2015/sdl/src/events/SDL_resize.c b/vs/sdl/src/events/SDL_resize.c similarity index 100% rename from vs2015/sdl/src/events/SDL_resize.c rename to vs/sdl/src/events/SDL_resize.c diff --git a/vs2015/sdl/src/events/SDL_sysevents.h b/vs/sdl/src/events/SDL_sysevents.h similarity index 100% rename from vs2015/sdl/src/events/SDL_sysevents.h rename to vs/sdl/src/events/SDL_sysevents.h diff --git a/vs2015/sdl/src/file/SDL_rwops.c b/vs/sdl/src/file/SDL_rwops.c similarity index 100% rename from vs2015/sdl/src/file/SDL_rwops.c rename to vs/sdl/src/file/SDL_rwops.c diff --git a/vs2015/sdl/src/hermes/COPYING.LIB b/vs/sdl/src/hermes/COPYING.LIB similarity index 100% rename from vs2015/sdl/src/hermes/COPYING.LIB rename to vs/sdl/src/hermes/COPYING.LIB diff --git a/vs2015/sdl/src/hermes/HeadMMX.h b/vs/sdl/src/hermes/HeadMMX.h similarity index 100% rename from vs2015/sdl/src/hermes/HeadMMX.h rename to vs/sdl/src/hermes/HeadMMX.h diff --git a/vs2015/sdl/src/hermes/HeadX86.h b/vs/sdl/src/hermes/HeadX86.h similarity index 100% rename from vs2015/sdl/src/hermes/HeadX86.h rename to vs/sdl/src/hermes/HeadX86.h diff --git a/vs2015/sdl/src/hermes/README b/vs/sdl/src/hermes/README similarity index 100% rename from vs2015/sdl/src/hermes/README rename to vs/sdl/src/hermes/README diff --git a/vs2015/sdl/src/hermes/common.inc b/vs/sdl/src/hermes/common.inc similarity index 100% rename from vs2015/sdl/src/hermes/common.inc rename to vs/sdl/src/hermes/common.inc diff --git a/vs2015/sdl/src/hermes/mmx_main.asm b/vs/sdl/src/hermes/mmx_main.asm similarity index 100% rename from vs2015/sdl/src/hermes/mmx_main.asm rename to vs/sdl/src/hermes/mmx_main.asm diff --git a/vs2015/sdl/src/hermes/mmxp2_32.asm b/vs/sdl/src/hermes/mmxp2_32.asm similarity index 100% rename from vs2015/sdl/src/hermes/mmxp2_32.asm rename to vs/sdl/src/hermes/mmxp2_32.asm diff --git a/vs2015/sdl/src/hermes/x86_main.asm b/vs/sdl/src/hermes/x86_main.asm similarity index 100% rename from vs2015/sdl/src/hermes/x86_main.asm rename to vs/sdl/src/hermes/x86_main.asm diff --git a/vs2015/sdl/src/hermes/x86p_16.asm b/vs/sdl/src/hermes/x86p_16.asm similarity index 100% rename from vs2015/sdl/src/hermes/x86p_16.asm rename to vs/sdl/src/hermes/x86p_16.asm diff --git a/vs2015/sdl/src/hermes/x86p_32.asm b/vs/sdl/src/hermes/x86p_32.asm similarity index 100% rename from vs2015/sdl/src/hermes/x86p_32.asm rename to vs/sdl/src/hermes/x86p_32.asm diff --git a/vs2015/sdl/src/joystick/SDL_joystick.c b/vs/sdl/src/joystick/SDL_joystick.c similarity index 100% rename from vs2015/sdl/src/joystick/SDL_joystick.c rename to vs/sdl/src/joystick/SDL_joystick.c diff --git a/vs2015/sdl/src/joystick/SDL_joystick_c.h b/vs/sdl/src/joystick/SDL_joystick_c.h similarity index 100% rename from vs2015/sdl/src/joystick/SDL_joystick_c.h rename to vs/sdl/src/joystick/SDL_joystick_c.h diff --git a/vs2015/sdl/src/joystick/SDL_sysjoystick.h b/vs/sdl/src/joystick/SDL_sysjoystick.h similarity index 100% rename from vs2015/sdl/src/joystick/SDL_sysjoystick.h rename to vs/sdl/src/joystick/SDL_sysjoystick.h diff --git a/vs2015/sdl/src/joystick/beos/SDL_bejoystick.cc b/vs/sdl/src/joystick/beos/SDL_bejoystick.cc similarity index 100% rename from vs2015/sdl/src/joystick/beos/SDL_bejoystick.cc rename to vs/sdl/src/joystick/beos/SDL_bejoystick.cc diff --git a/vs2015/sdl/src/joystick/bsd/SDL_sysjoystick.c b/vs/sdl/src/joystick/bsd/SDL_sysjoystick.c similarity index 100% rename from vs2015/sdl/src/joystick/bsd/SDL_sysjoystick.c rename to vs/sdl/src/joystick/bsd/SDL_sysjoystick.c diff --git a/vs2015/sdl/src/joystick/darwin/SDL_sysjoystick.c b/vs/sdl/src/joystick/darwin/SDL_sysjoystick.c similarity index 100% rename from vs2015/sdl/src/joystick/darwin/SDL_sysjoystick.c rename to vs/sdl/src/joystick/darwin/SDL_sysjoystick.c diff --git a/vs2015/sdl/src/joystick/dc/SDL_sysjoystick.c b/vs/sdl/src/joystick/dc/SDL_sysjoystick.c similarity index 100% rename from vs2015/sdl/src/joystick/dc/SDL_sysjoystick.c rename to vs/sdl/src/joystick/dc/SDL_sysjoystick.c diff --git a/vs2015/sdl/src/joystick/dummy/SDL_sysjoystick.c b/vs/sdl/src/joystick/dummy/SDL_sysjoystick.c similarity index 100% rename from vs2015/sdl/src/joystick/dummy/SDL_sysjoystick.c rename to vs/sdl/src/joystick/dummy/SDL_sysjoystick.c diff --git a/vs2015/sdl/src/joystick/linux/SDL_sysjoystick.c b/vs/sdl/src/joystick/linux/SDL_sysjoystick.c similarity index 100% rename from vs2015/sdl/src/joystick/linux/SDL_sysjoystick.c rename to vs/sdl/src/joystick/linux/SDL_sysjoystick.c diff --git a/vs2015/sdl/src/joystick/macos/SDL_sysjoystick.c b/vs/sdl/src/joystick/macos/SDL_sysjoystick.c similarity index 100% rename from vs2015/sdl/src/joystick/macos/SDL_sysjoystick.c rename to vs/sdl/src/joystick/macos/SDL_sysjoystick.c diff --git a/vs2015/sdl/src/joystick/mint/SDL_sysjoystick.c b/vs/sdl/src/joystick/mint/SDL_sysjoystick.c similarity index 100% rename from vs2015/sdl/src/joystick/mint/SDL_sysjoystick.c rename to vs/sdl/src/joystick/mint/SDL_sysjoystick.c diff --git a/vs2015/sdl/src/joystick/nds/SDL_sysjoystick.c b/vs/sdl/src/joystick/nds/SDL_sysjoystick.c similarity index 100% rename from vs2015/sdl/src/joystick/nds/SDL_sysjoystick.c rename to vs/sdl/src/joystick/nds/SDL_sysjoystick.c diff --git a/vs2015/sdl/src/joystick/riscos/SDL_sysjoystick.c b/vs/sdl/src/joystick/riscos/SDL_sysjoystick.c similarity index 100% rename from vs2015/sdl/src/joystick/riscos/SDL_sysjoystick.c rename to vs/sdl/src/joystick/riscos/SDL_sysjoystick.c diff --git a/vs2015/sdl/src/joystick/win32/SDL_mmjoystick.c b/vs/sdl/src/joystick/win32/SDL_mmjoystick.c similarity index 100% rename from vs2015/sdl/src/joystick/win32/SDL_mmjoystick.c rename to vs/sdl/src/joystick/win32/SDL_mmjoystick.c diff --git a/vs2015/sdl/src/joystick/win32/SDL_xinputjoystick.c b/vs/sdl/src/joystick/win32/SDL_xinputjoystick.c similarity index 100% rename from vs2015/sdl/src/joystick/win32/SDL_xinputjoystick.c rename to vs/sdl/src/joystick/win32/SDL_xinputjoystick.c diff --git a/vs2015/sdl/src/loadso/beos/SDL_sysloadso.c b/vs/sdl/src/loadso/beos/SDL_sysloadso.c similarity index 100% rename from vs2015/sdl/src/loadso/beos/SDL_sysloadso.c rename to vs/sdl/src/loadso/beos/SDL_sysloadso.c diff --git a/vs2015/sdl/src/loadso/dlopen/SDL_sysloadso.c b/vs/sdl/src/loadso/dlopen/SDL_sysloadso.c similarity index 100% rename from vs2015/sdl/src/loadso/dlopen/SDL_sysloadso.c rename to vs/sdl/src/loadso/dlopen/SDL_sysloadso.c diff --git a/vs2015/sdl/src/loadso/dummy/SDL_sysloadso.c b/vs/sdl/src/loadso/dummy/SDL_sysloadso.c similarity index 100% rename from vs2015/sdl/src/loadso/dummy/SDL_sysloadso.c rename to vs/sdl/src/loadso/dummy/SDL_sysloadso.c diff --git a/vs2015/sdl/src/loadso/macos/SDL_sysloadso.c b/vs/sdl/src/loadso/macos/SDL_sysloadso.c similarity index 100% rename from vs2015/sdl/src/loadso/macos/SDL_sysloadso.c rename to vs/sdl/src/loadso/macos/SDL_sysloadso.c diff --git a/vs2015/sdl/src/loadso/macosx/SDL_dlcompat.c b/vs/sdl/src/loadso/macosx/SDL_dlcompat.c similarity index 100% rename from vs2015/sdl/src/loadso/macosx/SDL_dlcompat.c rename to vs/sdl/src/loadso/macosx/SDL_dlcompat.c diff --git a/vs2015/sdl/src/loadso/mint/SDL_sysloadso.c b/vs/sdl/src/loadso/mint/SDL_sysloadso.c similarity index 100% rename from vs2015/sdl/src/loadso/mint/SDL_sysloadso.c rename to vs/sdl/src/loadso/mint/SDL_sysloadso.c diff --git a/vs2015/sdl/src/loadso/os2/SDL_sysloadso.c b/vs/sdl/src/loadso/os2/SDL_sysloadso.c similarity index 100% rename from vs2015/sdl/src/loadso/os2/SDL_sysloadso.c rename to vs/sdl/src/loadso/os2/SDL_sysloadso.c diff --git a/vs2015/sdl/src/loadso/win32/SDL_sysloadso.c b/vs/sdl/src/loadso/win32/SDL_sysloadso.c similarity index 100% rename from vs2015/sdl/src/loadso/win32/SDL_sysloadso.c rename to vs/sdl/src/loadso/win32/SDL_sysloadso.c diff --git a/vs2015/sdl/src/main/beos/SDL_BeApp.cc b/vs/sdl/src/main/beos/SDL_BeApp.cc similarity index 100% rename from vs2015/sdl/src/main/beos/SDL_BeApp.cc rename to vs/sdl/src/main/beos/SDL_BeApp.cc diff --git a/vs2015/sdl/src/main/beos/SDL_BeApp.h b/vs/sdl/src/main/beos/SDL_BeApp.h similarity index 100% rename from vs2015/sdl/src/main/beos/SDL_BeApp.h rename to vs/sdl/src/main/beos/SDL_BeApp.h diff --git a/vs2015/sdl/src/main/dummy/SDL_dummy_main.c b/vs/sdl/src/main/dummy/SDL_dummy_main.c similarity index 100% rename from vs2015/sdl/src/main/dummy/SDL_dummy_main.c rename to vs/sdl/src/main/dummy/SDL_dummy_main.c diff --git a/vs2015/sdl/src/main/macos/SDL.r b/vs/sdl/src/main/macos/SDL.r similarity index 100% rename from vs2015/sdl/src/main/macos/SDL.r rename to vs/sdl/src/main/macos/SDL.r diff --git a/vs2015/sdl/src/main/macos/SDL.shlib.r b/vs/sdl/src/main/macos/SDL.shlib.r similarity index 100% rename from vs2015/sdl/src/main/macos/SDL.shlib.r rename to vs/sdl/src/main/macos/SDL.shlib.r diff --git a/vs2015/sdl/src/main/macos/SDL_main.c b/vs/sdl/src/main/macos/SDL_main.c similarity index 100% rename from vs2015/sdl/src/main/macos/SDL_main.c rename to vs/sdl/src/main/macos/SDL_main.c diff --git a/vs2015/sdl/src/main/macos/SIZE.r b/vs/sdl/src/main/macos/SIZE.r similarity index 100% rename from vs2015/sdl/src/main/macos/SIZE.r rename to vs/sdl/src/main/macos/SIZE.r diff --git a/vs2015/sdl/src/main/macos/exports/Makefile b/vs/sdl/src/main/macos/exports/Makefile similarity index 100% rename from vs2015/sdl/src/main/macos/exports/Makefile rename to vs/sdl/src/main/macos/exports/Makefile diff --git a/vs2015/sdl/src/main/macos/exports/SDL.x b/vs/sdl/src/main/macos/exports/SDL.x similarity index 100% rename from vs2015/sdl/src/main/macos/exports/SDL.x rename to vs/sdl/src/main/macos/exports/SDL.x diff --git a/vs2015/sdl/src/main/macos/exports/gendef.pl b/vs/sdl/src/main/macos/exports/gendef.pl similarity index 100% rename from vs2015/sdl/src/main/macos/exports/gendef.pl rename to vs/sdl/src/main/macos/exports/gendef.pl diff --git a/vs2015/sdl/src/main/macosx/Info.plist.in b/vs/sdl/src/main/macosx/Info.plist.in similarity index 100% rename from vs2015/sdl/src/main/macosx/Info.plist.in rename to vs/sdl/src/main/macosx/Info.plist.in diff --git a/vs2015/sdl/src/main/macosx/SDLMain.h b/vs/sdl/src/main/macosx/SDLMain.h similarity index 100% rename from vs2015/sdl/src/main/macosx/SDLMain.h rename to vs/sdl/src/main/macosx/SDLMain.h diff --git a/vs2015/sdl/src/main/macosx/SDLMain.m b/vs/sdl/src/main/macosx/SDLMain.m similarity index 100% rename from vs2015/sdl/src/main/macosx/SDLMain.m rename to vs/sdl/src/main/macosx/SDLMain.m diff --git a/vs2015/sdl/src/main/macosx/SDLMain.nib/classes.nib b/vs/sdl/src/main/macosx/SDLMain.nib/classes.nib similarity index 100% rename from vs2015/sdl/src/main/macosx/SDLMain.nib/classes.nib rename to vs/sdl/src/main/macosx/SDLMain.nib/classes.nib diff --git a/vs2015/sdl/src/main/macosx/SDLMain.nib/info.nib b/vs/sdl/src/main/macosx/SDLMain.nib/info.nib similarity index 100% rename from vs2015/sdl/src/main/macosx/SDLMain.nib/info.nib rename to vs/sdl/src/main/macosx/SDLMain.nib/info.nib diff --git a/vs2015/sdl/src/main/macosx/SDLMain.nib/objects.nib b/vs/sdl/src/main/macosx/SDLMain.nib/objects.nib similarity index 100% rename from vs2015/sdl/src/main/macosx/SDLMain.nib/objects.nib rename to vs/sdl/src/main/macosx/SDLMain.nib/objects.nib diff --git a/vs2015/sdl/src/main/macosx/info.nib b/vs/sdl/src/main/macosx/info.nib similarity index 100% rename from vs2015/sdl/src/main/macosx/info.nib rename to vs/sdl/src/main/macosx/info.nib diff --git a/vs2015/sdl/src/main/qtopia/SDL_qtopia_main.cc b/vs/sdl/src/main/qtopia/SDL_qtopia_main.cc similarity index 100% rename from vs2015/sdl/src/main/qtopia/SDL_qtopia_main.cc rename to vs/sdl/src/main/qtopia/SDL_qtopia_main.cc diff --git a/vs2015/sdl/src/main/symbian/EKA1/SDL_main.cpp b/vs/sdl/src/main/symbian/EKA1/SDL_main.cpp similarity index 100% rename from vs2015/sdl/src/main/symbian/EKA1/SDL_main.cpp rename to vs/sdl/src/main/symbian/EKA1/SDL_main.cpp diff --git a/vs2015/sdl/src/main/symbian/EKA2/SDL_main.cpp b/vs/sdl/src/main/symbian/EKA2/SDL_main.cpp similarity index 100% rename from vs2015/sdl/src/main/symbian/EKA2/SDL_main.cpp rename to vs/sdl/src/main/symbian/EKA2/SDL_main.cpp diff --git a/vs2015/sdl/src/main/symbian/EKA2/sdlexe.cpp b/vs/sdl/src/main/symbian/EKA2/sdlexe.cpp similarity index 100% rename from vs2015/sdl/src/main/symbian/EKA2/sdlexe.cpp rename to vs/sdl/src/main/symbian/EKA2/sdlexe.cpp diff --git a/vs2015/sdl/src/main/symbian/EKA2/sdllib.cpp b/vs/sdl/src/main/symbian/EKA2/sdllib.cpp similarity index 100% rename from vs2015/sdl/src/main/symbian/EKA2/sdllib.cpp rename to vs/sdl/src/main/symbian/EKA2/sdllib.cpp diff --git a/vs2015/sdl/src/main/symbian/EKA2/vectorbuffer.cpp b/vs/sdl/src/main/symbian/EKA2/vectorbuffer.cpp similarity index 100% rename from vs2015/sdl/src/main/symbian/EKA2/vectorbuffer.cpp rename to vs/sdl/src/main/symbian/EKA2/vectorbuffer.cpp diff --git a/vs2015/sdl/src/main/symbian/EKA2/vectorbuffer.h b/vs/sdl/src/main/symbian/EKA2/vectorbuffer.h similarity index 100% rename from vs2015/sdl/src/main/symbian/EKA2/vectorbuffer.h rename to vs/sdl/src/main/symbian/EKA2/vectorbuffer.h diff --git a/vs2015/sdl/src/main/win32/SDL_win32_main.c b/vs/sdl/src/main/win32/SDL_win32_main.c similarity index 100% rename from vs2015/sdl/src/main/win32/SDL_win32_main.c rename to vs/sdl/src/main/win32/SDL_win32_main.c diff --git a/vs2015/sdl/src/main/win32/version.rc b/vs/sdl/src/main/win32/version.rc similarity index 100% rename from vs2015/sdl/src/main/win32/version.rc rename to vs/sdl/src/main/win32/version.rc diff --git a/vs2015/sdl/src/stdlib/SDL_getenv.c b/vs/sdl/src/stdlib/SDL_getenv.c similarity index 100% rename from vs2015/sdl/src/stdlib/SDL_getenv.c rename to vs/sdl/src/stdlib/SDL_getenv.c diff --git a/vs2015/sdl/src/stdlib/SDL_iconv.c b/vs/sdl/src/stdlib/SDL_iconv.c similarity index 100% rename from vs2015/sdl/src/stdlib/SDL_iconv.c rename to vs/sdl/src/stdlib/SDL_iconv.c diff --git a/vs2015/sdl/src/stdlib/SDL_malloc.c b/vs/sdl/src/stdlib/SDL_malloc.c similarity index 100% rename from vs2015/sdl/src/stdlib/SDL_malloc.c rename to vs/sdl/src/stdlib/SDL_malloc.c diff --git a/vs2015/sdl/src/stdlib/SDL_qsort.c b/vs/sdl/src/stdlib/SDL_qsort.c similarity index 100% rename from vs2015/sdl/src/stdlib/SDL_qsort.c rename to vs/sdl/src/stdlib/SDL_qsort.c diff --git a/vs2015/sdl/src/stdlib/SDL_stdlib.c b/vs/sdl/src/stdlib/SDL_stdlib.c similarity index 100% rename from vs2015/sdl/src/stdlib/SDL_stdlib.c rename to vs/sdl/src/stdlib/SDL_stdlib.c diff --git a/vs2015/sdl/src/stdlib/SDL_string.c b/vs/sdl/src/stdlib/SDL_string.c similarity index 100% rename from vs2015/sdl/src/stdlib/SDL_string.c rename to vs/sdl/src/stdlib/SDL_string.c diff --git a/vs2015/sdl/src/thread/SDL_systhread.h b/vs/sdl/src/thread/SDL_systhread.h similarity index 100% rename from vs2015/sdl/src/thread/SDL_systhread.h rename to vs/sdl/src/thread/SDL_systhread.h diff --git a/vs2015/sdl/src/thread/SDL_thread.c b/vs/sdl/src/thread/SDL_thread.c similarity index 100% rename from vs2015/sdl/src/thread/SDL_thread.c rename to vs/sdl/src/thread/SDL_thread.c diff --git a/vs2015/sdl/src/thread/SDL_thread_c.h b/vs/sdl/src/thread/SDL_thread_c.h similarity index 100% rename from vs2015/sdl/src/thread/SDL_thread_c.h rename to vs/sdl/src/thread/SDL_thread_c.h diff --git a/vs2015/sdl/src/thread/beos/SDL_syssem.c b/vs/sdl/src/thread/beos/SDL_syssem.c similarity index 100% rename from vs2015/sdl/src/thread/beos/SDL_syssem.c rename to vs/sdl/src/thread/beos/SDL_syssem.c diff --git a/vs2015/sdl/src/thread/beos/SDL_systhread.c b/vs/sdl/src/thread/beos/SDL_systhread.c similarity index 100% rename from vs2015/sdl/src/thread/beos/SDL_systhread.c rename to vs/sdl/src/thread/beos/SDL_systhread.c diff --git a/vs2015/sdl/src/thread/beos/SDL_systhread_c.h b/vs/sdl/src/thread/beos/SDL_systhread_c.h similarity index 100% rename from vs2015/sdl/src/thread/beos/SDL_systhread_c.h rename to vs/sdl/src/thread/beos/SDL_systhread_c.h diff --git a/vs2015/sdl/src/thread/dc/SDL_syscond.c b/vs/sdl/src/thread/dc/SDL_syscond.c similarity index 100% rename from vs2015/sdl/src/thread/dc/SDL_syscond.c rename to vs/sdl/src/thread/dc/SDL_syscond.c diff --git a/vs2015/sdl/src/thread/dc/SDL_syscond_c.h b/vs/sdl/src/thread/dc/SDL_syscond_c.h similarity index 100% rename from vs2015/sdl/src/thread/dc/SDL_syscond_c.h rename to vs/sdl/src/thread/dc/SDL_syscond_c.h diff --git a/vs2015/sdl/src/thread/dc/SDL_sysmutex.c b/vs/sdl/src/thread/dc/SDL_sysmutex.c similarity index 100% rename from vs2015/sdl/src/thread/dc/SDL_sysmutex.c rename to vs/sdl/src/thread/dc/SDL_sysmutex.c diff --git a/vs2015/sdl/src/thread/dc/SDL_sysmutex_c.h b/vs/sdl/src/thread/dc/SDL_sysmutex_c.h similarity index 100% rename from vs2015/sdl/src/thread/dc/SDL_sysmutex_c.h rename to vs/sdl/src/thread/dc/SDL_sysmutex_c.h diff --git a/vs2015/sdl/src/thread/dc/SDL_syssem.c b/vs/sdl/src/thread/dc/SDL_syssem.c similarity index 100% rename from vs2015/sdl/src/thread/dc/SDL_syssem.c rename to vs/sdl/src/thread/dc/SDL_syssem.c diff --git a/vs2015/sdl/src/thread/dc/SDL_syssem_c.h b/vs/sdl/src/thread/dc/SDL_syssem_c.h similarity index 100% rename from vs2015/sdl/src/thread/dc/SDL_syssem_c.h rename to vs/sdl/src/thread/dc/SDL_syssem_c.h diff --git a/vs2015/sdl/src/thread/dc/SDL_systhread.c b/vs/sdl/src/thread/dc/SDL_systhread.c similarity index 100% rename from vs2015/sdl/src/thread/dc/SDL_systhread.c rename to vs/sdl/src/thread/dc/SDL_systhread.c diff --git a/vs2015/sdl/src/thread/dc/SDL_systhread_c.h b/vs/sdl/src/thread/dc/SDL_systhread_c.h similarity index 100% rename from vs2015/sdl/src/thread/dc/SDL_systhread_c.h rename to vs/sdl/src/thread/dc/SDL_systhread_c.h diff --git a/vs2015/sdl/src/thread/generic/SDL_syscond.c b/vs/sdl/src/thread/generic/SDL_syscond.c similarity index 100% rename from vs2015/sdl/src/thread/generic/SDL_syscond.c rename to vs/sdl/src/thread/generic/SDL_syscond.c diff --git a/vs2015/sdl/src/thread/generic/SDL_sysmutex.c b/vs/sdl/src/thread/generic/SDL_sysmutex.c similarity index 100% rename from vs2015/sdl/src/thread/generic/SDL_sysmutex.c rename to vs/sdl/src/thread/generic/SDL_sysmutex.c diff --git a/vs2015/sdl/src/thread/generic/SDL_sysmutex_c.h b/vs/sdl/src/thread/generic/SDL_sysmutex_c.h similarity index 100% rename from vs2015/sdl/src/thread/generic/SDL_sysmutex_c.h rename to vs/sdl/src/thread/generic/SDL_sysmutex_c.h diff --git a/vs2015/sdl/src/thread/generic/SDL_syssem.c b/vs/sdl/src/thread/generic/SDL_syssem.c similarity index 100% rename from vs2015/sdl/src/thread/generic/SDL_syssem.c rename to vs/sdl/src/thread/generic/SDL_syssem.c diff --git a/vs2015/sdl/src/thread/generic/SDL_systhread.c b/vs/sdl/src/thread/generic/SDL_systhread.c similarity index 100% rename from vs2015/sdl/src/thread/generic/SDL_systhread.c rename to vs/sdl/src/thread/generic/SDL_systhread.c diff --git a/vs2015/sdl/src/thread/generic/SDL_systhread_c.h b/vs/sdl/src/thread/generic/SDL_systhread_c.h similarity index 100% rename from vs2015/sdl/src/thread/generic/SDL_systhread_c.h rename to vs/sdl/src/thread/generic/SDL_systhread_c.h diff --git a/vs2015/sdl/src/thread/irix/SDL_syssem.c b/vs/sdl/src/thread/irix/SDL_syssem.c similarity index 100% rename from vs2015/sdl/src/thread/irix/SDL_syssem.c rename to vs/sdl/src/thread/irix/SDL_syssem.c diff --git a/vs2015/sdl/src/thread/irix/SDL_systhread.c b/vs/sdl/src/thread/irix/SDL_systhread.c similarity index 100% rename from vs2015/sdl/src/thread/irix/SDL_systhread.c rename to vs/sdl/src/thread/irix/SDL_systhread.c diff --git a/vs2015/sdl/src/thread/irix/SDL_systhread_c.h b/vs/sdl/src/thread/irix/SDL_systhread_c.h similarity index 100% rename from vs2015/sdl/src/thread/irix/SDL_systhread_c.h rename to vs/sdl/src/thread/irix/SDL_systhread_c.h diff --git a/vs2015/sdl/src/thread/os2/SDL_syscond.c b/vs/sdl/src/thread/os2/SDL_syscond.c similarity index 100% rename from vs2015/sdl/src/thread/os2/SDL_syscond.c rename to vs/sdl/src/thread/os2/SDL_syscond.c diff --git a/vs2015/sdl/src/thread/os2/SDL_syscond_c.h b/vs/sdl/src/thread/os2/SDL_syscond_c.h similarity index 100% rename from vs2015/sdl/src/thread/os2/SDL_syscond_c.h rename to vs/sdl/src/thread/os2/SDL_syscond_c.h diff --git a/vs2015/sdl/src/thread/os2/SDL_sysmutex.c b/vs/sdl/src/thread/os2/SDL_sysmutex.c similarity index 100% rename from vs2015/sdl/src/thread/os2/SDL_sysmutex.c rename to vs/sdl/src/thread/os2/SDL_sysmutex.c diff --git a/vs2015/sdl/src/thread/os2/SDL_syssem.c b/vs/sdl/src/thread/os2/SDL_syssem.c similarity index 100% rename from vs2015/sdl/src/thread/os2/SDL_syssem.c rename to vs/sdl/src/thread/os2/SDL_syssem.c diff --git a/vs2015/sdl/src/thread/os2/SDL_systhread.c b/vs/sdl/src/thread/os2/SDL_systhread.c similarity index 100% rename from vs2015/sdl/src/thread/os2/SDL_systhread.c rename to vs/sdl/src/thread/os2/SDL_systhread.c diff --git a/vs2015/sdl/src/thread/os2/SDL_systhread_c.h b/vs/sdl/src/thread/os2/SDL_systhread_c.h similarity index 100% rename from vs2015/sdl/src/thread/os2/SDL_systhread_c.h rename to vs/sdl/src/thread/os2/SDL_systhread_c.h diff --git a/vs2015/sdl/src/thread/pth/SDL_syscond.c b/vs/sdl/src/thread/pth/SDL_syscond.c similarity index 100% rename from vs2015/sdl/src/thread/pth/SDL_syscond.c rename to vs/sdl/src/thread/pth/SDL_syscond.c diff --git a/vs2015/sdl/src/thread/pth/SDL_sysmutex.c b/vs/sdl/src/thread/pth/SDL_sysmutex.c similarity index 100% rename from vs2015/sdl/src/thread/pth/SDL_sysmutex.c rename to vs/sdl/src/thread/pth/SDL_sysmutex.c diff --git a/vs2015/sdl/src/thread/pth/SDL_sysmutex_c.h b/vs/sdl/src/thread/pth/SDL_sysmutex_c.h similarity index 100% rename from vs2015/sdl/src/thread/pth/SDL_sysmutex_c.h rename to vs/sdl/src/thread/pth/SDL_sysmutex_c.h diff --git a/vs2015/sdl/src/thread/pth/SDL_systhread.c b/vs/sdl/src/thread/pth/SDL_systhread.c similarity index 100% rename from vs2015/sdl/src/thread/pth/SDL_systhread.c rename to vs/sdl/src/thread/pth/SDL_systhread.c diff --git a/vs2015/sdl/src/thread/pth/SDL_systhread_c.h b/vs/sdl/src/thread/pth/SDL_systhread_c.h similarity index 100% rename from vs2015/sdl/src/thread/pth/SDL_systhread_c.h rename to vs/sdl/src/thread/pth/SDL_systhread_c.h diff --git a/vs2015/sdl/src/thread/pthread/SDL_syscond.c b/vs/sdl/src/thread/pthread/SDL_syscond.c similarity index 100% rename from vs2015/sdl/src/thread/pthread/SDL_syscond.c rename to vs/sdl/src/thread/pthread/SDL_syscond.c diff --git a/vs2015/sdl/src/thread/pthread/SDL_sysmutex.c b/vs/sdl/src/thread/pthread/SDL_sysmutex.c similarity index 100% rename from vs2015/sdl/src/thread/pthread/SDL_sysmutex.c rename to vs/sdl/src/thread/pthread/SDL_sysmutex.c diff --git a/vs2015/sdl/src/thread/pthread/SDL_sysmutex_c.h b/vs/sdl/src/thread/pthread/SDL_sysmutex_c.h similarity index 100% rename from vs2015/sdl/src/thread/pthread/SDL_sysmutex_c.h rename to vs/sdl/src/thread/pthread/SDL_sysmutex_c.h diff --git a/vs2015/sdl/src/thread/pthread/SDL_syssem.c b/vs/sdl/src/thread/pthread/SDL_syssem.c similarity index 100% rename from vs2015/sdl/src/thread/pthread/SDL_syssem.c rename to vs/sdl/src/thread/pthread/SDL_syssem.c diff --git a/vs2015/sdl/src/thread/pthread/SDL_systhread.c b/vs/sdl/src/thread/pthread/SDL_systhread.c similarity index 100% rename from vs2015/sdl/src/thread/pthread/SDL_systhread.c rename to vs/sdl/src/thread/pthread/SDL_systhread.c diff --git a/vs2015/sdl/src/thread/pthread/SDL_systhread_c.h b/vs/sdl/src/thread/pthread/SDL_systhread_c.h similarity index 100% rename from vs2015/sdl/src/thread/pthread/SDL_systhread_c.h rename to vs/sdl/src/thread/pthread/SDL_systhread_c.h diff --git a/vs2015/sdl/src/thread/riscos/SDL_syscond.c b/vs/sdl/src/thread/riscos/SDL_syscond.c similarity index 100% rename from vs2015/sdl/src/thread/riscos/SDL_syscond.c rename to vs/sdl/src/thread/riscos/SDL_syscond.c diff --git a/vs2015/sdl/src/thread/riscos/SDL_sysmutex.c b/vs/sdl/src/thread/riscos/SDL_sysmutex.c similarity index 100% rename from vs2015/sdl/src/thread/riscos/SDL_sysmutex.c rename to vs/sdl/src/thread/riscos/SDL_sysmutex.c diff --git a/vs2015/sdl/src/thread/riscos/SDL_sysmutex_c.h b/vs/sdl/src/thread/riscos/SDL_sysmutex_c.h similarity index 100% rename from vs2015/sdl/src/thread/riscos/SDL_sysmutex_c.h rename to vs/sdl/src/thread/riscos/SDL_sysmutex_c.h diff --git a/vs2015/sdl/src/thread/riscos/SDL_syssem.c b/vs/sdl/src/thread/riscos/SDL_syssem.c similarity index 100% rename from vs2015/sdl/src/thread/riscos/SDL_syssem.c rename to vs/sdl/src/thread/riscos/SDL_syssem.c diff --git a/vs2015/sdl/src/thread/riscos/SDL_systhread.c b/vs/sdl/src/thread/riscos/SDL_systhread.c similarity index 100% rename from vs2015/sdl/src/thread/riscos/SDL_systhread.c rename to vs/sdl/src/thread/riscos/SDL_systhread.c diff --git a/vs2015/sdl/src/thread/riscos/SDL_systhread_c.h b/vs/sdl/src/thread/riscos/SDL_systhread_c.h similarity index 100% rename from vs2015/sdl/src/thread/riscos/SDL_systhread_c.h rename to vs/sdl/src/thread/riscos/SDL_systhread_c.h diff --git a/vs2015/sdl/src/thread/symbian/SDL_sysmutex.cpp b/vs/sdl/src/thread/symbian/SDL_sysmutex.cpp similarity index 100% rename from vs2015/sdl/src/thread/symbian/SDL_sysmutex.cpp rename to vs/sdl/src/thread/symbian/SDL_sysmutex.cpp diff --git a/vs2015/sdl/src/thread/symbian/SDL_syssem.cpp b/vs/sdl/src/thread/symbian/SDL_syssem.cpp similarity index 100% rename from vs2015/sdl/src/thread/symbian/SDL_syssem.cpp rename to vs/sdl/src/thread/symbian/SDL_syssem.cpp diff --git a/vs2015/sdl/src/thread/symbian/SDL_systhread.cpp b/vs/sdl/src/thread/symbian/SDL_systhread.cpp similarity index 100% rename from vs2015/sdl/src/thread/symbian/SDL_systhread.cpp rename to vs/sdl/src/thread/symbian/SDL_systhread.cpp diff --git a/vs2015/sdl/src/thread/symbian/SDL_systhread_c.h b/vs/sdl/src/thread/symbian/SDL_systhread_c.h similarity index 100% rename from vs2015/sdl/src/thread/symbian/SDL_systhread_c.h rename to vs/sdl/src/thread/symbian/SDL_systhread_c.h diff --git a/vs2015/sdl/src/thread/win32/SDL_sysmutex.c b/vs/sdl/src/thread/win32/SDL_sysmutex.c similarity index 100% rename from vs2015/sdl/src/thread/win32/SDL_sysmutex.c rename to vs/sdl/src/thread/win32/SDL_sysmutex.c diff --git a/vs2015/sdl/src/thread/win32/SDL_syssem.c b/vs/sdl/src/thread/win32/SDL_syssem.c similarity index 100% rename from vs2015/sdl/src/thread/win32/SDL_syssem.c rename to vs/sdl/src/thread/win32/SDL_syssem.c diff --git a/vs2015/sdl/src/thread/win32/SDL_systhread.c b/vs/sdl/src/thread/win32/SDL_systhread.c similarity index 100% rename from vs2015/sdl/src/thread/win32/SDL_systhread.c rename to vs/sdl/src/thread/win32/SDL_systhread.c diff --git a/vs2015/sdl/src/thread/win32/SDL_systhread_c.h b/vs/sdl/src/thread/win32/SDL_systhread_c.h similarity index 100% rename from vs2015/sdl/src/thread/win32/SDL_systhread_c.h rename to vs/sdl/src/thread/win32/SDL_systhread_c.h diff --git a/vs2015/sdl/src/thread/win32/win_ce_semaphore.c b/vs/sdl/src/thread/win32/win_ce_semaphore.c similarity index 100% rename from vs2015/sdl/src/thread/win32/win_ce_semaphore.c rename to vs/sdl/src/thread/win32/win_ce_semaphore.c diff --git a/vs2015/sdl/src/thread/win32/win_ce_semaphore.h b/vs/sdl/src/thread/win32/win_ce_semaphore.h similarity index 100% rename from vs2015/sdl/src/thread/win32/win_ce_semaphore.h rename to vs/sdl/src/thread/win32/win_ce_semaphore.h diff --git a/vs2015/sdl/src/timer/SDL_systimer.h b/vs/sdl/src/timer/SDL_systimer.h similarity index 100% rename from vs2015/sdl/src/timer/SDL_systimer.h rename to vs/sdl/src/timer/SDL_systimer.h diff --git a/vs2015/sdl/src/timer/SDL_timer.c b/vs/sdl/src/timer/SDL_timer.c similarity index 100% rename from vs2015/sdl/src/timer/SDL_timer.c rename to vs/sdl/src/timer/SDL_timer.c diff --git a/vs2015/sdl/src/timer/SDL_timer_c.h b/vs/sdl/src/timer/SDL_timer_c.h similarity index 100% rename from vs2015/sdl/src/timer/SDL_timer_c.h rename to vs/sdl/src/timer/SDL_timer_c.h diff --git a/vs2015/sdl/src/timer/beos/SDL_systimer.c b/vs/sdl/src/timer/beos/SDL_systimer.c similarity index 100% rename from vs2015/sdl/src/timer/beos/SDL_systimer.c rename to vs/sdl/src/timer/beos/SDL_systimer.c diff --git a/vs2015/sdl/src/timer/dc/SDL_systimer.c b/vs/sdl/src/timer/dc/SDL_systimer.c similarity index 100% rename from vs2015/sdl/src/timer/dc/SDL_systimer.c rename to vs/sdl/src/timer/dc/SDL_systimer.c diff --git a/vs2015/sdl/src/timer/dummy/SDL_systimer.c b/vs/sdl/src/timer/dummy/SDL_systimer.c similarity index 100% rename from vs2015/sdl/src/timer/dummy/SDL_systimer.c rename to vs/sdl/src/timer/dummy/SDL_systimer.c diff --git a/vs2015/sdl/src/timer/macos/FastTimes.c b/vs/sdl/src/timer/macos/FastTimes.c similarity index 100% rename from vs2015/sdl/src/timer/macos/FastTimes.c rename to vs/sdl/src/timer/macos/FastTimes.c diff --git a/vs2015/sdl/src/timer/macos/FastTimes.h b/vs/sdl/src/timer/macos/FastTimes.h similarity index 100% rename from vs2015/sdl/src/timer/macos/FastTimes.h rename to vs/sdl/src/timer/macos/FastTimes.h diff --git a/vs2015/sdl/src/timer/macos/SDL_MPWtimer.c b/vs/sdl/src/timer/macos/SDL_MPWtimer.c similarity index 100% rename from vs2015/sdl/src/timer/macos/SDL_MPWtimer.c rename to vs/sdl/src/timer/macos/SDL_MPWtimer.c diff --git a/vs2015/sdl/src/timer/macos/SDL_systimer.c b/vs/sdl/src/timer/macos/SDL_systimer.c similarity index 100% rename from vs2015/sdl/src/timer/macos/SDL_systimer.c rename to vs/sdl/src/timer/macos/SDL_systimer.c diff --git a/vs2015/sdl/src/timer/mint/SDL_systimer.c b/vs/sdl/src/timer/mint/SDL_systimer.c similarity index 100% rename from vs2015/sdl/src/timer/mint/SDL_systimer.c rename to vs/sdl/src/timer/mint/SDL_systimer.c diff --git a/vs2015/sdl/src/timer/mint/SDL_vbltimer.S b/vs/sdl/src/timer/mint/SDL_vbltimer.S similarity index 100% rename from vs2015/sdl/src/timer/mint/SDL_vbltimer.S rename to vs/sdl/src/timer/mint/SDL_vbltimer.S diff --git a/vs2015/sdl/src/timer/mint/SDL_vbltimer_s.h b/vs/sdl/src/timer/mint/SDL_vbltimer_s.h similarity index 100% rename from vs2015/sdl/src/timer/mint/SDL_vbltimer_s.h rename to vs/sdl/src/timer/mint/SDL_vbltimer_s.h diff --git a/vs2015/sdl/src/timer/nds/SDL_systimer.c b/vs/sdl/src/timer/nds/SDL_systimer.c similarity index 100% rename from vs2015/sdl/src/timer/nds/SDL_systimer.c rename to vs/sdl/src/timer/nds/SDL_systimer.c diff --git a/vs2015/sdl/src/timer/os2/SDL_systimer.c b/vs/sdl/src/timer/os2/SDL_systimer.c similarity index 100% rename from vs2015/sdl/src/timer/os2/SDL_systimer.c rename to vs/sdl/src/timer/os2/SDL_systimer.c diff --git a/vs2015/sdl/src/timer/riscos/SDL_systimer.c b/vs/sdl/src/timer/riscos/SDL_systimer.c similarity index 100% rename from vs2015/sdl/src/timer/riscos/SDL_systimer.c rename to vs/sdl/src/timer/riscos/SDL_systimer.c diff --git a/vs2015/sdl/src/timer/symbian/SDL_systimer.cpp b/vs/sdl/src/timer/symbian/SDL_systimer.cpp similarity index 100% rename from vs2015/sdl/src/timer/symbian/SDL_systimer.cpp rename to vs/sdl/src/timer/symbian/SDL_systimer.cpp diff --git a/vs2015/sdl/src/timer/unix/SDL_systimer.c b/vs/sdl/src/timer/unix/SDL_systimer.c similarity index 100% rename from vs2015/sdl/src/timer/unix/SDL_systimer.c rename to vs/sdl/src/timer/unix/SDL_systimer.c diff --git a/vs2015/sdl/src/timer/win32/SDL_systimer.c b/vs/sdl/src/timer/win32/SDL_systimer.c similarity index 100% rename from vs2015/sdl/src/timer/win32/SDL_systimer.c rename to vs/sdl/src/timer/win32/SDL_systimer.c diff --git a/vs2015/sdl/src/timer/wince/SDL_systimer.c b/vs/sdl/src/timer/wince/SDL_systimer.c similarity index 100% rename from vs2015/sdl/src/timer/wince/SDL_systimer.c rename to vs/sdl/src/timer/wince/SDL_systimer.c diff --git a/vs2015/sdl/src/video/SDL_RLEaccel.c b/vs/sdl/src/video/SDL_RLEaccel.c similarity index 100% rename from vs2015/sdl/src/video/SDL_RLEaccel.c rename to vs/sdl/src/video/SDL_RLEaccel.c diff --git a/vs2015/sdl/src/video/SDL_RLEaccel_c.h b/vs/sdl/src/video/SDL_RLEaccel_c.h similarity index 100% rename from vs2015/sdl/src/video/SDL_RLEaccel_c.h rename to vs/sdl/src/video/SDL_RLEaccel_c.h diff --git a/vs2015/sdl/src/video/SDL_blit.c b/vs/sdl/src/video/SDL_blit.c similarity index 100% rename from vs2015/sdl/src/video/SDL_blit.c rename to vs/sdl/src/video/SDL_blit.c diff --git a/vs2015/sdl/src/video/SDL_blit.h b/vs/sdl/src/video/SDL_blit.h similarity index 100% rename from vs2015/sdl/src/video/SDL_blit.h rename to vs/sdl/src/video/SDL_blit.h diff --git a/vs2015/sdl/src/video/SDL_blit_0.c b/vs/sdl/src/video/SDL_blit_0.c similarity index 100% rename from vs2015/sdl/src/video/SDL_blit_0.c rename to vs/sdl/src/video/SDL_blit_0.c diff --git a/vs2015/sdl/src/video/SDL_blit_1.c b/vs/sdl/src/video/SDL_blit_1.c similarity index 100% rename from vs2015/sdl/src/video/SDL_blit_1.c rename to vs/sdl/src/video/SDL_blit_1.c diff --git a/vs2015/sdl/src/video/SDL_blit_A.c b/vs/sdl/src/video/SDL_blit_A.c similarity index 100% rename from vs2015/sdl/src/video/SDL_blit_A.c rename to vs/sdl/src/video/SDL_blit_A.c diff --git a/vs2015/sdl/src/video/SDL_blit_N.c b/vs/sdl/src/video/SDL_blit_N.c similarity index 100% rename from vs2015/sdl/src/video/SDL_blit_N.c rename to vs/sdl/src/video/SDL_blit_N.c diff --git a/vs2015/sdl/src/video/SDL_bmp.c b/vs/sdl/src/video/SDL_bmp.c similarity index 100% rename from vs2015/sdl/src/video/SDL_bmp.c rename to vs/sdl/src/video/SDL_bmp.c diff --git a/vs2015/sdl/src/video/SDL_cursor.c b/vs/sdl/src/video/SDL_cursor.c similarity index 100% rename from vs2015/sdl/src/video/SDL_cursor.c rename to vs/sdl/src/video/SDL_cursor.c diff --git a/vs2015/sdl/src/video/SDL_cursor_c.h b/vs/sdl/src/video/SDL_cursor_c.h similarity index 100% rename from vs2015/sdl/src/video/SDL_cursor_c.h rename to vs/sdl/src/video/SDL_cursor_c.h diff --git a/vs2015/sdl/src/video/SDL_gamma.c b/vs/sdl/src/video/SDL_gamma.c similarity index 100% rename from vs2015/sdl/src/video/SDL_gamma.c rename to vs/sdl/src/video/SDL_gamma.c diff --git a/vs2015/sdl/src/video/SDL_glfuncs.h b/vs/sdl/src/video/SDL_glfuncs.h similarity index 100% rename from vs2015/sdl/src/video/SDL_glfuncs.h rename to vs/sdl/src/video/SDL_glfuncs.h diff --git a/vs2015/sdl/src/video/SDL_leaks.h b/vs/sdl/src/video/SDL_leaks.h similarity index 100% rename from vs2015/sdl/src/video/SDL_leaks.h rename to vs/sdl/src/video/SDL_leaks.h diff --git a/vs2015/sdl/src/video/SDL_pixels.c b/vs/sdl/src/video/SDL_pixels.c similarity index 100% rename from vs2015/sdl/src/video/SDL_pixels.c rename to vs/sdl/src/video/SDL_pixels.c diff --git a/vs2015/sdl/src/video/SDL_pixels_c.h b/vs/sdl/src/video/SDL_pixels_c.h similarity index 100% rename from vs2015/sdl/src/video/SDL_pixels_c.h rename to vs/sdl/src/video/SDL_pixels_c.h diff --git a/vs2015/sdl/src/video/SDL_stretch.c b/vs/sdl/src/video/SDL_stretch.c similarity index 100% rename from vs2015/sdl/src/video/SDL_stretch.c rename to vs/sdl/src/video/SDL_stretch.c diff --git a/vs2015/sdl/src/video/SDL_stretch_c.h b/vs/sdl/src/video/SDL_stretch_c.h similarity index 100% rename from vs2015/sdl/src/video/SDL_stretch_c.h rename to vs/sdl/src/video/SDL_stretch_c.h diff --git a/vs2015/sdl/src/video/SDL_surface.c b/vs/sdl/src/video/SDL_surface.c similarity index 100% rename from vs2015/sdl/src/video/SDL_surface.c rename to vs/sdl/src/video/SDL_surface.c diff --git a/vs2015/sdl/src/video/SDL_sysvideo.h b/vs/sdl/src/video/SDL_sysvideo.h similarity index 100% rename from vs2015/sdl/src/video/SDL_sysvideo.h rename to vs/sdl/src/video/SDL_sysvideo.h diff --git a/vs2015/sdl/src/video/SDL_video.c b/vs/sdl/src/video/SDL_video.c similarity index 100% rename from vs2015/sdl/src/video/SDL_video.c rename to vs/sdl/src/video/SDL_video.c diff --git a/vs2015/sdl/src/video/SDL_yuv.c b/vs/sdl/src/video/SDL_yuv.c similarity index 100% rename from vs2015/sdl/src/video/SDL_yuv.c rename to vs/sdl/src/video/SDL_yuv.c diff --git a/vs2015/sdl/src/video/SDL_yuv_mmx.c b/vs/sdl/src/video/SDL_yuv_mmx.c similarity index 100% rename from vs2015/sdl/src/video/SDL_yuv_mmx.c rename to vs/sdl/src/video/SDL_yuv_mmx.c diff --git a/vs2015/sdl/src/video/SDL_yuv_sw.c b/vs/sdl/src/video/SDL_yuv_sw.c similarity index 100% rename from vs2015/sdl/src/video/SDL_yuv_sw.c rename to vs/sdl/src/video/SDL_yuv_sw.c diff --git a/vs2015/sdl/src/video/SDL_yuv_sw_c.h b/vs/sdl/src/video/SDL_yuv_sw_c.h similarity index 100% rename from vs2015/sdl/src/video/SDL_yuv_sw_c.h rename to vs/sdl/src/video/SDL_yuv_sw_c.h diff --git a/vs2015/sdl/src/video/SDL_yuvfuncs.h b/vs/sdl/src/video/SDL_yuvfuncs.h similarity index 100% rename from vs2015/sdl/src/video/SDL_yuvfuncs.h rename to vs/sdl/src/video/SDL_yuvfuncs.h diff --git a/vs2015/sdl/src/video/Xext/README b/vs/sdl/src/video/Xext/README similarity index 100% rename from vs2015/sdl/src/video/Xext/README rename to vs/sdl/src/video/Xext/README diff --git a/vs2015/sdl/src/video/Xext/XME/xme.c b/vs/sdl/src/video/Xext/XME/xme.c similarity index 100% rename from vs2015/sdl/src/video/Xext/XME/xme.c rename to vs/sdl/src/video/Xext/XME/xme.c diff --git a/vs2015/sdl/src/video/Xext/Xinerama/Xinerama.c b/vs/sdl/src/video/Xext/Xinerama/Xinerama.c similarity index 100% rename from vs2015/sdl/src/video/Xext/Xinerama/Xinerama.c rename to vs/sdl/src/video/Xext/Xinerama/Xinerama.c diff --git a/vs2015/sdl/src/video/Xext/Xv/Xv.c b/vs/sdl/src/video/Xext/Xv/Xv.c similarity index 100% rename from vs2015/sdl/src/video/Xext/Xv/Xv.c rename to vs/sdl/src/video/Xext/Xv/Xv.c diff --git a/vs2015/sdl/src/video/Xext/Xv/Xvlibint.h b/vs/sdl/src/video/Xext/Xv/Xvlibint.h similarity index 100% rename from vs2015/sdl/src/video/Xext/Xv/Xvlibint.h rename to vs/sdl/src/video/Xext/Xv/Xvlibint.h diff --git a/vs2015/sdl/src/video/Xext/Xxf86dga/XF86DGA.c b/vs/sdl/src/video/Xext/Xxf86dga/XF86DGA.c similarity index 100% rename from vs2015/sdl/src/video/Xext/Xxf86dga/XF86DGA.c rename to vs/sdl/src/video/Xext/Xxf86dga/XF86DGA.c diff --git a/vs2015/sdl/src/video/Xext/Xxf86dga/XF86DGA2.c b/vs/sdl/src/video/Xext/Xxf86dga/XF86DGA2.c similarity index 100% rename from vs2015/sdl/src/video/Xext/Xxf86dga/XF86DGA2.c rename to vs/sdl/src/video/Xext/Xxf86dga/XF86DGA2.c diff --git a/vs2015/sdl/src/video/Xext/Xxf86vm/XF86VMode.c b/vs/sdl/src/video/Xext/Xxf86vm/XF86VMode.c similarity index 100% rename from vs2015/sdl/src/video/Xext/Xxf86vm/XF86VMode.c rename to vs/sdl/src/video/Xext/Xxf86vm/XF86VMode.c diff --git a/vs2015/sdl/src/video/Xext/extensions/Xext.h b/vs/sdl/src/video/Xext/extensions/Xext.h similarity index 100% rename from vs2015/sdl/src/video/Xext/extensions/Xext.h rename to vs/sdl/src/video/Xext/extensions/Xext.h diff --git a/vs2015/sdl/src/video/Xext/extensions/Xinerama.h b/vs/sdl/src/video/Xext/extensions/Xinerama.h similarity index 100% rename from vs2015/sdl/src/video/Xext/extensions/Xinerama.h rename to vs/sdl/src/video/Xext/extensions/Xinerama.h diff --git a/vs2015/sdl/src/video/Xext/extensions/Xv.h b/vs/sdl/src/video/Xext/extensions/Xv.h similarity index 100% rename from vs2015/sdl/src/video/Xext/extensions/Xv.h rename to vs/sdl/src/video/Xext/extensions/Xv.h diff --git a/vs2015/sdl/src/video/Xext/extensions/Xvlib.h b/vs/sdl/src/video/Xext/extensions/Xvlib.h similarity index 100% rename from vs2015/sdl/src/video/Xext/extensions/Xvlib.h rename to vs/sdl/src/video/Xext/extensions/Xvlib.h diff --git a/vs2015/sdl/src/video/Xext/extensions/Xvproto.h b/vs/sdl/src/video/Xext/extensions/Xvproto.h similarity index 100% rename from vs2015/sdl/src/video/Xext/extensions/Xvproto.h rename to vs/sdl/src/video/Xext/extensions/Xvproto.h diff --git a/vs2015/sdl/src/video/Xext/extensions/extutil.h b/vs/sdl/src/video/Xext/extensions/extutil.h similarity index 100% rename from vs2015/sdl/src/video/Xext/extensions/extutil.h rename to vs/sdl/src/video/Xext/extensions/extutil.h diff --git a/vs2015/sdl/src/video/Xext/extensions/panoramiXext.h b/vs/sdl/src/video/Xext/extensions/panoramiXext.h similarity index 100% rename from vs2015/sdl/src/video/Xext/extensions/panoramiXext.h rename to vs/sdl/src/video/Xext/extensions/panoramiXext.h diff --git a/vs2015/sdl/src/video/Xext/extensions/panoramiXproto.h b/vs/sdl/src/video/Xext/extensions/panoramiXproto.h similarity index 100% rename from vs2015/sdl/src/video/Xext/extensions/panoramiXproto.h rename to vs/sdl/src/video/Xext/extensions/panoramiXproto.h diff --git a/vs2015/sdl/src/video/Xext/extensions/xf86dga.h b/vs/sdl/src/video/Xext/extensions/xf86dga.h similarity index 100% rename from vs2015/sdl/src/video/Xext/extensions/xf86dga.h rename to vs/sdl/src/video/Xext/extensions/xf86dga.h diff --git a/vs2015/sdl/src/video/Xext/extensions/xf86dga1.h b/vs/sdl/src/video/Xext/extensions/xf86dga1.h similarity index 100% rename from vs2015/sdl/src/video/Xext/extensions/xf86dga1.h rename to vs/sdl/src/video/Xext/extensions/xf86dga1.h diff --git a/vs2015/sdl/src/video/Xext/extensions/xf86dga1str.h b/vs/sdl/src/video/Xext/extensions/xf86dga1str.h similarity index 100% rename from vs2015/sdl/src/video/Xext/extensions/xf86dga1str.h rename to vs/sdl/src/video/Xext/extensions/xf86dga1str.h diff --git a/vs2015/sdl/src/video/Xext/extensions/xf86dgastr.h b/vs/sdl/src/video/Xext/extensions/xf86dgastr.h similarity index 100% rename from vs2015/sdl/src/video/Xext/extensions/xf86dgastr.h rename to vs/sdl/src/video/Xext/extensions/xf86dgastr.h diff --git a/vs2015/sdl/src/video/Xext/extensions/xf86vmode.h b/vs/sdl/src/video/Xext/extensions/xf86vmode.h similarity index 100% rename from vs2015/sdl/src/video/Xext/extensions/xf86vmode.h rename to vs/sdl/src/video/Xext/extensions/xf86vmode.h diff --git a/vs2015/sdl/src/video/Xext/extensions/xf86vmstr.h b/vs/sdl/src/video/Xext/extensions/xf86vmstr.h similarity index 100% rename from vs2015/sdl/src/video/Xext/extensions/xf86vmstr.h rename to vs/sdl/src/video/Xext/extensions/xf86vmstr.h diff --git a/vs2015/sdl/src/video/Xext/extensions/xme.h b/vs/sdl/src/video/Xext/extensions/xme.h similarity index 100% rename from vs2015/sdl/src/video/Xext/extensions/xme.h rename to vs/sdl/src/video/Xext/extensions/xme.h diff --git a/vs2015/sdl/src/video/aalib/SDL_aaevents.c b/vs/sdl/src/video/aalib/SDL_aaevents.c similarity index 100% rename from vs2015/sdl/src/video/aalib/SDL_aaevents.c rename to vs/sdl/src/video/aalib/SDL_aaevents.c diff --git a/vs2015/sdl/src/video/aalib/SDL_aaevents_c.h b/vs/sdl/src/video/aalib/SDL_aaevents_c.h similarity index 100% rename from vs2015/sdl/src/video/aalib/SDL_aaevents_c.h rename to vs/sdl/src/video/aalib/SDL_aaevents_c.h diff --git a/vs2015/sdl/src/video/aalib/SDL_aamouse.c b/vs/sdl/src/video/aalib/SDL_aamouse.c similarity index 100% rename from vs2015/sdl/src/video/aalib/SDL_aamouse.c rename to vs/sdl/src/video/aalib/SDL_aamouse.c diff --git a/vs2015/sdl/src/video/aalib/SDL_aamouse_c.h b/vs/sdl/src/video/aalib/SDL_aamouse_c.h similarity index 100% rename from vs2015/sdl/src/video/aalib/SDL_aamouse_c.h rename to vs/sdl/src/video/aalib/SDL_aamouse_c.h diff --git a/vs2015/sdl/src/video/aalib/SDL_aavideo.c b/vs/sdl/src/video/aalib/SDL_aavideo.c similarity index 100% rename from vs2015/sdl/src/video/aalib/SDL_aavideo.c rename to vs/sdl/src/video/aalib/SDL_aavideo.c diff --git a/vs2015/sdl/src/video/aalib/SDL_aavideo.h b/vs/sdl/src/video/aalib/SDL_aavideo.h similarity index 100% rename from vs2015/sdl/src/video/aalib/SDL_aavideo.h rename to vs/sdl/src/video/aalib/SDL_aavideo.h diff --git a/vs2015/sdl/src/video/ataricommon/SDL_ataric2p.S b/vs/sdl/src/video/ataricommon/SDL_ataric2p.S similarity index 100% rename from vs2015/sdl/src/video/ataricommon/SDL_ataric2p.S rename to vs/sdl/src/video/ataricommon/SDL_ataric2p.S diff --git a/vs2015/sdl/src/video/ataricommon/SDL_ataric2p_s.h b/vs/sdl/src/video/ataricommon/SDL_ataric2p_s.h similarity index 100% rename from vs2015/sdl/src/video/ataricommon/SDL_ataric2p_s.h rename to vs/sdl/src/video/ataricommon/SDL_ataric2p_s.h diff --git a/vs2015/sdl/src/video/ataricommon/SDL_ataridevmouse.c b/vs/sdl/src/video/ataricommon/SDL_ataridevmouse.c similarity index 100% rename from vs2015/sdl/src/video/ataricommon/SDL_ataridevmouse.c rename to vs/sdl/src/video/ataricommon/SDL_ataridevmouse.c diff --git a/vs2015/sdl/src/video/ataricommon/SDL_ataridevmouse_c.h b/vs/sdl/src/video/ataricommon/SDL_ataridevmouse_c.h similarity index 100% rename from vs2015/sdl/src/video/ataricommon/SDL_ataridevmouse_c.h rename to vs/sdl/src/video/ataricommon/SDL_ataridevmouse_c.h diff --git a/vs2015/sdl/src/video/ataricommon/SDL_atarieddi.S b/vs/sdl/src/video/ataricommon/SDL_atarieddi.S similarity index 100% rename from vs2015/sdl/src/video/ataricommon/SDL_atarieddi.S rename to vs/sdl/src/video/ataricommon/SDL_atarieddi.S diff --git a/vs2015/sdl/src/video/ataricommon/SDL_atarieddi_s.h b/vs/sdl/src/video/ataricommon/SDL_atarieddi_s.h similarity index 100% rename from vs2015/sdl/src/video/ataricommon/SDL_atarieddi_s.h rename to vs/sdl/src/video/ataricommon/SDL_atarieddi_s.h diff --git a/vs2015/sdl/src/video/ataricommon/SDL_atarievents.c b/vs/sdl/src/video/ataricommon/SDL_atarievents.c similarity index 100% rename from vs2015/sdl/src/video/ataricommon/SDL_atarievents.c rename to vs/sdl/src/video/ataricommon/SDL_atarievents.c diff --git a/vs2015/sdl/src/video/ataricommon/SDL_atarievents_c.h b/vs/sdl/src/video/ataricommon/SDL_atarievents_c.h similarity index 100% rename from vs2015/sdl/src/video/ataricommon/SDL_atarievents_c.h rename to vs/sdl/src/video/ataricommon/SDL_atarievents_c.h diff --git a/vs2015/sdl/src/video/ataricommon/SDL_atarigl.c b/vs/sdl/src/video/ataricommon/SDL_atarigl.c similarity index 100% rename from vs2015/sdl/src/video/ataricommon/SDL_atarigl.c rename to vs/sdl/src/video/ataricommon/SDL_atarigl.c diff --git a/vs2015/sdl/src/video/ataricommon/SDL_atarigl_c.h b/vs/sdl/src/video/ataricommon/SDL_atarigl_c.h similarity index 100% rename from vs2015/sdl/src/video/ataricommon/SDL_atarigl_c.h rename to vs/sdl/src/video/ataricommon/SDL_atarigl_c.h diff --git a/vs2015/sdl/src/video/ataricommon/SDL_atarikeys.h b/vs/sdl/src/video/ataricommon/SDL_atarikeys.h similarity index 100% rename from vs2015/sdl/src/video/ataricommon/SDL_atarikeys.h rename to vs/sdl/src/video/ataricommon/SDL_atarikeys.h diff --git a/vs2015/sdl/src/video/ataricommon/SDL_atarimxalloc.c b/vs/sdl/src/video/ataricommon/SDL_atarimxalloc.c similarity index 100% rename from vs2015/sdl/src/video/ataricommon/SDL_atarimxalloc.c rename to vs/sdl/src/video/ataricommon/SDL_atarimxalloc.c diff --git a/vs2015/sdl/src/video/ataricommon/SDL_atarimxalloc_c.h b/vs/sdl/src/video/ataricommon/SDL_atarimxalloc_c.h similarity index 100% rename from vs2015/sdl/src/video/ataricommon/SDL_atarimxalloc_c.h rename to vs/sdl/src/video/ataricommon/SDL_atarimxalloc_c.h diff --git a/vs2015/sdl/src/video/ataricommon/SDL_atarisuper.h b/vs/sdl/src/video/ataricommon/SDL_atarisuper.h similarity index 100% rename from vs2015/sdl/src/video/ataricommon/SDL_atarisuper.h rename to vs/sdl/src/video/ataricommon/SDL_atarisuper.h diff --git a/vs2015/sdl/src/video/ataricommon/SDL_biosevents.c b/vs/sdl/src/video/ataricommon/SDL_biosevents.c similarity index 100% rename from vs2015/sdl/src/video/ataricommon/SDL_biosevents.c rename to vs/sdl/src/video/ataricommon/SDL_biosevents.c diff --git a/vs2015/sdl/src/video/ataricommon/SDL_biosevents_c.h b/vs/sdl/src/video/ataricommon/SDL_biosevents_c.h similarity index 100% rename from vs2015/sdl/src/video/ataricommon/SDL_biosevents_c.h rename to vs/sdl/src/video/ataricommon/SDL_biosevents_c.h diff --git a/vs2015/sdl/src/video/ataricommon/SDL_gemdosevents.c b/vs/sdl/src/video/ataricommon/SDL_gemdosevents.c similarity index 100% rename from vs2015/sdl/src/video/ataricommon/SDL_gemdosevents.c rename to vs/sdl/src/video/ataricommon/SDL_gemdosevents.c diff --git a/vs2015/sdl/src/video/ataricommon/SDL_gemdosevents_c.h b/vs/sdl/src/video/ataricommon/SDL_gemdosevents_c.h similarity index 100% rename from vs2015/sdl/src/video/ataricommon/SDL_gemdosevents_c.h rename to vs/sdl/src/video/ataricommon/SDL_gemdosevents_c.h diff --git a/vs2015/sdl/src/video/ataricommon/SDL_ikbdevents.c b/vs/sdl/src/video/ataricommon/SDL_ikbdevents.c similarity index 100% rename from vs2015/sdl/src/video/ataricommon/SDL_ikbdevents.c rename to vs/sdl/src/video/ataricommon/SDL_ikbdevents.c diff --git a/vs2015/sdl/src/video/ataricommon/SDL_ikbdevents_c.h b/vs/sdl/src/video/ataricommon/SDL_ikbdevents_c.h similarity index 100% rename from vs2015/sdl/src/video/ataricommon/SDL_ikbdevents_c.h rename to vs/sdl/src/video/ataricommon/SDL_ikbdevents_c.h diff --git a/vs2015/sdl/src/video/ataricommon/SDL_ikbdinterrupt.S b/vs/sdl/src/video/ataricommon/SDL_ikbdinterrupt.S similarity index 100% rename from vs2015/sdl/src/video/ataricommon/SDL_ikbdinterrupt.S rename to vs/sdl/src/video/ataricommon/SDL_ikbdinterrupt.S diff --git a/vs2015/sdl/src/video/ataricommon/SDL_ikbdinterrupt_s.h b/vs/sdl/src/video/ataricommon/SDL_ikbdinterrupt_s.h similarity index 100% rename from vs2015/sdl/src/video/ataricommon/SDL_ikbdinterrupt_s.h rename to vs/sdl/src/video/ataricommon/SDL_ikbdinterrupt_s.h diff --git a/vs2015/sdl/src/video/ataricommon/SDL_xbiosevents.c b/vs/sdl/src/video/ataricommon/SDL_xbiosevents.c similarity index 100% rename from vs2015/sdl/src/video/ataricommon/SDL_xbiosevents.c rename to vs/sdl/src/video/ataricommon/SDL_xbiosevents.c diff --git a/vs2015/sdl/src/video/ataricommon/SDL_xbiosevents_c.h b/vs/sdl/src/video/ataricommon/SDL_xbiosevents_c.h similarity index 100% rename from vs2015/sdl/src/video/ataricommon/SDL_xbiosevents_c.h rename to vs/sdl/src/video/ataricommon/SDL_xbiosevents_c.h diff --git a/vs2015/sdl/src/video/ataricommon/SDL_xbiosinterrupt.S b/vs/sdl/src/video/ataricommon/SDL_xbiosinterrupt.S similarity index 100% rename from vs2015/sdl/src/video/ataricommon/SDL_xbiosinterrupt.S rename to vs/sdl/src/video/ataricommon/SDL_xbiosinterrupt.S diff --git a/vs2015/sdl/src/video/ataricommon/SDL_xbiosinterrupt_s.h b/vs/sdl/src/video/ataricommon/SDL_xbiosinterrupt_s.h similarity index 100% rename from vs2015/sdl/src/video/ataricommon/SDL_xbiosinterrupt_s.h rename to vs/sdl/src/video/ataricommon/SDL_xbiosinterrupt_s.h diff --git a/vs2015/sdl/src/video/blank_cursor.h b/vs/sdl/src/video/blank_cursor.h similarity index 100% rename from vs2015/sdl/src/video/blank_cursor.h rename to vs/sdl/src/video/blank_cursor.h diff --git a/vs2015/sdl/src/video/bwindow/SDL_BView.h b/vs/sdl/src/video/bwindow/SDL_BView.h similarity index 100% rename from vs2015/sdl/src/video/bwindow/SDL_BView.h rename to vs/sdl/src/video/bwindow/SDL_BView.h diff --git a/vs2015/sdl/src/video/bwindow/SDL_BWin.h b/vs/sdl/src/video/bwindow/SDL_BWin.h similarity index 100% rename from vs2015/sdl/src/video/bwindow/SDL_BWin.h rename to vs/sdl/src/video/bwindow/SDL_BWin.h diff --git a/vs2015/sdl/src/video/bwindow/SDL_lowvideo.h b/vs/sdl/src/video/bwindow/SDL_lowvideo.h similarity index 100% rename from vs2015/sdl/src/video/bwindow/SDL_lowvideo.h rename to vs/sdl/src/video/bwindow/SDL_lowvideo.h diff --git a/vs2015/sdl/src/video/bwindow/SDL_sysevents.cc b/vs/sdl/src/video/bwindow/SDL_sysevents.cc similarity index 100% rename from vs2015/sdl/src/video/bwindow/SDL_sysevents.cc rename to vs/sdl/src/video/bwindow/SDL_sysevents.cc diff --git a/vs2015/sdl/src/video/bwindow/SDL_sysevents_c.h b/vs/sdl/src/video/bwindow/SDL_sysevents_c.h similarity index 100% rename from vs2015/sdl/src/video/bwindow/SDL_sysevents_c.h rename to vs/sdl/src/video/bwindow/SDL_sysevents_c.h diff --git a/vs2015/sdl/src/video/bwindow/SDL_sysmouse.cc b/vs/sdl/src/video/bwindow/SDL_sysmouse.cc similarity index 100% rename from vs2015/sdl/src/video/bwindow/SDL_sysmouse.cc rename to vs/sdl/src/video/bwindow/SDL_sysmouse.cc diff --git a/vs2015/sdl/src/video/bwindow/SDL_sysmouse_c.h b/vs/sdl/src/video/bwindow/SDL_sysmouse_c.h similarity index 100% rename from vs2015/sdl/src/video/bwindow/SDL_sysmouse_c.h rename to vs/sdl/src/video/bwindow/SDL_sysmouse_c.h diff --git a/vs2015/sdl/src/video/bwindow/SDL_sysvideo.cc b/vs/sdl/src/video/bwindow/SDL_sysvideo.cc similarity index 100% rename from vs2015/sdl/src/video/bwindow/SDL_sysvideo.cc rename to vs/sdl/src/video/bwindow/SDL_sysvideo.cc diff --git a/vs2015/sdl/src/video/bwindow/SDL_syswm.cc b/vs/sdl/src/video/bwindow/SDL_syswm.cc similarity index 100% rename from vs2015/sdl/src/video/bwindow/SDL_syswm.cc rename to vs/sdl/src/video/bwindow/SDL_syswm.cc diff --git a/vs2015/sdl/src/video/bwindow/SDL_syswm_c.h b/vs/sdl/src/video/bwindow/SDL_syswm_c.h similarity index 100% rename from vs2015/sdl/src/video/bwindow/SDL_syswm_c.h rename to vs/sdl/src/video/bwindow/SDL_syswm_c.h diff --git a/vs2015/sdl/src/video/bwindow/SDL_sysyuv.cc b/vs/sdl/src/video/bwindow/SDL_sysyuv.cc similarity index 100% rename from vs2015/sdl/src/video/bwindow/SDL_sysyuv.cc rename to vs/sdl/src/video/bwindow/SDL_sysyuv.cc diff --git a/vs2015/sdl/src/video/bwindow/SDL_sysyuv.h b/vs/sdl/src/video/bwindow/SDL_sysyuv.h similarity index 100% rename from vs2015/sdl/src/video/bwindow/SDL_sysyuv.h rename to vs/sdl/src/video/bwindow/SDL_sysyuv.h diff --git a/vs2015/sdl/src/video/caca/SDL_cacaevents.c b/vs/sdl/src/video/caca/SDL_cacaevents.c similarity index 100% rename from vs2015/sdl/src/video/caca/SDL_cacaevents.c rename to vs/sdl/src/video/caca/SDL_cacaevents.c diff --git a/vs2015/sdl/src/video/caca/SDL_cacaevents_c.h b/vs/sdl/src/video/caca/SDL_cacaevents_c.h similarity index 100% rename from vs2015/sdl/src/video/caca/SDL_cacaevents_c.h rename to vs/sdl/src/video/caca/SDL_cacaevents_c.h diff --git a/vs2015/sdl/src/video/caca/SDL_cacavideo.c b/vs/sdl/src/video/caca/SDL_cacavideo.c similarity index 100% rename from vs2015/sdl/src/video/caca/SDL_cacavideo.c rename to vs/sdl/src/video/caca/SDL_cacavideo.c diff --git a/vs2015/sdl/src/video/caca/SDL_cacavideo.h b/vs/sdl/src/video/caca/SDL_cacavideo.h similarity index 100% rename from vs2015/sdl/src/video/caca/SDL_cacavideo.h rename to vs/sdl/src/video/caca/SDL_cacavideo.h diff --git a/vs2015/sdl/src/video/dc/SDL_dcevents.c b/vs/sdl/src/video/dc/SDL_dcevents.c similarity index 100% rename from vs2015/sdl/src/video/dc/SDL_dcevents.c rename to vs/sdl/src/video/dc/SDL_dcevents.c diff --git a/vs2015/sdl/src/video/dc/SDL_dcevents_c.h b/vs/sdl/src/video/dc/SDL_dcevents_c.h similarity index 100% rename from vs2015/sdl/src/video/dc/SDL_dcevents_c.h rename to vs/sdl/src/video/dc/SDL_dcevents_c.h diff --git a/vs2015/sdl/src/video/dc/SDL_dcmouse.c b/vs/sdl/src/video/dc/SDL_dcmouse.c similarity index 100% rename from vs2015/sdl/src/video/dc/SDL_dcmouse.c rename to vs/sdl/src/video/dc/SDL_dcmouse.c diff --git a/vs2015/sdl/src/video/dc/SDL_dcmouse_c.h b/vs/sdl/src/video/dc/SDL_dcmouse_c.h similarity index 100% rename from vs2015/sdl/src/video/dc/SDL_dcmouse_c.h rename to vs/sdl/src/video/dc/SDL_dcmouse_c.h diff --git a/vs2015/sdl/src/video/dc/SDL_dcvideo.c b/vs/sdl/src/video/dc/SDL_dcvideo.c similarity index 100% rename from vs2015/sdl/src/video/dc/SDL_dcvideo.c rename to vs/sdl/src/video/dc/SDL_dcvideo.c diff --git a/vs2015/sdl/src/video/dc/SDL_dcvideo.h b/vs/sdl/src/video/dc/SDL_dcvideo.h similarity index 100% rename from vs2015/sdl/src/video/dc/SDL_dcvideo.h rename to vs/sdl/src/video/dc/SDL_dcvideo.h diff --git a/vs2015/sdl/src/video/default_cursor.h b/vs/sdl/src/video/default_cursor.h similarity index 100% rename from vs2015/sdl/src/video/default_cursor.h rename to vs/sdl/src/video/default_cursor.h diff --git a/vs2015/sdl/src/video/dga/SDL_dgaevents.c b/vs/sdl/src/video/dga/SDL_dgaevents.c similarity index 100% rename from vs2015/sdl/src/video/dga/SDL_dgaevents.c rename to vs/sdl/src/video/dga/SDL_dgaevents.c diff --git a/vs2015/sdl/src/video/dga/SDL_dgaevents_c.h b/vs/sdl/src/video/dga/SDL_dgaevents_c.h similarity index 100% rename from vs2015/sdl/src/video/dga/SDL_dgaevents_c.h rename to vs/sdl/src/video/dga/SDL_dgaevents_c.h diff --git a/vs2015/sdl/src/video/dga/SDL_dgamouse.c b/vs/sdl/src/video/dga/SDL_dgamouse.c similarity index 100% rename from vs2015/sdl/src/video/dga/SDL_dgamouse.c rename to vs/sdl/src/video/dga/SDL_dgamouse.c diff --git a/vs2015/sdl/src/video/dga/SDL_dgamouse_c.h b/vs/sdl/src/video/dga/SDL_dgamouse_c.h similarity index 100% rename from vs2015/sdl/src/video/dga/SDL_dgamouse_c.h rename to vs/sdl/src/video/dga/SDL_dgamouse_c.h diff --git a/vs2015/sdl/src/video/dga/SDL_dgavideo.c b/vs/sdl/src/video/dga/SDL_dgavideo.c similarity index 100% rename from vs2015/sdl/src/video/dga/SDL_dgavideo.c rename to vs/sdl/src/video/dga/SDL_dgavideo.c diff --git a/vs2015/sdl/src/video/dga/SDL_dgavideo.h b/vs/sdl/src/video/dga/SDL_dgavideo.h similarity index 100% rename from vs2015/sdl/src/video/dga/SDL_dgavideo.h rename to vs/sdl/src/video/dga/SDL_dgavideo.h diff --git a/vs2015/sdl/src/video/directfb/SDL_DirectFB_events.c b/vs/sdl/src/video/directfb/SDL_DirectFB_events.c similarity index 100% rename from vs2015/sdl/src/video/directfb/SDL_DirectFB_events.c rename to vs/sdl/src/video/directfb/SDL_DirectFB_events.c diff --git a/vs2015/sdl/src/video/directfb/SDL_DirectFB_events.h b/vs/sdl/src/video/directfb/SDL_DirectFB_events.h similarity index 100% rename from vs2015/sdl/src/video/directfb/SDL_DirectFB_events.h rename to vs/sdl/src/video/directfb/SDL_DirectFB_events.h diff --git a/vs2015/sdl/src/video/directfb/SDL_DirectFB_keys.h b/vs/sdl/src/video/directfb/SDL_DirectFB_keys.h similarity index 100% rename from vs2015/sdl/src/video/directfb/SDL_DirectFB_keys.h rename to vs/sdl/src/video/directfb/SDL_DirectFB_keys.h diff --git a/vs2015/sdl/src/video/directfb/SDL_DirectFB_video.c b/vs/sdl/src/video/directfb/SDL_DirectFB_video.c similarity index 100% rename from vs2015/sdl/src/video/directfb/SDL_DirectFB_video.c rename to vs/sdl/src/video/directfb/SDL_DirectFB_video.c diff --git a/vs2015/sdl/src/video/directfb/SDL_DirectFB_video.h b/vs/sdl/src/video/directfb/SDL_DirectFB_video.h similarity index 100% rename from vs2015/sdl/src/video/directfb/SDL_DirectFB_video.h rename to vs/sdl/src/video/directfb/SDL_DirectFB_video.h diff --git a/vs2015/sdl/src/video/directfb/SDL_DirectFB_yuv.c b/vs/sdl/src/video/directfb/SDL_DirectFB_yuv.c similarity index 100% rename from vs2015/sdl/src/video/directfb/SDL_DirectFB_yuv.c rename to vs/sdl/src/video/directfb/SDL_DirectFB_yuv.c diff --git a/vs2015/sdl/src/video/directfb/SDL_DirectFB_yuv.h b/vs/sdl/src/video/directfb/SDL_DirectFB_yuv.h similarity index 100% rename from vs2015/sdl/src/video/directfb/SDL_DirectFB_yuv.h rename to vs/sdl/src/video/directfb/SDL_DirectFB_yuv.h diff --git a/vs2015/sdl/src/video/dummy/SDL_nullevents.c b/vs/sdl/src/video/dummy/SDL_nullevents.c similarity index 100% rename from vs2015/sdl/src/video/dummy/SDL_nullevents.c rename to vs/sdl/src/video/dummy/SDL_nullevents.c diff --git a/vs2015/sdl/src/video/dummy/SDL_nullevents_c.h b/vs/sdl/src/video/dummy/SDL_nullevents_c.h similarity index 100% rename from vs2015/sdl/src/video/dummy/SDL_nullevents_c.h rename to vs/sdl/src/video/dummy/SDL_nullevents_c.h diff --git a/vs2015/sdl/src/video/dummy/SDL_nullmouse.c b/vs/sdl/src/video/dummy/SDL_nullmouse.c similarity index 100% rename from vs2015/sdl/src/video/dummy/SDL_nullmouse.c rename to vs/sdl/src/video/dummy/SDL_nullmouse.c diff --git a/vs2015/sdl/src/video/dummy/SDL_nullmouse_c.h b/vs/sdl/src/video/dummy/SDL_nullmouse_c.h similarity index 100% rename from vs2015/sdl/src/video/dummy/SDL_nullmouse_c.h rename to vs/sdl/src/video/dummy/SDL_nullmouse_c.h diff --git a/vs2015/sdl/src/video/dummy/SDL_nullvideo.c b/vs/sdl/src/video/dummy/SDL_nullvideo.c similarity index 100% rename from vs2015/sdl/src/video/dummy/SDL_nullvideo.c rename to vs/sdl/src/video/dummy/SDL_nullvideo.c diff --git a/vs2015/sdl/src/video/dummy/SDL_nullvideo.h b/vs/sdl/src/video/dummy/SDL_nullvideo.h similarity index 100% rename from vs2015/sdl/src/video/dummy/SDL_nullvideo.h rename to vs/sdl/src/video/dummy/SDL_nullvideo.h diff --git a/vs2015/sdl/src/video/e_log.h b/vs/sdl/src/video/e_log.h similarity index 100% rename from vs2015/sdl/src/video/e_log.h rename to vs/sdl/src/video/e_log.h diff --git a/vs2015/sdl/src/video/e_pow.h b/vs/sdl/src/video/e_pow.h similarity index 100% rename from vs2015/sdl/src/video/e_pow.h rename to vs/sdl/src/video/e_pow.h diff --git a/vs2015/sdl/src/video/e_sqrt.h b/vs/sdl/src/video/e_sqrt.h similarity index 100% rename from vs2015/sdl/src/video/e_sqrt.h rename to vs/sdl/src/video/e_sqrt.h diff --git a/vs2015/sdl/src/video/fbcon/3dfx_mmio.h b/vs/sdl/src/video/fbcon/3dfx_mmio.h similarity index 100% rename from vs2015/sdl/src/video/fbcon/3dfx_mmio.h rename to vs/sdl/src/video/fbcon/3dfx_mmio.h diff --git a/vs2015/sdl/src/video/fbcon/3dfx_regs.h b/vs/sdl/src/video/fbcon/3dfx_regs.h similarity index 100% rename from vs2015/sdl/src/video/fbcon/3dfx_regs.h rename to vs/sdl/src/video/fbcon/3dfx_regs.h diff --git a/vs2015/sdl/src/video/fbcon/SDL_fb3dfx.c b/vs/sdl/src/video/fbcon/SDL_fb3dfx.c similarity index 100% rename from vs2015/sdl/src/video/fbcon/SDL_fb3dfx.c rename to vs/sdl/src/video/fbcon/SDL_fb3dfx.c diff --git a/vs2015/sdl/src/video/fbcon/SDL_fb3dfx.h b/vs/sdl/src/video/fbcon/SDL_fb3dfx.h similarity index 100% rename from vs2015/sdl/src/video/fbcon/SDL_fb3dfx.h rename to vs/sdl/src/video/fbcon/SDL_fb3dfx.h diff --git a/vs2015/sdl/src/video/fbcon/SDL_fbelo.c b/vs/sdl/src/video/fbcon/SDL_fbelo.c similarity index 100% rename from vs2015/sdl/src/video/fbcon/SDL_fbelo.c rename to vs/sdl/src/video/fbcon/SDL_fbelo.c diff --git a/vs2015/sdl/src/video/fbcon/SDL_fbelo.h b/vs/sdl/src/video/fbcon/SDL_fbelo.h similarity index 100% rename from vs2015/sdl/src/video/fbcon/SDL_fbelo.h rename to vs/sdl/src/video/fbcon/SDL_fbelo.h diff --git a/vs2015/sdl/src/video/fbcon/SDL_fbevents.c b/vs/sdl/src/video/fbcon/SDL_fbevents.c similarity index 100% rename from vs2015/sdl/src/video/fbcon/SDL_fbevents.c rename to vs/sdl/src/video/fbcon/SDL_fbevents.c diff --git a/vs2015/sdl/src/video/fbcon/SDL_fbevents_c.h b/vs/sdl/src/video/fbcon/SDL_fbevents_c.h similarity index 100% rename from vs2015/sdl/src/video/fbcon/SDL_fbevents_c.h rename to vs/sdl/src/video/fbcon/SDL_fbevents_c.h diff --git a/vs2015/sdl/src/video/fbcon/SDL_fbkeys.h b/vs/sdl/src/video/fbcon/SDL_fbkeys.h similarity index 100% rename from vs2015/sdl/src/video/fbcon/SDL_fbkeys.h rename to vs/sdl/src/video/fbcon/SDL_fbkeys.h diff --git a/vs2015/sdl/src/video/fbcon/SDL_fbmatrox.c b/vs/sdl/src/video/fbcon/SDL_fbmatrox.c similarity index 100% rename from vs2015/sdl/src/video/fbcon/SDL_fbmatrox.c rename to vs/sdl/src/video/fbcon/SDL_fbmatrox.c diff --git a/vs2015/sdl/src/video/fbcon/SDL_fbmatrox.h b/vs/sdl/src/video/fbcon/SDL_fbmatrox.h similarity index 100% rename from vs2015/sdl/src/video/fbcon/SDL_fbmatrox.h rename to vs/sdl/src/video/fbcon/SDL_fbmatrox.h diff --git a/vs2015/sdl/src/video/fbcon/SDL_fbmouse.c b/vs/sdl/src/video/fbcon/SDL_fbmouse.c similarity index 100% rename from vs2015/sdl/src/video/fbcon/SDL_fbmouse.c rename to vs/sdl/src/video/fbcon/SDL_fbmouse.c diff --git a/vs2015/sdl/src/video/fbcon/SDL_fbmouse_c.h b/vs/sdl/src/video/fbcon/SDL_fbmouse_c.h similarity index 100% rename from vs2015/sdl/src/video/fbcon/SDL_fbmouse_c.h rename to vs/sdl/src/video/fbcon/SDL_fbmouse_c.h diff --git a/vs2015/sdl/src/video/fbcon/SDL_fbriva.c b/vs/sdl/src/video/fbcon/SDL_fbriva.c similarity index 100% rename from vs2015/sdl/src/video/fbcon/SDL_fbriva.c rename to vs/sdl/src/video/fbcon/SDL_fbriva.c diff --git a/vs2015/sdl/src/video/fbcon/SDL_fbriva.h b/vs/sdl/src/video/fbcon/SDL_fbriva.h similarity index 100% rename from vs2015/sdl/src/video/fbcon/SDL_fbriva.h rename to vs/sdl/src/video/fbcon/SDL_fbriva.h diff --git a/vs2015/sdl/src/video/fbcon/SDL_fbvideo.c b/vs/sdl/src/video/fbcon/SDL_fbvideo.c similarity index 100% rename from vs2015/sdl/src/video/fbcon/SDL_fbvideo.c rename to vs/sdl/src/video/fbcon/SDL_fbvideo.c diff --git a/vs2015/sdl/src/video/fbcon/SDL_fbvideo.h b/vs/sdl/src/video/fbcon/SDL_fbvideo.h similarity index 100% rename from vs2015/sdl/src/video/fbcon/SDL_fbvideo.h rename to vs/sdl/src/video/fbcon/SDL_fbvideo.h diff --git a/vs2015/sdl/src/video/fbcon/matrox_mmio.h b/vs/sdl/src/video/fbcon/matrox_mmio.h similarity index 100% rename from vs2015/sdl/src/video/fbcon/matrox_mmio.h rename to vs/sdl/src/video/fbcon/matrox_mmio.h diff --git a/vs2015/sdl/src/video/fbcon/matrox_regs.h b/vs/sdl/src/video/fbcon/matrox_regs.h similarity index 100% rename from vs2015/sdl/src/video/fbcon/matrox_regs.h rename to vs/sdl/src/video/fbcon/matrox_regs.h diff --git a/vs2015/sdl/src/video/fbcon/riva_mmio.h b/vs/sdl/src/video/fbcon/riva_mmio.h similarity index 100% rename from vs2015/sdl/src/video/fbcon/riva_mmio.h rename to vs/sdl/src/video/fbcon/riva_mmio.h diff --git a/vs2015/sdl/src/video/fbcon/riva_regs.h b/vs/sdl/src/video/fbcon/riva_regs.h similarity index 100% rename from vs2015/sdl/src/video/fbcon/riva_regs.h rename to vs/sdl/src/video/fbcon/riva_regs.h diff --git a/vs2015/sdl/src/video/gapi/SDL_gapivideo.c b/vs/sdl/src/video/gapi/SDL_gapivideo.c similarity index 100% rename from vs2015/sdl/src/video/gapi/SDL_gapivideo.c rename to vs/sdl/src/video/gapi/SDL_gapivideo.c diff --git a/vs2015/sdl/src/video/gapi/SDL_gapivideo.h b/vs/sdl/src/video/gapi/SDL_gapivideo.h similarity index 100% rename from vs2015/sdl/src/video/gapi/SDL_gapivideo.h rename to vs/sdl/src/video/gapi/SDL_gapivideo.h diff --git a/vs2015/sdl/src/video/gem/SDL_gemevents.c b/vs/sdl/src/video/gem/SDL_gemevents.c similarity index 100% rename from vs2015/sdl/src/video/gem/SDL_gemevents.c rename to vs/sdl/src/video/gem/SDL_gemevents.c diff --git a/vs2015/sdl/src/video/gem/SDL_gemevents_c.h b/vs/sdl/src/video/gem/SDL_gemevents_c.h similarity index 100% rename from vs2015/sdl/src/video/gem/SDL_gemevents_c.h rename to vs/sdl/src/video/gem/SDL_gemevents_c.h diff --git a/vs2015/sdl/src/video/gem/SDL_gemmouse.c b/vs/sdl/src/video/gem/SDL_gemmouse.c similarity index 100% rename from vs2015/sdl/src/video/gem/SDL_gemmouse.c rename to vs/sdl/src/video/gem/SDL_gemmouse.c diff --git a/vs2015/sdl/src/video/gem/SDL_gemmouse_c.h b/vs/sdl/src/video/gem/SDL_gemmouse_c.h similarity index 100% rename from vs2015/sdl/src/video/gem/SDL_gemmouse_c.h rename to vs/sdl/src/video/gem/SDL_gemmouse_c.h diff --git a/vs2015/sdl/src/video/gem/SDL_gemvideo.c b/vs/sdl/src/video/gem/SDL_gemvideo.c similarity index 100% rename from vs2015/sdl/src/video/gem/SDL_gemvideo.c rename to vs/sdl/src/video/gem/SDL_gemvideo.c diff --git a/vs2015/sdl/src/video/gem/SDL_gemvideo.h b/vs/sdl/src/video/gem/SDL_gemvideo.h similarity index 100% rename from vs2015/sdl/src/video/gem/SDL_gemvideo.h rename to vs/sdl/src/video/gem/SDL_gemvideo.h diff --git a/vs2015/sdl/src/video/gem/SDL_gemwm.c b/vs/sdl/src/video/gem/SDL_gemwm.c similarity index 100% rename from vs2015/sdl/src/video/gem/SDL_gemwm.c rename to vs/sdl/src/video/gem/SDL_gemwm.c diff --git a/vs2015/sdl/src/video/gem/SDL_gemwm_c.h b/vs/sdl/src/video/gem/SDL_gemwm_c.h similarity index 100% rename from vs2015/sdl/src/video/gem/SDL_gemwm_c.h rename to vs/sdl/src/video/gem/SDL_gemwm_c.h diff --git a/vs2015/sdl/src/video/ggi/SDL_ggievents.c b/vs/sdl/src/video/ggi/SDL_ggievents.c similarity index 100% rename from vs2015/sdl/src/video/ggi/SDL_ggievents.c rename to vs/sdl/src/video/ggi/SDL_ggievents.c diff --git a/vs2015/sdl/src/video/ggi/SDL_ggievents_c.h b/vs/sdl/src/video/ggi/SDL_ggievents_c.h similarity index 100% rename from vs2015/sdl/src/video/ggi/SDL_ggievents_c.h rename to vs/sdl/src/video/ggi/SDL_ggievents_c.h diff --git a/vs2015/sdl/src/video/ggi/SDL_ggikeys.h b/vs/sdl/src/video/ggi/SDL_ggikeys.h similarity index 100% rename from vs2015/sdl/src/video/ggi/SDL_ggikeys.h rename to vs/sdl/src/video/ggi/SDL_ggikeys.h diff --git a/vs2015/sdl/src/video/ggi/SDL_ggimouse.c b/vs/sdl/src/video/ggi/SDL_ggimouse.c similarity index 100% rename from vs2015/sdl/src/video/ggi/SDL_ggimouse.c rename to vs/sdl/src/video/ggi/SDL_ggimouse.c diff --git a/vs2015/sdl/src/video/ggi/SDL_ggimouse_c.h b/vs/sdl/src/video/ggi/SDL_ggimouse_c.h similarity index 100% rename from vs2015/sdl/src/video/ggi/SDL_ggimouse_c.h rename to vs/sdl/src/video/ggi/SDL_ggimouse_c.h diff --git a/vs2015/sdl/src/video/ggi/SDL_ggivideo.c b/vs/sdl/src/video/ggi/SDL_ggivideo.c similarity index 100% rename from vs2015/sdl/src/video/ggi/SDL_ggivideo.c rename to vs/sdl/src/video/ggi/SDL_ggivideo.c diff --git a/vs2015/sdl/src/video/ggi/SDL_ggivideo.h b/vs/sdl/src/video/ggi/SDL_ggivideo.h similarity index 100% rename from vs2015/sdl/src/video/ggi/SDL_ggivideo.h rename to vs/sdl/src/video/ggi/SDL_ggivideo.h diff --git a/vs2015/sdl/src/video/ipod/SDL_ipodvideo.c b/vs/sdl/src/video/ipod/SDL_ipodvideo.c similarity index 100% rename from vs2015/sdl/src/video/ipod/SDL_ipodvideo.c rename to vs/sdl/src/video/ipod/SDL_ipodvideo.c diff --git a/vs2015/sdl/src/video/ipod/SDL_ipodvideo.h b/vs/sdl/src/video/ipod/SDL_ipodvideo.h similarity index 100% rename from vs2015/sdl/src/video/ipod/SDL_ipodvideo.h rename to vs/sdl/src/video/ipod/SDL_ipodvideo.h diff --git a/vs2015/sdl/src/video/maccommon/SDL_lowvideo.h b/vs/sdl/src/video/maccommon/SDL_lowvideo.h similarity index 100% rename from vs2015/sdl/src/video/maccommon/SDL_lowvideo.h rename to vs/sdl/src/video/maccommon/SDL_lowvideo.h diff --git a/vs2015/sdl/src/video/maccommon/SDL_macevents.c b/vs/sdl/src/video/maccommon/SDL_macevents.c similarity index 100% rename from vs2015/sdl/src/video/maccommon/SDL_macevents.c rename to vs/sdl/src/video/maccommon/SDL_macevents.c diff --git a/vs2015/sdl/src/video/maccommon/SDL_macevents_c.h b/vs/sdl/src/video/maccommon/SDL_macevents_c.h similarity index 100% rename from vs2015/sdl/src/video/maccommon/SDL_macevents_c.h rename to vs/sdl/src/video/maccommon/SDL_macevents_c.h diff --git a/vs2015/sdl/src/video/maccommon/SDL_macgl.c b/vs/sdl/src/video/maccommon/SDL_macgl.c similarity index 100% rename from vs2015/sdl/src/video/maccommon/SDL_macgl.c rename to vs/sdl/src/video/maccommon/SDL_macgl.c diff --git a/vs2015/sdl/src/video/maccommon/SDL_macgl_c.h b/vs/sdl/src/video/maccommon/SDL_macgl_c.h similarity index 100% rename from vs2015/sdl/src/video/maccommon/SDL_macgl_c.h rename to vs/sdl/src/video/maccommon/SDL_macgl_c.h diff --git a/vs2015/sdl/src/video/maccommon/SDL_mackeys.h b/vs/sdl/src/video/maccommon/SDL_mackeys.h similarity index 100% rename from vs2015/sdl/src/video/maccommon/SDL_mackeys.h rename to vs/sdl/src/video/maccommon/SDL_mackeys.h diff --git a/vs2015/sdl/src/video/maccommon/SDL_macmouse.c b/vs/sdl/src/video/maccommon/SDL_macmouse.c similarity index 100% rename from vs2015/sdl/src/video/maccommon/SDL_macmouse.c rename to vs/sdl/src/video/maccommon/SDL_macmouse.c diff --git a/vs2015/sdl/src/video/maccommon/SDL_macmouse_c.h b/vs/sdl/src/video/maccommon/SDL_macmouse_c.h similarity index 100% rename from vs2015/sdl/src/video/maccommon/SDL_macmouse_c.h rename to vs/sdl/src/video/maccommon/SDL_macmouse_c.h diff --git a/vs2015/sdl/src/video/maccommon/SDL_macwm.c b/vs/sdl/src/video/maccommon/SDL_macwm.c similarity index 100% rename from vs2015/sdl/src/video/maccommon/SDL_macwm.c rename to vs/sdl/src/video/maccommon/SDL_macwm.c diff --git a/vs2015/sdl/src/video/maccommon/SDL_macwm_c.h b/vs/sdl/src/video/maccommon/SDL_macwm_c.h similarity index 100% rename from vs2015/sdl/src/video/maccommon/SDL_macwm_c.h rename to vs/sdl/src/video/maccommon/SDL_macwm_c.h diff --git a/vs2015/sdl/src/video/macdsp/SDL_dspvideo.c b/vs/sdl/src/video/macdsp/SDL_dspvideo.c similarity index 100% rename from vs2015/sdl/src/video/macdsp/SDL_dspvideo.c rename to vs/sdl/src/video/macdsp/SDL_dspvideo.c diff --git a/vs2015/sdl/src/video/macdsp/SDL_dspvideo.h b/vs/sdl/src/video/macdsp/SDL_dspvideo.h similarity index 100% rename from vs2015/sdl/src/video/macdsp/SDL_dspvideo.h rename to vs/sdl/src/video/macdsp/SDL_dspvideo.h diff --git a/vs2015/sdl/src/video/macrom/SDL_romvideo.c b/vs/sdl/src/video/macrom/SDL_romvideo.c similarity index 100% rename from vs2015/sdl/src/video/macrom/SDL_romvideo.c rename to vs/sdl/src/video/macrom/SDL_romvideo.c diff --git a/vs2015/sdl/src/video/macrom/SDL_romvideo.h b/vs/sdl/src/video/macrom/SDL_romvideo.h similarity index 100% rename from vs2015/sdl/src/video/macrom/SDL_romvideo.h rename to vs/sdl/src/video/macrom/SDL_romvideo.h diff --git a/vs2015/sdl/src/video/math_private.h b/vs/sdl/src/video/math_private.h similarity index 100% rename from vs2015/sdl/src/video/math_private.h rename to vs/sdl/src/video/math_private.h diff --git a/vs2015/sdl/src/video/mmx.h b/vs/sdl/src/video/mmx.h similarity index 100% rename from vs2015/sdl/src/video/mmx.h rename to vs/sdl/src/video/mmx.h diff --git a/vs2015/sdl/src/video/nanox/SDL_nxevents.c b/vs/sdl/src/video/nanox/SDL_nxevents.c similarity index 100% rename from vs2015/sdl/src/video/nanox/SDL_nxevents.c rename to vs/sdl/src/video/nanox/SDL_nxevents.c diff --git a/vs2015/sdl/src/video/nanox/SDL_nxevents_c.h b/vs/sdl/src/video/nanox/SDL_nxevents_c.h similarity index 100% rename from vs2015/sdl/src/video/nanox/SDL_nxevents_c.h rename to vs/sdl/src/video/nanox/SDL_nxevents_c.h diff --git a/vs2015/sdl/src/video/nanox/SDL_nximage.c b/vs/sdl/src/video/nanox/SDL_nximage.c similarity index 100% rename from vs2015/sdl/src/video/nanox/SDL_nximage.c rename to vs/sdl/src/video/nanox/SDL_nximage.c diff --git a/vs2015/sdl/src/video/nanox/SDL_nximage_c.h b/vs/sdl/src/video/nanox/SDL_nximage_c.h similarity index 100% rename from vs2015/sdl/src/video/nanox/SDL_nximage_c.h rename to vs/sdl/src/video/nanox/SDL_nximage_c.h diff --git a/vs2015/sdl/src/video/nanox/SDL_nxmodes.c b/vs/sdl/src/video/nanox/SDL_nxmodes.c similarity index 100% rename from vs2015/sdl/src/video/nanox/SDL_nxmodes.c rename to vs/sdl/src/video/nanox/SDL_nxmodes.c diff --git a/vs2015/sdl/src/video/nanox/SDL_nxmodes_c.h b/vs/sdl/src/video/nanox/SDL_nxmodes_c.h similarity index 100% rename from vs2015/sdl/src/video/nanox/SDL_nxmodes_c.h rename to vs/sdl/src/video/nanox/SDL_nxmodes_c.h diff --git a/vs2015/sdl/src/video/nanox/SDL_nxmouse.c b/vs/sdl/src/video/nanox/SDL_nxmouse.c similarity index 100% rename from vs2015/sdl/src/video/nanox/SDL_nxmouse.c rename to vs/sdl/src/video/nanox/SDL_nxmouse.c diff --git a/vs2015/sdl/src/video/nanox/SDL_nxmouse_c.h b/vs/sdl/src/video/nanox/SDL_nxmouse_c.h similarity index 100% rename from vs2015/sdl/src/video/nanox/SDL_nxmouse_c.h rename to vs/sdl/src/video/nanox/SDL_nxmouse_c.h diff --git a/vs2015/sdl/src/video/nanox/SDL_nxvideo.c b/vs/sdl/src/video/nanox/SDL_nxvideo.c similarity index 100% rename from vs2015/sdl/src/video/nanox/SDL_nxvideo.c rename to vs/sdl/src/video/nanox/SDL_nxvideo.c diff --git a/vs2015/sdl/src/video/nanox/SDL_nxvideo.h b/vs/sdl/src/video/nanox/SDL_nxvideo.h similarity index 100% rename from vs2015/sdl/src/video/nanox/SDL_nxvideo.h rename to vs/sdl/src/video/nanox/SDL_nxvideo.h diff --git a/vs2015/sdl/src/video/nanox/SDL_nxwm.c b/vs/sdl/src/video/nanox/SDL_nxwm.c similarity index 100% rename from vs2015/sdl/src/video/nanox/SDL_nxwm.c rename to vs/sdl/src/video/nanox/SDL_nxwm.c diff --git a/vs2015/sdl/src/video/nanox/SDL_nxwm_c.h b/vs/sdl/src/video/nanox/SDL_nxwm_c.h similarity index 100% rename from vs2015/sdl/src/video/nanox/SDL_nxwm_c.h rename to vs/sdl/src/video/nanox/SDL_nxwm_c.h diff --git a/vs2015/sdl/src/video/nds/SDL_ndsevents.c b/vs/sdl/src/video/nds/SDL_ndsevents.c similarity index 100% rename from vs2015/sdl/src/video/nds/SDL_ndsevents.c rename to vs/sdl/src/video/nds/SDL_ndsevents.c diff --git a/vs2015/sdl/src/video/nds/SDL_ndsevents_c.h b/vs/sdl/src/video/nds/SDL_ndsevents_c.h similarity index 100% rename from vs2015/sdl/src/video/nds/SDL_ndsevents_c.h rename to vs/sdl/src/video/nds/SDL_ndsevents_c.h diff --git a/vs2015/sdl/src/video/nds/SDL_ndsmouse.c b/vs/sdl/src/video/nds/SDL_ndsmouse.c similarity index 100% rename from vs2015/sdl/src/video/nds/SDL_ndsmouse.c rename to vs/sdl/src/video/nds/SDL_ndsmouse.c diff --git a/vs2015/sdl/src/video/nds/SDL_ndsmouse_c.h b/vs/sdl/src/video/nds/SDL_ndsmouse_c.h similarity index 100% rename from vs2015/sdl/src/video/nds/SDL_ndsmouse_c.h rename to vs/sdl/src/video/nds/SDL_ndsmouse_c.h diff --git a/vs2015/sdl/src/video/nds/SDL_ndsvideo.c b/vs/sdl/src/video/nds/SDL_ndsvideo.c similarity index 100% rename from vs2015/sdl/src/video/nds/SDL_ndsvideo.c rename to vs/sdl/src/video/nds/SDL_ndsvideo.c diff --git a/vs2015/sdl/src/video/nds/SDL_ndsvideo.h b/vs/sdl/src/video/nds/SDL_ndsvideo.h similarity index 100% rename from vs2015/sdl/src/video/nds/SDL_ndsvideo.h rename to vs/sdl/src/video/nds/SDL_ndsvideo.h diff --git a/vs2015/sdl/src/video/os2fslib/SDL_os2fslib.c b/vs/sdl/src/video/os2fslib/SDL_os2fslib.c similarity index 100% rename from vs2015/sdl/src/video/os2fslib/SDL_os2fslib.c rename to vs/sdl/src/video/os2fslib/SDL_os2fslib.c diff --git a/vs2015/sdl/src/video/os2fslib/SDL_os2fslib.h b/vs/sdl/src/video/os2fslib/SDL_os2fslib.h similarity index 100% rename from vs2015/sdl/src/video/os2fslib/SDL_os2fslib.h rename to vs/sdl/src/video/os2fslib/SDL_os2fslib.h diff --git a/vs2015/sdl/src/video/os2fslib/SDL_vkeys.h b/vs/sdl/src/video/os2fslib/SDL_vkeys.h similarity index 100% rename from vs2015/sdl/src/video/os2fslib/SDL_vkeys.h rename to vs/sdl/src/video/os2fslib/SDL_vkeys.h diff --git a/vs2015/sdl/src/video/photon/SDL_ph_events.c b/vs/sdl/src/video/photon/SDL_ph_events.c similarity index 100% rename from vs2015/sdl/src/video/photon/SDL_ph_events.c rename to vs/sdl/src/video/photon/SDL_ph_events.c diff --git a/vs2015/sdl/src/video/photon/SDL_ph_events_c.h b/vs/sdl/src/video/photon/SDL_ph_events_c.h similarity index 100% rename from vs2015/sdl/src/video/photon/SDL_ph_events_c.h rename to vs/sdl/src/video/photon/SDL_ph_events_c.h diff --git a/vs2015/sdl/src/video/photon/SDL_ph_gl.c b/vs/sdl/src/video/photon/SDL_ph_gl.c similarity index 100% rename from vs2015/sdl/src/video/photon/SDL_ph_gl.c rename to vs/sdl/src/video/photon/SDL_ph_gl.c diff --git a/vs2015/sdl/src/video/photon/SDL_ph_gl.h b/vs/sdl/src/video/photon/SDL_ph_gl.h similarity index 100% rename from vs2015/sdl/src/video/photon/SDL_ph_gl.h rename to vs/sdl/src/video/photon/SDL_ph_gl.h diff --git a/vs2015/sdl/src/video/photon/SDL_ph_image.c b/vs/sdl/src/video/photon/SDL_ph_image.c similarity index 100% rename from vs2015/sdl/src/video/photon/SDL_ph_image.c rename to vs/sdl/src/video/photon/SDL_ph_image.c diff --git a/vs2015/sdl/src/video/photon/SDL_ph_image_c.h b/vs/sdl/src/video/photon/SDL_ph_image_c.h similarity index 100% rename from vs2015/sdl/src/video/photon/SDL_ph_image_c.h rename to vs/sdl/src/video/photon/SDL_ph_image_c.h diff --git a/vs2015/sdl/src/video/photon/SDL_ph_modes.c b/vs/sdl/src/video/photon/SDL_ph_modes.c similarity index 100% rename from vs2015/sdl/src/video/photon/SDL_ph_modes.c rename to vs/sdl/src/video/photon/SDL_ph_modes.c diff --git a/vs2015/sdl/src/video/photon/SDL_ph_modes_c.h b/vs/sdl/src/video/photon/SDL_ph_modes_c.h similarity index 100% rename from vs2015/sdl/src/video/photon/SDL_ph_modes_c.h rename to vs/sdl/src/video/photon/SDL_ph_modes_c.h diff --git a/vs2015/sdl/src/video/photon/SDL_ph_mouse.c b/vs/sdl/src/video/photon/SDL_ph_mouse.c similarity index 100% rename from vs2015/sdl/src/video/photon/SDL_ph_mouse.c rename to vs/sdl/src/video/photon/SDL_ph_mouse.c diff --git a/vs2015/sdl/src/video/photon/SDL_ph_mouse_c.h b/vs/sdl/src/video/photon/SDL_ph_mouse_c.h similarity index 100% rename from vs2015/sdl/src/video/photon/SDL_ph_mouse_c.h rename to vs/sdl/src/video/photon/SDL_ph_mouse_c.h diff --git a/vs2015/sdl/src/video/photon/SDL_ph_video.c b/vs/sdl/src/video/photon/SDL_ph_video.c similarity index 100% rename from vs2015/sdl/src/video/photon/SDL_ph_video.c rename to vs/sdl/src/video/photon/SDL_ph_video.c diff --git a/vs2015/sdl/src/video/photon/SDL_ph_video.h b/vs/sdl/src/video/photon/SDL_ph_video.h similarity index 100% rename from vs2015/sdl/src/video/photon/SDL_ph_video.h rename to vs/sdl/src/video/photon/SDL_ph_video.h diff --git a/vs2015/sdl/src/video/photon/SDL_ph_wm.c b/vs/sdl/src/video/photon/SDL_ph_wm.c similarity index 100% rename from vs2015/sdl/src/video/photon/SDL_ph_wm.c rename to vs/sdl/src/video/photon/SDL_ph_wm.c diff --git a/vs2015/sdl/src/video/photon/SDL_ph_wm_c.h b/vs/sdl/src/video/photon/SDL_ph_wm_c.h similarity index 100% rename from vs2015/sdl/src/video/photon/SDL_ph_wm_c.h rename to vs/sdl/src/video/photon/SDL_ph_wm_c.h diff --git a/vs2015/sdl/src/video/photon/SDL_phyuv.c b/vs/sdl/src/video/photon/SDL_phyuv.c similarity index 100% rename from vs2015/sdl/src/video/photon/SDL_phyuv.c rename to vs/sdl/src/video/photon/SDL_phyuv.c diff --git a/vs2015/sdl/src/video/photon/SDL_phyuv_c.h b/vs/sdl/src/video/photon/SDL_phyuv_c.h similarity index 100% rename from vs2015/sdl/src/video/photon/SDL_phyuv_c.h rename to vs/sdl/src/video/photon/SDL_phyuv_c.h diff --git a/vs2015/sdl/src/video/picogui/SDL_pgevents.c b/vs/sdl/src/video/picogui/SDL_pgevents.c similarity index 100% rename from vs2015/sdl/src/video/picogui/SDL_pgevents.c rename to vs/sdl/src/video/picogui/SDL_pgevents.c diff --git a/vs2015/sdl/src/video/picogui/SDL_pgevents_c.h b/vs/sdl/src/video/picogui/SDL_pgevents_c.h similarity index 100% rename from vs2015/sdl/src/video/picogui/SDL_pgevents_c.h rename to vs/sdl/src/video/picogui/SDL_pgevents_c.h diff --git a/vs2015/sdl/src/video/picogui/SDL_pgvideo.c b/vs/sdl/src/video/picogui/SDL_pgvideo.c similarity index 100% rename from vs2015/sdl/src/video/picogui/SDL_pgvideo.c rename to vs/sdl/src/video/picogui/SDL_pgvideo.c diff --git a/vs2015/sdl/src/video/picogui/SDL_pgvideo.h b/vs/sdl/src/video/picogui/SDL_pgvideo.h similarity index 100% rename from vs2015/sdl/src/video/picogui/SDL_pgvideo.h rename to vs/sdl/src/video/picogui/SDL_pgvideo.h diff --git a/vs2015/sdl/src/video/ps2gs/SDL_gsevents.c b/vs/sdl/src/video/ps2gs/SDL_gsevents.c similarity index 100% rename from vs2015/sdl/src/video/ps2gs/SDL_gsevents.c rename to vs/sdl/src/video/ps2gs/SDL_gsevents.c diff --git a/vs2015/sdl/src/video/ps2gs/SDL_gsevents_c.h b/vs/sdl/src/video/ps2gs/SDL_gsevents_c.h similarity index 100% rename from vs2015/sdl/src/video/ps2gs/SDL_gsevents_c.h rename to vs/sdl/src/video/ps2gs/SDL_gsevents_c.h diff --git a/vs2015/sdl/src/video/ps2gs/SDL_gskeys.h b/vs/sdl/src/video/ps2gs/SDL_gskeys.h similarity index 100% rename from vs2015/sdl/src/video/ps2gs/SDL_gskeys.h rename to vs/sdl/src/video/ps2gs/SDL_gskeys.h diff --git a/vs2015/sdl/src/video/ps2gs/SDL_gsmouse.c b/vs/sdl/src/video/ps2gs/SDL_gsmouse.c similarity index 100% rename from vs2015/sdl/src/video/ps2gs/SDL_gsmouse.c rename to vs/sdl/src/video/ps2gs/SDL_gsmouse.c diff --git a/vs2015/sdl/src/video/ps2gs/SDL_gsmouse_c.h b/vs/sdl/src/video/ps2gs/SDL_gsmouse_c.h similarity index 100% rename from vs2015/sdl/src/video/ps2gs/SDL_gsmouse_c.h rename to vs/sdl/src/video/ps2gs/SDL_gsmouse_c.h diff --git a/vs2015/sdl/src/video/ps2gs/SDL_gsvideo.c b/vs/sdl/src/video/ps2gs/SDL_gsvideo.c similarity index 100% rename from vs2015/sdl/src/video/ps2gs/SDL_gsvideo.c rename to vs/sdl/src/video/ps2gs/SDL_gsvideo.c diff --git a/vs2015/sdl/src/video/ps2gs/SDL_gsvideo.h b/vs/sdl/src/video/ps2gs/SDL_gsvideo.h similarity index 100% rename from vs2015/sdl/src/video/ps2gs/SDL_gsvideo.h rename to vs/sdl/src/video/ps2gs/SDL_gsvideo.h diff --git a/vs2015/sdl/src/video/ps2gs/SDL_gsyuv.c b/vs/sdl/src/video/ps2gs/SDL_gsyuv.c similarity index 100% rename from vs2015/sdl/src/video/ps2gs/SDL_gsyuv.c rename to vs/sdl/src/video/ps2gs/SDL_gsyuv.c diff --git a/vs2015/sdl/src/video/ps2gs/SDL_gsyuv_c.h b/vs/sdl/src/video/ps2gs/SDL_gsyuv_c.h similarity index 100% rename from vs2015/sdl/src/video/ps2gs/SDL_gsyuv_c.h rename to vs/sdl/src/video/ps2gs/SDL_gsyuv_c.h diff --git a/vs2015/sdl/src/video/ps3/SDL_ps3events.c b/vs/sdl/src/video/ps3/SDL_ps3events.c similarity index 100% rename from vs2015/sdl/src/video/ps3/SDL_ps3events.c rename to vs/sdl/src/video/ps3/SDL_ps3events.c diff --git a/vs2015/sdl/src/video/ps3/SDL_ps3events_c.h b/vs/sdl/src/video/ps3/SDL_ps3events_c.h similarity index 100% rename from vs2015/sdl/src/video/ps3/SDL_ps3events_c.h rename to vs/sdl/src/video/ps3/SDL_ps3events_c.h diff --git a/vs2015/sdl/src/video/ps3/SDL_ps3video.c b/vs/sdl/src/video/ps3/SDL_ps3video.c similarity index 100% rename from vs2015/sdl/src/video/ps3/SDL_ps3video.c rename to vs/sdl/src/video/ps3/SDL_ps3video.c diff --git a/vs2015/sdl/src/video/ps3/SDL_ps3video.h b/vs/sdl/src/video/ps3/SDL_ps3video.h similarity index 100% rename from vs2015/sdl/src/video/ps3/SDL_ps3video.h rename to vs/sdl/src/video/ps3/SDL_ps3video.h diff --git a/vs2015/sdl/src/video/ps3/SDL_ps3yuv.c b/vs/sdl/src/video/ps3/SDL_ps3yuv.c similarity index 100% rename from vs2015/sdl/src/video/ps3/SDL_ps3yuv.c rename to vs/sdl/src/video/ps3/SDL_ps3yuv.c diff --git a/vs2015/sdl/src/video/ps3/SDL_ps3yuv_c.h b/vs/sdl/src/video/ps3/SDL_ps3yuv_c.h similarity index 100% rename from vs2015/sdl/src/video/ps3/SDL_ps3yuv_c.h rename to vs/sdl/src/video/ps3/SDL_ps3yuv_c.h diff --git a/vs2015/sdl/src/video/ps3/spulibs/Makefile b/vs/sdl/src/video/ps3/spulibs/Makefile similarity index 100% rename from vs2015/sdl/src/video/ps3/spulibs/Makefile rename to vs/sdl/src/video/ps3/spulibs/Makefile diff --git a/vs2015/sdl/src/video/ps3/spulibs/bilin_scaler.c b/vs/sdl/src/video/ps3/spulibs/bilin_scaler.c similarity index 100% rename from vs2015/sdl/src/video/ps3/spulibs/bilin_scaler.c rename to vs/sdl/src/video/ps3/spulibs/bilin_scaler.c diff --git a/vs2015/sdl/src/video/ps3/spulibs/fb_writer.c b/vs/sdl/src/video/ps3/spulibs/fb_writer.c similarity index 100% rename from vs2015/sdl/src/video/ps3/spulibs/fb_writer.c rename to vs/sdl/src/video/ps3/spulibs/fb_writer.c diff --git a/vs2015/sdl/src/video/ps3/spulibs/spu_common.h b/vs/sdl/src/video/ps3/spulibs/spu_common.h similarity index 100% rename from vs2015/sdl/src/video/ps3/spulibs/spu_common.h rename to vs/sdl/src/video/ps3/spulibs/spu_common.h diff --git a/vs2015/sdl/src/video/ps3/spulibs/yuv2rgb_converter.c b/vs/sdl/src/video/ps3/spulibs/yuv2rgb_converter.c similarity index 100% rename from vs2015/sdl/src/video/ps3/spulibs/yuv2rgb_converter.c rename to vs/sdl/src/video/ps3/spulibs/yuv2rgb_converter.c diff --git a/vs2015/sdl/src/video/qtopia/SDL_QPEApp.cc b/vs/sdl/src/video/qtopia/SDL_QPEApp.cc similarity index 100% rename from vs2015/sdl/src/video/qtopia/SDL_QPEApp.cc rename to vs/sdl/src/video/qtopia/SDL_QPEApp.cc diff --git a/vs2015/sdl/src/video/qtopia/SDL_QPEApp.h b/vs/sdl/src/video/qtopia/SDL_QPEApp.h similarity index 100% rename from vs2015/sdl/src/video/qtopia/SDL_QPEApp.h rename to vs/sdl/src/video/qtopia/SDL_QPEApp.h diff --git a/vs2015/sdl/src/video/qtopia/SDL_QWin.cc b/vs/sdl/src/video/qtopia/SDL_QWin.cc similarity index 100% rename from vs2015/sdl/src/video/qtopia/SDL_QWin.cc rename to vs/sdl/src/video/qtopia/SDL_QWin.cc diff --git a/vs2015/sdl/src/video/qtopia/SDL_QWin.h b/vs/sdl/src/video/qtopia/SDL_QWin.h similarity index 100% rename from vs2015/sdl/src/video/qtopia/SDL_QWin.h rename to vs/sdl/src/video/qtopia/SDL_QWin.h diff --git a/vs2015/sdl/src/video/qtopia/SDL_lowvideo.h b/vs/sdl/src/video/qtopia/SDL_lowvideo.h similarity index 100% rename from vs2015/sdl/src/video/qtopia/SDL_lowvideo.h rename to vs/sdl/src/video/qtopia/SDL_lowvideo.h diff --git a/vs2015/sdl/src/video/qtopia/SDL_sysevents.cc b/vs/sdl/src/video/qtopia/SDL_sysevents.cc similarity index 100% rename from vs2015/sdl/src/video/qtopia/SDL_sysevents.cc rename to vs/sdl/src/video/qtopia/SDL_sysevents.cc diff --git a/vs2015/sdl/src/video/qtopia/SDL_sysevents_c.h b/vs/sdl/src/video/qtopia/SDL_sysevents_c.h similarity index 100% rename from vs2015/sdl/src/video/qtopia/SDL_sysevents_c.h rename to vs/sdl/src/video/qtopia/SDL_sysevents_c.h diff --git a/vs2015/sdl/src/video/qtopia/SDL_sysmouse.cc b/vs/sdl/src/video/qtopia/SDL_sysmouse.cc similarity index 100% rename from vs2015/sdl/src/video/qtopia/SDL_sysmouse.cc rename to vs/sdl/src/video/qtopia/SDL_sysmouse.cc diff --git a/vs2015/sdl/src/video/qtopia/SDL_sysmouse_c.h b/vs/sdl/src/video/qtopia/SDL_sysmouse_c.h similarity index 100% rename from vs2015/sdl/src/video/qtopia/SDL_sysmouse_c.h rename to vs/sdl/src/video/qtopia/SDL_sysmouse_c.h diff --git a/vs2015/sdl/src/video/qtopia/SDL_sysvideo.cc b/vs/sdl/src/video/qtopia/SDL_sysvideo.cc similarity index 100% rename from vs2015/sdl/src/video/qtopia/SDL_sysvideo.cc rename to vs/sdl/src/video/qtopia/SDL_sysvideo.cc diff --git a/vs2015/sdl/src/video/qtopia/SDL_syswm.cc b/vs/sdl/src/video/qtopia/SDL_syswm.cc similarity index 100% rename from vs2015/sdl/src/video/qtopia/SDL_syswm.cc rename to vs/sdl/src/video/qtopia/SDL_syswm.cc diff --git a/vs2015/sdl/src/video/qtopia/SDL_syswm_c.h b/vs/sdl/src/video/qtopia/SDL_syswm_c.h similarity index 100% rename from vs2015/sdl/src/video/qtopia/SDL_syswm_c.h rename to vs/sdl/src/video/qtopia/SDL_syswm_c.h diff --git a/vs2015/sdl/src/video/quartz/CGS.h b/vs/sdl/src/video/quartz/CGS.h similarity index 100% rename from vs2015/sdl/src/video/quartz/CGS.h rename to vs/sdl/src/video/quartz/CGS.h diff --git a/vs2015/sdl/src/video/quartz/SDL_QuartzEvents.m b/vs/sdl/src/video/quartz/SDL_QuartzEvents.m similarity index 100% rename from vs2015/sdl/src/video/quartz/SDL_QuartzEvents.m rename to vs/sdl/src/video/quartz/SDL_QuartzEvents.m diff --git a/vs2015/sdl/src/video/quartz/SDL_QuartzGL.m b/vs/sdl/src/video/quartz/SDL_QuartzGL.m similarity index 100% rename from vs2015/sdl/src/video/quartz/SDL_QuartzGL.m rename to vs/sdl/src/video/quartz/SDL_QuartzGL.m diff --git a/vs2015/sdl/src/video/quartz/SDL_QuartzKeys.h b/vs/sdl/src/video/quartz/SDL_QuartzKeys.h similarity index 100% rename from vs2015/sdl/src/video/quartz/SDL_QuartzKeys.h rename to vs/sdl/src/video/quartz/SDL_QuartzKeys.h diff --git a/vs2015/sdl/src/video/quartz/SDL_QuartzVideo.h b/vs/sdl/src/video/quartz/SDL_QuartzVideo.h similarity index 100% rename from vs2015/sdl/src/video/quartz/SDL_QuartzVideo.h rename to vs/sdl/src/video/quartz/SDL_QuartzVideo.h diff --git a/vs2015/sdl/src/video/quartz/SDL_QuartzVideo.m b/vs/sdl/src/video/quartz/SDL_QuartzVideo.m similarity index 100% rename from vs2015/sdl/src/video/quartz/SDL_QuartzVideo.m rename to vs/sdl/src/video/quartz/SDL_QuartzVideo.m diff --git a/vs2015/sdl/src/video/quartz/SDL_QuartzWM.h b/vs/sdl/src/video/quartz/SDL_QuartzWM.h similarity index 100% rename from vs2015/sdl/src/video/quartz/SDL_QuartzWM.h rename to vs/sdl/src/video/quartz/SDL_QuartzWM.h diff --git a/vs2015/sdl/src/video/quartz/SDL_QuartzWM.m b/vs/sdl/src/video/quartz/SDL_QuartzWM.m similarity index 100% rename from vs2015/sdl/src/video/quartz/SDL_QuartzWM.m rename to vs/sdl/src/video/quartz/SDL_QuartzWM.m diff --git a/vs2015/sdl/src/video/quartz/SDL_QuartzWindow.h b/vs/sdl/src/video/quartz/SDL_QuartzWindow.h similarity index 100% rename from vs2015/sdl/src/video/quartz/SDL_QuartzWindow.h rename to vs/sdl/src/video/quartz/SDL_QuartzWindow.h diff --git a/vs2015/sdl/src/video/quartz/SDL_QuartzWindow.m b/vs/sdl/src/video/quartz/SDL_QuartzWindow.m similarity index 100% rename from vs2015/sdl/src/video/quartz/SDL_QuartzWindow.m rename to vs/sdl/src/video/quartz/SDL_QuartzWindow.m diff --git a/vs2015/sdl/src/video/riscos/SDL_riscosASM.S b/vs/sdl/src/video/riscos/SDL_riscosASM.S similarity index 100% rename from vs2015/sdl/src/video/riscos/SDL_riscosASM.S rename to vs/sdl/src/video/riscos/SDL_riscosASM.S diff --git a/vs2015/sdl/src/video/riscos/SDL_riscosFullScreenVideo.c b/vs/sdl/src/video/riscos/SDL_riscosFullScreenVideo.c similarity index 100% rename from vs2015/sdl/src/video/riscos/SDL_riscosFullScreenVideo.c rename to vs/sdl/src/video/riscos/SDL_riscosFullScreenVideo.c diff --git a/vs2015/sdl/src/video/riscos/SDL_riscosevents.c b/vs/sdl/src/video/riscos/SDL_riscosevents.c similarity index 100% rename from vs2015/sdl/src/video/riscos/SDL_riscosevents.c rename to vs/sdl/src/video/riscos/SDL_riscosevents.c diff --git a/vs2015/sdl/src/video/riscos/SDL_riscosevents_c.h b/vs/sdl/src/video/riscos/SDL_riscosevents_c.h similarity index 100% rename from vs2015/sdl/src/video/riscos/SDL_riscosevents_c.h rename to vs/sdl/src/video/riscos/SDL_riscosevents_c.h diff --git a/vs2015/sdl/src/video/riscos/SDL_riscosmouse.c b/vs/sdl/src/video/riscos/SDL_riscosmouse.c similarity index 100% rename from vs2015/sdl/src/video/riscos/SDL_riscosmouse.c rename to vs/sdl/src/video/riscos/SDL_riscosmouse.c diff --git a/vs2015/sdl/src/video/riscos/SDL_riscosmouse_c.h b/vs/sdl/src/video/riscos/SDL_riscosmouse_c.h similarity index 100% rename from vs2015/sdl/src/video/riscos/SDL_riscosmouse_c.h rename to vs/sdl/src/video/riscos/SDL_riscosmouse_c.h diff --git a/vs2015/sdl/src/video/riscos/SDL_riscossprite.c b/vs/sdl/src/video/riscos/SDL_riscossprite.c similarity index 100% rename from vs2015/sdl/src/video/riscos/SDL_riscossprite.c rename to vs/sdl/src/video/riscos/SDL_riscossprite.c diff --git a/vs2015/sdl/src/video/riscos/SDL_riscostask.c b/vs/sdl/src/video/riscos/SDL_riscostask.c similarity index 100% rename from vs2015/sdl/src/video/riscos/SDL_riscostask.c rename to vs/sdl/src/video/riscos/SDL_riscostask.c diff --git a/vs2015/sdl/src/video/riscos/SDL_riscostask.h b/vs/sdl/src/video/riscos/SDL_riscostask.h similarity index 100% rename from vs2015/sdl/src/video/riscos/SDL_riscostask.h rename to vs/sdl/src/video/riscos/SDL_riscostask.h diff --git a/vs2015/sdl/src/video/riscos/SDL_riscosvideo.c b/vs/sdl/src/video/riscos/SDL_riscosvideo.c similarity index 100% rename from vs2015/sdl/src/video/riscos/SDL_riscosvideo.c rename to vs/sdl/src/video/riscos/SDL_riscosvideo.c diff --git a/vs2015/sdl/src/video/riscos/SDL_riscosvideo.h b/vs/sdl/src/video/riscos/SDL_riscosvideo.h similarity index 100% rename from vs2015/sdl/src/video/riscos/SDL_riscosvideo.h rename to vs/sdl/src/video/riscos/SDL_riscosvideo.h diff --git a/vs2015/sdl/src/video/riscos/SDL_wimppoll.c b/vs/sdl/src/video/riscos/SDL_wimppoll.c similarity index 100% rename from vs2015/sdl/src/video/riscos/SDL_wimppoll.c rename to vs/sdl/src/video/riscos/SDL_wimppoll.c diff --git a/vs2015/sdl/src/video/riscos/SDL_wimpvideo.c b/vs/sdl/src/video/riscos/SDL_wimpvideo.c similarity index 100% rename from vs2015/sdl/src/video/riscos/SDL_wimpvideo.c rename to vs/sdl/src/video/riscos/SDL_wimpvideo.c diff --git a/vs2015/sdl/src/video/svga/SDL_svgaevents.c b/vs/sdl/src/video/svga/SDL_svgaevents.c similarity index 100% rename from vs2015/sdl/src/video/svga/SDL_svgaevents.c rename to vs/sdl/src/video/svga/SDL_svgaevents.c diff --git a/vs2015/sdl/src/video/svga/SDL_svgaevents_c.h b/vs/sdl/src/video/svga/SDL_svgaevents_c.h similarity index 100% rename from vs2015/sdl/src/video/svga/SDL_svgaevents_c.h rename to vs/sdl/src/video/svga/SDL_svgaevents_c.h diff --git a/vs2015/sdl/src/video/svga/SDL_svgamouse.c b/vs/sdl/src/video/svga/SDL_svgamouse.c similarity index 100% rename from vs2015/sdl/src/video/svga/SDL_svgamouse.c rename to vs/sdl/src/video/svga/SDL_svgamouse.c diff --git a/vs2015/sdl/src/video/svga/SDL_svgamouse_c.h b/vs/sdl/src/video/svga/SDL_svgamouse_c.h similarity index 100% rename from vs2015/sdl/src/video/svga/SDL_svgamouse_c.h rename to vs/sdl/src/video/svga/SDL_svgamouse_c.h diff --git a/vs2015/sdl/src/video/svga/SDL_svgavideo.c b/vs/sdl/src/video/svga/SDL_svgavideo.c similarity index 100% rename from vs2015/sdl/src/video/svga/SDL_svgavideo.c rename to vs/sdl/src/video/svga/SDL_svgavideo.c diff --git a/vs2015/sdl/src/video/svga/SDL_svgavideo.h b/vs/sdl/src/video/svga/SDL_svgavideo.h similarity index 100% rename from vs2015/sdl/src/video/svga/SDL_svgavideo.h rename to vs/sdl/src/video/svga/SDL_svgavideo.h diff --git a/vs2015/sdl/src/video/symbian/EKA1/SDL_epocevents.cpp b/vs/sdl/src/video/symbian/EKA1/SDL_epocevents.cpp similarity index 100% rename from vs2015/sdl/src/video/symbian/EKA1/SDL_epocevents.cpp rename to vs/sdl/src/video/symbian/EKA1/SDL_epocevents.cpp diff --git a/vs2015/sdl/src/video/symbian/EKA1/SDL_epocvideo.cpp b/vs/sdl/src/video/symbian/EKA1/SDL_epocvideo.cpp similarity index 100% rename from vs2015/sdl/src/video/symbian/EKA1/SDL_epocvideo.cpp rename to vs/sdl/src/video/symbian/EKA1/SDL_epocvideo.cpp diff --git a/vs2015/sdl/src/video/symbian/EKA1/SDL_epocvideo.h b/vs/sdl/src/video/symbian/EKA1/SDL_epocvideo.h similarity index 100% rename from vs2015/sdl/src/video/symbian/EKA1/SDL_epocvideo.h rename to vs/sdl/src/video/symbian/EKA1/SDL_epocvideo.h diff --git a/vs2015/sdl/src/video/symbian/EKA2/SDL_epocevents.cpp b/vs/sdl/src/video/symbian/EKA2/SDL_epocevents.cpp similarity index 100% rename from vs2015/sdl/src/video/symbian/EKA2/SDL_epocevents.cpp rename to vs/sdl/src/video/symbian/EKA2/SDL_epocevents.cpp diff --git a/vs2015/sdl/src/video/symbian/EKA2/SDL_epocvideo.cpp b/vs/sdl/src/video/symbian/EKA2/SDL_epocvideo.cpp similarity index 100% rename from vs2015/sdl/src/video/symbian/EKA2/SDL_epocvideo.cpp rename to vs/sdl/src/video/symbian/EKA2/SDL_epocvideo.cpp diff --git a/vs2015/sdl/src/video/symbian/EKA2/SDL_epocvideo.h b/vs/sdl/src/video/symbian/EKA2/SDL_epocvideo.h similarity index 100% rename from vs2015/sdl/src/video/symbian/EKA2/SDL_epocvideo.h rename to vs/sdl/src/video/symbian/EKA2/SDL_epocvideo.h diff --git a/vs2015/sdl/src/video/symbian/EKA2/dsa.cpp b/vs/sdl/src/video/symbian/EKA2/dsa.cpp similarity index 100% rename from vs2015/sdl/src/video/symbian/EKA2/dsa.cpp rename to vs/sdl/src/video/symbian/EKA2/dsa.cpp diff --git a/vs2015/sdl/src/video/symbian/EKA2/dsa_new.cpp b/vs/sdl/src/video/symbian/EKA2/dsa_new.cpp similarity index 100% rename from vs2015/sdl/src/video/symbian/EKA2/dsa_new.cpp rename to vs/sdl/src/video/symbian/EKA2/dsa_new.cpp diff --git a/vs2015/sdl/src/video/symbian/EKA2/dsa_old.cpp b/vs/sdl/src/video/symbian/EKA2/dsa_old.cpp similarity index 100% rename from vs2015/sdl/src/video/symbian/EKA2/dsa_old.cpp rename to vs/sdl/src/video/symbian/EKA2/dsa_old.cpp diff --git a/vs2015/sdl/src/video/symbian/SDL_epocevents_c.h b/vs/sdl/src/video/symbian/SDL_epocevents_c.h similarity index 100% rename from vs2015/sdl/src/video/symbian/SDL_epocevents_c.h rename to vs/sdl/src/video/symbian/SDL_epocevents_c.h diff --git a/vs2015/sdl/src/video/vgl/SDL_vglevents.c b/vs/sdl/src/video/vgl/SDL_vglevents.c similarity index 100% rename from vs2015/sdl/src/video/vgl/SDL_vglevents.c rename to vs/sdl/src/video/vgl/SDL_vglevents.c diff --git a/vs2015/sdl/src/video/vgl/SDL_vglevents_c.h b/vs/sdl/src/video/vgl/SDL_vglevents_c.h similarity index 100% rename from vs2015/sdl/src/video/vgl/SDL_vglevents_c.h rename to vs/sdl/src/video/vgl/SDL_vglevents_c.h diff --git a/vs2015/sdl/src/video/vgl/SDL_vglmouse.c b/vs/sdl/src/video/vgl/SDL_vglmouse.c similarity index 100% rename from vs2015/sdl/src/video/vgl/SDL_vglmouse.c rename to vs/sdl/src/video/vgl/SDL_vglmouse.c diff --git a/vs2015/sdl/src/video/vgl/SDL_vglmouse_c.h b/vs/sdl/src/video/vgl/SDL_vglmouse_c.h similarity index 100% rename from vs2015/sdl/src/video/vgl/SDL_vglmouse_c.h rename to vs/sdl/src/video/vgl/SDL_vglmouse_c.h diff --git a/vs2015/sdl/src/video/vgl/SDL_vglvideo.c b/vs/sdl/src/video/vgl/SDL_vglvideo.c similarity index 100% rename from vs2015/sdl/src/video/vgl/SDL_vglvideo.c rename to vs/sdl/src/video/vgl/SDL_vglvideo.c diff --git a/vs2015/sdl/src/video/vgl/SDL_vglvideo.h b/vs/sdl/src/video/vgl/SDL_vglvideo.h similarity index 100% rename from vs2015/sdl/src/video/vgl/SDL_vglvideo.h rename to vs/sdl/src/video/vgl/SDL_vglvideo.h diff --git a/vs2015/sdl/src/video/wincommon/SDL_lowvideo.h b/vs/sdl/src/video/wincommon/SDL_lowvideo.h similarity index 100% rename from vs2015/sdl/src/video/wincommon/SDL_lowvideo.h rename to vs/sdl/src/video/wincommon/SDL_lowvideo.h diff --git a/vs2015/sdl/src/video/wincommon/SDL_sysevents.c b/vs/sdl/src/video/wincommon/SDL_sysevents.c similarity index 100% rename from vs2015/sdl/src/video/wincommon/SDL_sysevents.c rename to vs/sdl/src/video/wincommon/SDL_sysevents.c diff --git a/vs2015/sdl/src/video/wincommon/SDL_sysmouse.c b/vs/sdl/src/video/wincommon/SDL_sysmouse.c similarity index 100% rename from vs2015/sdl/src/video/wincommon/SDL_sysmouse.c rename to vs/sdl/src/video/wincommon/SDL_sysmouse.c diff --git a/vs2015/sdl/src/video/wincommon/SDL_sysmouse_c.h b/vs/sdl/src/video/wincommon/SDL_sysmouse_c.h similarity index 100% rename from vs2015/sdl/src/video/wincommon/SDL_sysmouse_c.h rename to vs/sdl/src/video/wincommon/SDL_sysmouse_c.h diff --git a/vs2015/sdl/src/video/wincommon/SDL_syswm.c b/vs/sdl/src/video/wincommon/SDL_syswm.c similarity index 100% rename from vs2015/sdl/src/video/wincommon/SDL_syswm.c rename to vs/sdl/src/video/wincommon/SDL_syswm.c diff --git a/vs2015/sdl/src/video/wincommon/SDL_syswm_c.h b/vs/sdl/src/video/wincommon/SDL_syswm_c.h similarity index 100% rename from vs2015/sdl/src/video/wincommon/SDL_syswm_c.h rename to vs/sdl/src/video/wincommon/SDL_syswm_c.h diff --git a/vs2015/sdl/src/video/wincommon/SDL_wingl.c b/vs/sdl/src/video/wincommon/SDL_wingl.c similarity index 100% rename from vs2015/sdl/src/video/wincommon/SDL_wingl.c rename to vs/sdl/src/video/wincommon/SDL_wingl.c diff --git a/vs2015/sdl/src/video/wincommon/SDL_wingl_c.h b/vs/sdl/src/video/wincommon/SDL_wingl_c.h similarity index 100% rename from vs2015/sdl/src/video/wincommon/SDL_wingl_c.h rename to vs/sdl/src/video/wincommon/SDL_wingl_c.h diff --git a/vs2015/sdl/src/video/wincommon/wmmsg.h b/vs/sdl/src/video/wincommon/wmmsg.h similarity index 100% rename from vs2015/sdl/src/video/wincommon/wmmsg.h rename to vs/sdl/src/video/wincommon/wmmsg.h diff --git a/vs2015/sdl/src/video/windib/SDL_dibevents.c b/vs/sdl/src/video/windib/SDL_dibevents.c similarity index 100% rename from vs2015/sdl/src/video/windib/SDL_dibevents.c rename to vs/sdl/src/video/windib/SDL_dibevents.c diff --git a/vs2015/sdl/src/video/windib/SDL_dibevents_c.h b/vs/sdl/src/video/windib/SDL_dibevents_c.h similarity index 100% rename from vs2015/sdl/src/video/windib/SDL_dibevents_c.h rename to vs/sdl/src/video/windib/SDL_dibevents_c.h diff --git a/vs2015/sdl/src/video/windib/SDL_dibvideo.c b/vs/sdl/src/video/windib/SDL_dibvideo.c similarity index 100% rename from vs2015/sdl/src/video/windib/SDL_dibvideo.c rename to vs/sdl/src/video/windib/SDL_dibvideo.c diff --git a/vs2015/sdl/src/video/windib/SDL_dibvideo.h b/vs/sdl/src/video/windib/SDL_dibvideo.h similarity index 100% rename from vs2015/sdl/src/video/windib/SDL_dibvideo.h rename to vs/sdl/src/video/windib/SDL_dibvideo.h diff --git a/vs2015/sdl/src/video/windib/SDL_gapidibvideo.h b/vs/sdl/src/video/windib/SDL_gapidibvideo.h similarity index 100% rename from vs2015/sdl/src/video/windib/SDL_gapidibvideo.h rename to vs/sdl/src/video/windib/SDL_gapidibvideo.h diff --git a/vs2015/sdl/src/video/windib/SDL_multimon.c b/vs/sdl/src/video/windib/SDL_multimon.c similarity index 100% rename from vs2015/sdl/src/video/windib/SDL_multimon.c rename to vs/sdl/src/video/windib/SDL_multimon.c diff --git a/vs2015/sdl/src/video/windib/SDL_vkeys.h b/vs/sdl/src/video/windib/SDL_vkeys.h similarity index 100% rename from vs2015/sdl/src/video/windib/SDL_vkeys.h rename to vs/sdl/src/video/windib/SDL_vkeys.h diff --git a/vs2015/sdl/src/video/windx5/SDL_dx5events.c b/vs/sdl/src/video/windx5/SDL_dx5events.c similarity index 100% rename from vs2015/sdl/src/video/windx5/SDL_dx5events.c rename to vs/sdl/src/video/windx5/SDL_dx5events.c diff --git a/vs2015/sdl/src/video/windx5/SDL_dx5events_c.h b/vs/sdl/src/video/windx5/SDL_dx5events_c.h similarity index 100% rename from vs2015/sdl/src/video/windx5/SDL_dx5events_c.h rename to vs/sdl/src/video/windx5/SDL_dx5events_c.h diff --git a/vs2015/sdl/src/video/windx5/SDL_dx5video.c b/vs/sdl/src/video/windx5/SDL_dx5video.c similarity index 100% rename from vs2015/sdl/src/video/windx5/SDL_dx5video.c rename to vs/sdl/src/video/windx5/SDL_dx5video.c diff --git a/vs2015/sdl/src/video/windx5/SDL_dx5video.h b/vs/sdl/src/video/windx5/SDL_dx5video.h similarity index 100% rename from vs2015/sdl/src/video/windx5/SDL_dx5video.h rename to vs/sdl/src/video/windx5/SDL_dx5video.h diff --git a/vs2015/sdl/src/video/windx5/SDL_dx5yuv.c b/vs/sdl/src/video/windx5/SDL_dx5yuv.c similarity index 100% rename from vs2015/sdl/src/video/windx5/SDL_dx5yuv.c rename to vs/sdl/src/video/windx5/SDL_dx5yuv.c diff --git a/vs2015/sdl/src/video/windx5/SDL_dx5yuv_c.h b/vs/sdl/src/video/windx5/SDL_dx5yuv_c.h similarity index 100% rename from vs2015/sdl/src/video/windx5/SDL_dx5yuv_c.h rename to vs/sdl/src/video/windx5/SDL_dx5yuv_c.h diff --git a/vs2015/sdl/src/video/windx5/directx.h b/vs/sdl/src/video/windx5/directx.h similarity index 100% rename from vs2015/sdl/src/video/windx5/directx.h rename to vs/sdl/src/video/windx5/directx.h diff --git a/vs2015/sdl/src/video/wscons/SDL_wsconsevents.c b/vs/sdl/src/video/wscons/SDL_wsconsevents.c similarity index 100% rename from vs2015/sdl/src/video/wscons/SDL_wsconsevents.c rename to vs/sdl/src/video/wscons/SDL_wsconsevents.c diff --git a/vs2015/sdl/src/video/wscons/SDL_wsconsevents_c.h b/vs/sdl/src/video/wscons/SDL_wsconsevents_c.h similarity index 100% rename from vs2015/sdl/src/video/wscons/SDL_wsconsevents_c.h rename to vs/sdl/src/video/wscons/SDL_wsconsevents_c.h diff --git a/vs2015/sdl/src/video/wscons/SDL_wsconsmouse.c b/vs/sdl/src/video/wscons/SDL_wsconsmouse.c similarity index 100% rename from vs2015/sdl/src/video/wscons/SDL_wsconsmouse.c rename to vs/sdl/src/video/wscons/SDL_wsconsmouse.c diff --git a/vs2015/sdl/src/video/wscons/SDL_wsconsmouse_c.h b/vs/sdl/src/video/wscons/SDL_wsconsmouse_c.h similarity index 100% rename from vs2015/sdl/src/video/wscons/SDL_wsconsmouse_c.h rename to vs/sdl/src/video/wscons/SDL_wsconsmouse_c.h diff --git a/vs2015/sdl/src/video/wscons/SDL_wsconsvideo.c b/vs/sdl/src/video/wscons/SDL_wsconsvideo.c similarity index 100% rename from vs2015/sdl/src/video/wscons/SDL_wsconsvideo.c rename to vs/sdl/src/video/wscons/SDL_wsconsvideo.c diff --git a/vs2015/sdl/src/video/wscons/SDL_wsconsvideo.h b/vs/sdl/src/video/wscons/SDL_wsconsvideo.h similarity index 100% rename from vs2015/sdl/src/video/wscons/SDL_wsconsvideo.h rename to vs/sdl/src/video/wscons/SDL_wsconsvideo.h diff --git a/vs2015/sdl/src/video/x11/SDL_x11dga.c b/vs/sdl/src/video/x11/SDL_x11dga.c similarity index 100% rename from vs2015/sdl/src/video/x11/SDL_x11dga.c rename to vs/sdl/src/video/x11/SDL_x11dga.c diff --git a/vs2015/sdl/src/video/x11/SDL_x11dga_c.h b/vs/sdl/src/video/x11/SDL_x11dga_c.h similarity index 100% rename from vs2015/sdl/src/video/x11/SDL_x11dga_c.h rename to vs/sdl/src/video/x11/SDL_x11dga_c.h diff --git a/vs2015/sdl/src/video/x11/SDL_x11dyn.c b/vs/sdl/src/video/x11/SDL_x11dyn.c similarity index 100% rename from vs2015/sdl/src/video/x11/SDL_x11dyn.c rename to vs/sdl/src/video/x11/SDL_x11dyn.c diff --git a/vs2015/sdl/src/video/x11/SDL_x11dyn.h b/vs/sdl/src/video/x11/SDL_x11dyn.h similarity index 100% rename from vs2015/sdl/src/video/x11/SDL_x11dyn.h rename to vs/sdl/src/video/x11/SDL_x11dyn.h diff --git a/vs2015/sdl/src/video/x11/SDL_x11events.c b/vs/sdl/src/video/x11/SDL_x11events.c similarity index 100% rename from vs2015/sdl/src/video/x11/SDL_x11events.c rename to vs/sdl/src/video/x11/SDL_x11events.c diff --git a/vs2015/sdl/src/video/x11/SDL_x11events_c.h b/vs/sdl/src/video/x11/SDL_x11events_c.h similarity index 100% rename from vs2015/sdl/src/video/x11/SDL_x11events_c.h rename to vs/sdl/src/video/x11/SDL_x11events_c.h diff --git a/vs2015/sdl/src/video/x11/SDL_x11gamma.c b/vs/sdl/src/video/x11/SDL_x11gamma.c similarity index 100% rename from vs2015/sdl/src/video/x11/SDL_x11gamma.c rename to vs/sdl/src/video/x11/SDL_x11gamma.c diff --git a/vs2015/sdl/src/video/x11/SDL_x11gamma_c.h b/vs/sdl/src/video/x11/SDL_x11gamma_c.h similarity index 100% rename from vs2015/sdl/src/video/x11/SDL_x11gamma_c.h rename to vs/sdl/src/video/x11/SDL_x11gamma_c.h diff --git a/vs2015/sdl/src/video/x11/SDL_x11gl.c b/vs/sdl/src/video/x11/SDL_x11gl.c similarity index 100% rename from vs2015/sdl/src/video/x11/SDL_x11gl.c rename to vs/sdl/src/video/x11/SDL_x11gl.c diff --git a/vs2015/sdl/src/video/x11/SDL_x11gl_c.h b/vs/sdl/src/video/x11/SDL_x11gl_c.h similarity index 100% rename from vs2015/sdl/src/video/x11/SDL_x11gl_c.h rename to vs/sdl/src/video/x11/SDL_x11gl_c.h diff --git a/vs2015/sdl/src/video/x11/SDL_x11image.c b/vs/sdl/src/video/x11/SDL_x11image.c similarity index 100% rename from vs2015/sdl/src/video/x11/SDL_x11image.c rename to vs/sdl/src/video/x11/SDL_x11image.c diff --git a/vs2015/sdl/src/video/x11/SDL_x11image_c.h b/vs/sdl/src/video/x11/SDL_x11image_c.h similarity index 100% rename from vs2015/sdl/src/video/x11/SDL_x11image_c.h rename to vs/sdl/src/video/x11/SDL_x11image_c.h diff --git a/vs2015/sdl/src/video/x11/SDL_x11modes.c b/vs/sdl/src/video/x11/SDL_x11modes.c similarity index 100% rename from vs2015/sdl/src/video/x11/SDL_x11modes.c rename to vs/sdl/src/video/x11/SDL_x11modes.c diff --git a/vs2015/sdl/src/video/x11/SDL_x11modes_c.h b/vs/sdl/src/video/x11/SDL_x11modes_c.h similarity index 100% rename from vs2015/sdl/src/video/x11/SDL_x11modes_c.h rename to vs/sdl/src/video/x11/SDL_x11modes_c.h diff --git a/vs2015/sdl/src/video/x11/SDL_x11mouse.c b/vs/sdl/src/video/x11/SDL_x11mouse.c similarity index 100% rename from vs2015/sdl/src/video/x11/SDL_x11mouse.c rename to vs/sdl/src/video/x11/SDL_x11mouse.c diff --git a/vs2015/sdl/src/video/x11/SDL_x11mouse_c.h b/vs/sdl/src/video/x11/SDL_x11mouse_c.h similarity index 100% rename from vs2015/sdl/src/video/x11/SDL_x11mouse_c.h rename to vs/sdl/src/video/x11/SDL_x11mouse_c.h diff --git a/vs2015/sdl/src/video/x11/SDL_x11sym.h b/vs/sdl/src/video/x11/SDL_x11sym.h similarity index 100% rename from vs2015/sdl/src/video/x11/SDL_x11sym.h rename to vs/sdl/src/video/x11/SDL_x11sym.h diff --git a/vs2015/sdl/src/video/x11/SDL_x11video.c b/vs/sdl/src/video/x11/SDL_x11video.c similarity index 100% rename from vs2015/sdl/src/video/x11/SDL_x11video.c rename to vs/sdl/src/video/x11/SDL_x11video.c diff --git a/vs2015/sdl/src/video/x11/SDL_x11video.h b/vs/sdl/src/video/x11/SDL_x11video.h similarity index 100% rename from vs2015/sdl/src/video/x11/SDL_x11video.h rename to vs/sdl/src/video/x11/SDL_x11video.h diff --git a/vs2015/sdl/src/video/x11/SDL_x11wm.c b/vs/sdl/src/video/x11/SDL_x11wm.c similarity index 100% rename from vs2015/sdl/src/video/x11/SDL_x11wm.c rename to vs/sdl/src/video/x11/SDL_x11wm.c diff --git a/vs2015/sdl/src/video/x11/SDL_x11wm_c.h b/vs/sdl/src/video/x11/SDL_x11wm_c.h similarity index 100% rename from vs2015/sdl/src/video/x11/SDL_x11wm_c.h rename to vs/sdl/src/video/x11/SDL_x11wm_c.h diff --git a/vs2015/sdl/src/video/x11/SDL_x11yuv.c b/vs/sdl/src/video/x11/SDL_x11yuv.c similarity index 100% rename from vs2015/sdl/src/video/x11/SDL_x11yuv.c rename to vs/sdl/src/video/x11/SDL_x11yuv.c diff --git a/vs2015/sdl/src/video/x11/SDL_x11yuv_c.h b/vs/sdl/src/video/x11/SDL_x11yuv_c.h similarity index 100% rename from vs2015/sdl/src/video/x11/SDL_x11yuv_c.h rename to vs/sdl/src/video/x11/SDL_x11yuv_c.h diff --git a/vs2015/sdl/src/video/xbios/SDL_xbios.c b/vs/sdl/src/video/xbios/SDL_xbios.c similarity index 100% rename from vs2015/sdl/src/video/xbios/SDL_xbios.c rename to vs/sdl/src/video/xbios/SDL_xbios.c diff --git a/vs2015/sdl/src/video/xbios/SDL_xbios.h b/vs/sdl/src/video/xbios/SDL_xbios.h similarity index 100% rename from vs2015/sdl/src/video/xbios/SDL_xbios.h rename to vs/sdl/src/video/xbios/SDL_xbios.h diff --git a/vs2015/sdl/src/video/xbios/SDL_xbios_blowup.c b/vs/sdl/src/video/xbios/SDL_xbios_blowup.c similarity index 100% rename from vs2015/sdl/src/video/xbios/SDL_xbios_blowup.c rename to vs/sdl/src/video/xbios/SDL_xbios_blowup.c diff --git a/vs2015/sdl/src/video/xbios/SDL_xbios_blowup.h b/vs/sdl/src/video/xbios/SDL_xbios_blowup.h similarity index 100% rename from vs2015/sdl/src/video/xbios/SDL_xbios_blowup.h rename to vs/sdl/src/video/xbios/SDL_xbios_blowup.h diff --git a/vs2015/sdl/src/video/xbios/SDL_xbios_centscreen.c b/vs/sdl/src/video/xbios/SDL_xbios_centscreen.c similarity index 100% rename from vs2015/sdl/src/video/xbios/SDL_xbios_centscreen.c rename to vs/sdl/src/video/xbios/SDL_xbios_centscreen.c diff --git a/vs2015/sdl/src/video/xbios/SDL_xbios_centscreen.h b/vs/sdl/src/video/xbios/SDL_xbios_centscreen.h similarity index 100% rename from vs2015/sdl/src/video/xbios/SDL_xbios_centscreen.h rename to vs/sdl/src/video/xbios/SDL_xbios_centscreen.h diff --git a/vs2015/sdl/src/video/xbios/SDL_xbios_milan.c b/vs/sdl/src/video/xbios/SDL_xbios_milan.c similarity index 100% rename from vs2015/sdl/src/video/xbios/SDL_xbios_milan.c rename to vs/sdl/src/video/xbios/SDL_xbios_milan.c diff --git a/vs2015/sdl/src/video/xbios/SDL_xbios_milan.h b/vs/sdl/src/video/xbios/SDL_xbios_milan.h similarity index 100% rename from vs2015/sdl/src/video/xbios/SDL_xbios_milan.h rename to vs/sdl/src/video/xbios/SDL_xbios_milan.h diff --git a/vs2015/sdl/src/video/xbios/SDL_xbios_sb3.c b/vs/sdl/src/video/xbios/SDL_xbios_sb3.c similarity index 100% rename from vs2015/sdl/src/video/xbios/SDL_xbios_sb3.c rename to vs/sdl/src/video/xbios/SDL_xbios_sb3.c diff --git a/vs2015/sdl/src/video/xbios/SDL_xbios_sb3.h b/vs/sdl/src/video/xbios/SDL_xbios_sb3.h similarity index 100% rename from vs2015/sdl/src/video/xbios/SDL_xbios_sb3.h rename to vs/sdl/src/video/xbios/SDL_xbios_sb3.h diff --git a/vs2015/sdl/src/video/xbios/SDL_xbios_tveille.c b/vs/sdl/src/video/xbios/SDL_xbios_tveille.c similarity index 100% rename from vs2015/sdl/src/video/xbios/SDL_xbios_tveille.c rename to vs/sdl/src/video/xbios/SDL_xbios_tveille.c diff --git a/vs2015/sdl/src/video/xbios/SDL_xbios_tveille.h b/vs/sdl/src/video/xbios/SDL_xbios_tveille.h similarity index 100% rename from vs2015/sdl/src/video/xbios/SDL_xbios_tveille.h rename to vs/sdl/src/video/xbios/SDL_xbios_tveille.h diff --git a/vs2015/sdl2/Android.mk b/vs/sdl2/Android.mk similarity index 100% rename from vs2015/sdl2/Android.mk rename to vs/sdl2/Android.mk diff --git a/vs2015/sdl2/BUGS.txt b/vs/sdl2/BUGS.txt similarity index 100% rename from vs2015/sdl2/BUGS.txt rename to vs/sdl2/BUGS.txt diff --git a/vs2015/sdl2/CMakeLists.txt b/vs/sdl2/CMakeLists.txt similarity index 100% rename from vs2015/sdl2/CMakeLists.txt rename to vs/sdl2/CMakeLists.txt diff --git a/vs2015/sdl2/COPYING.txt b/vs/sdl2/COPYING.txt similarity index 100% rename from vs2015/sdl2/COPYING.txt rename to vs/sdl2/COPYING.txt diff --git a/vs2015/sdl2/CREDITS.txt b/vs/sdl2/CREDITS.txt similarity index 100% rename from vs2015/sdl2/CREDITS.txt rename to vs/sdl2/CREDITS.txt diff --git a/vs2015/sdl2/INSTALL.txt b/vs/sdl2/INSTALL.txt similarity index 100% rename from vs2015/sdl2/INSTALL.txt rename to vs/sdl2/INSTALL.txt diff --git a/vs2015/sdl2/Makefile.in b/vs/sdl2/Makefile.in similarity index 100% rename from vs2015/sdl2/Makefile.in rename to vs/sdl2/Makefile.in diff --git a/vs2015/sdl2/Makefile.minimal b/vs/sdl2/Makefile.minimal similarity index 100% rename from vs2015/sdl2/Makefile.minimal rename to vs/sdl2/Makefile.minimal diff --git a/vs2015/sdl2/Makefile.os2 b/vs/sdl2/Makefile.os2 similarity index 100% rename from vs2015/sdl2/Makefile.os2 rename to vs/sdl2/Makefile.os2 diff --git a/vs2015/sdl2/Makefile.pandora b/vs/sdl2/Makefile.pandora similarity index 100% rename from vs2015/sdl2/Makefile.pandora rename to vs/sdl2/Makefile.pandora diff --git a/vs2015/sdl2/Makefile.psp b/vs/sdl2/Makefile.psp similarity index 100% rename from vs2015/sdl2/Makefile.psp rename to vs/sdl2/Makefile.psp diff --git a/vs2015/sdl2/Makefile.wiz b/vs/sdl2/Makefile.wiz similarity index 100% rename from vs2015/sdl2/Makefile.wiz rename to vs/sdl2/Makefile.wiz diff --git a/vs2015/sdl2/README-SDL.txt b/vs/sdl2/README-SDL.txt similarity index 100% rename from vs2015/sdl2/README-SDL.txt rename to vs/sdl2/README-SDL.txt diff --git a/vs2015/sdl2/README.txt b/vs/sdl2/README.txt similarity index 100% rename from vs2015/sdl2/README.txt rename to vs/sdl2/README.txt diff --git a/vs2015/sdl2/SDL2.spec b/vs/sdl2/SDL2.spec similarity index 100% rename from vs2015/sdl2/SDL2.spec rename to vs/sdl2/SDL2.spec diff --git a/vs2015/sdl2/SDL2.spec.in b/vs/sdl2/SDL2.spec.in similarity index 100% rename from vs2015/sdl2/SDL2.spec.in rename to vs/sdl2/SDL2.spec.in diff --git a/vs2015/sdl2/SDL2Config.cmake b/vs/sdl2/SDL2Config.cmake similarity index 100% rename from vs2015/sdl2/SDL2Config.cmake rename to vs/sdl2/SDL2Config.cmake diff --git a/vs2015/sdl2/TODO.txt b/vs/sdl2/TODO.txt similarity index 100% rename from vs2015/sdl2/TODO.txt rename to vs/sdl2/TODO.txt diff --git a/vs2015/sdl2/VisualC-WinRT/SDL2-WinRT.nuspec b/vs/sdl2/VisualC-WinRT/SDL2-WinRT.nuspec similarity index 100% rename from vs2015/sdl2/VisualC-WinRT/SDL2-WinRT.nuspec rename to vs/sdl2/VisualC-WinRT/SDL2-WinRT.nuspec diff --git a/vs2015/sdl2/VisualC-WinRT/SDL2-WinRT.targets b/vs/sdl2/VisualC-WinRT/SDL2-WinRT.targets similarity index 100% rename from vs2015/sdl2/VisualC-WinRT/SDL2-WinRT.targets rename to vs/sdl2/VisualC-WinRT/SDL2-WinRT.targets diff --git a/vs2015/sdl2/VisualC-WinRT/SDL2main-WinRT-NonXAML.nuspec b/vs/sdl2/VisualC-WinRT/SDL2main-WinRT-NonXAML.nuspec similarity index 100% rename from vs2015/sdl2/VisualC-WinRT/SDL2main-WinRT-NonXAML.nuspec rename to vs/sdl2/VisualC-WinRT/SDL2main-WinRT-NonXAML.nuspec diff --git a/vs2015/sdl2/VisualC-WinRT/SDL2main-WinRT-NonXAML.targets b/vs/sdl2/VisualC-WinRT/SDL2main-WinRT-NonXAML.targets similarity index 100% rename from vs2015/sdl2/VisualC-WinRT/SDL2main-WinRT-NonXAML.targets rename to vs/sdl2/VisualC-WinRT/SDL2main-WinRT-NonXAML.targets diff --git a/vs2015/sdl2/VisualC-WinRT/UWP_VS2015/SDL-UWP.sln b/vs/sdl2/VisualC-WinRT/UWP_VS2015/SDL-UWP.sln similarity index 100% rename from vs2015/sdl2/VisualC-WinRT/UWP_VS2015/SDL-UWP.sln rename to vs/sdl2/VisualC-WinRT/UWP_VS2015/SDL-UWP.sln diff --git a/vs2015/sdl2/VisualC-WinRT/UWP_VS2015/SDL-UWP.vcxproj b/vs/sdl2/VisualC-WinRT/UWP_VS2015/SDL-UWP.vcxproj similarity index 100% rename from vs2015/sdl2/VisualC-WinRT/UWP_VS2015/SDL-UWP.vcxproj rename to vs/sdl2/VisualC-WinRT/UWP_VS2015/SDL-UWP.vcxproj diff --git a/vs2015/sdl2/VisualC-WinRT/UWP_VS2015/SDL-UWP.vcxproj.filters b/vs/sdl2/VisualC-WinRT/UWP_VS2015/SDL-UWP.vcxproj.filters similarity index 100% rename from vs2015/sdl2/VisualC-WinRT/UWP_VS2015/SDL-UWP.vcxproj.filters rename to vs/sdl2/VisualC-WinRT/UWP_VS2015/SDL-UWP.vcxproj.filters diff --git a/vs2015/sdl2/VisualC-WinRT/WinPhone81_VS2013/SDL-WinPhone81.sln b/vs/sdl2/VisualC-WinRT/WinPhone81_VS2013/SDL-WinPhone81.sln similarity index 100% rename from vs2015/sdl2/VisualC-WinRT/WinPhone81_VS2013/SDL-WinPhone81.sln rename to vs/sdl2/VisualC-WinRT/WinPhone81_VS2013/SDL-WinPhone81.sln diff --git a/vs2015/sdl2/VisualC-WinRT/WinPhone81_VS2013/SDL-WinPhone81.vcxproj b/vs/sdl2/VisualC-WinRT/WinPhone81_VS2013/SDL-WinPhone81.vcxproj similarity index 100% rename from vs2015/sdl2/VisualC-WinRT/WinPhone81_VS2013/SDL-WinPhone81.vcxproj rename to vs/sdl2/VisualC-WinRT/WinPhone81_VS2013/SDL-WinPhone81.vcxproj diff --git a/vs2015/sdl2/VisualC-WinRT/WinPhone81_VS2013/SDL-WinPhone81.vcxproj.filters b/vs/sdl2/VisualC-WinRT/WinPhone81_VS2013/SDL-WinPhone81.vcxproj.filters similarity index 100% rename from vs2015/sdl2/VisualC-WinRT/WinPhone81_VS2013/SDL-WinPhone81.vcxproj.filters rename to vs/sdl2/VisualC-WinRT/WinPhone81_VS2013/SDL-WinPhone81.vcxproj.filters diff --git a/vs2015/sdl2/VisualC-WinRT/WinRT81_VS2013/SDL-WinRT81.sln b/vs/sdl2/VisualC-WinRT/WinRT81_VS2013/SDL-WinRT81.sln similarity index 100% rename from vs2015/sdl2/VisualC-WinRT/WinRT81_VS2013/SDL-WinRT81.sln rename to vs/sdl2/VisualC-WinRT/WinRT81_VS2013/SDL-WinRT81.sln diff --git a/vs2015/sdl2/VisualC-WinRT/WinRT81_VS2013/SDL-WinRT81.vcxproj b/vs/sdl2/VisualC-WinRT/WinRT81_VS2013/SDL-WinRT81.vcxproj similarity index 100% rename from vs2015/sdl2/VisualC-WinRT/WinRT81_VS2013/SDL-WinRT81.vcxproj rename to vs/sdl2/VisualC-WinRT/WinRT81_VS2013/SDL-WinRT81.vcxproj diff --git a/vs2015/sdl2/VisualC-WinRT/WinRT81_VS2013/SDL-WinRT81.vcxproj.filters b/vs/sdl2/VisualC-WinRT/WinRT81_VS2013/SDL-WinRT81.vcxproj.filters similarity index 100% rename from vs2015/sdl2/VisualC-WinRT/WinRT81_VS2013/SDL-WinRT81.vcxproj.filters rename to vs/sdl2/VisualC-WinRT/WinRT81_VS2013/SDL-WinRT81.vcxproj.filters diff --git a/vs2015/sdl2/VisualC-WinRT/tests/loopwave/Assets/Logo.png b/vs/sdl2/VisualC-WinRT/tests/loopwave/Assets/Logo.png similarity index 100% rename from vs2015/sdl2/VisualC-WinRT/tests/loopwave/Assets/Logo.png rename to vs/sdl2/VisualC-WinRT/tests/loopwave/Assets/Logo.png diff --git a/vs2015/sdl2/VisualC-WinRT/tests/loopwave/Assets/SmallLogo.png b/vs/sdl2/VisualC-WinRT/tests/loopwave/Assets/SmallLogo.png similarity index 100% rename from vs2015/sdl2/VisualC-WinRT/tests/loopwave/Assets/SmallLogo.png rename to vs/sdl2/VisualC-WinRT/tests/loopwave/Assets/SmallLogo.png diff --git a/vs2015/sdl2/VisualC-WinRT/tests/loopwave/Assets/SplashScreen.png b/vs/sdl2/VisualC-WinRT/tests/loopwave/Assets/SplashScreen.png similarity index 100% rename from vs2015/sdl2/VisualC-WinRT/tests/loopwave/Assets/SplashScreen.png rename to vs/sdl2/VisualC-WinRT/tests/loopwave/Assets/SplashScreen.png diff --git a/vs2015/sdl2/VisualC-WinRT/tests/loopwave/Assets/StoreLogo.png b/vs/sdl2/VisualC-WinRT/tests/loopwave/Assets/StoreLogo.png similarity index 100% rename from vs2015/sdl2/VisualC-WinRT/tests/loopwave/Assets/StoreLogo.png rename to vs/sdl2/VisualC-WinRT/tests/loopwave/Assets/StoreLogo.png diff --git a/vs2015/sdl2/VisualC-WinRT/tests/loopwave/Package.appxmanifest b/vs/sdl2/VisualC-WinRT/tests/loopwave/Package.appxmanifest similarity index 100% rename from vs2015/sdl2/VisualC-WinRT/tests/loopwave/Package.appxmanifest rename to vs/sdl2/VisualC-WinRT/tests/loopwave/Package.appxmanifest diff --git a/vs2015/sdl2/VisualC-WinRT/tests/loopwave/loopwave_VS2012.vcxproj b/vs/sdl2/VisualC-WinRT/tests/loopwave/loopwave_VS2012.vcxproj similarity index 100% rename from vs2015/sdl2/VisualC-WinRT/tests/loopwave/loopwave_VS2012.vcxproj rename to vs/sdl2/VisualC-WinRT/tests/loopwave/loopwave_VS2012.vcxproj diff --git a/vs2015/sdl2/VisualC-WinRT/tests/testthread/Assets/Logo.png b/vs/sdl2/VisualC-WinRT/tests/testthread/Assets/Logo.png similarity index 100% rename from vs2015/sdl2/VisualC-WinRT/tests/testthread/Assets/Logo.png rename to vs/sdl2/VisualC-WinRT/tests/testthread/Assets/Logo.png diff --git a/vs2015/sdl2/VisualC-WinRT/tests/testthread/Assets/SmallLogo.png b/vs/sdl2/VisualC-WinRT/tests/testthread/Assets/SmallLogo.png similarity index 100% rename from vs2015/sdl2/VisualC-WinRT/tests/testthread/Assets/SmallLogo.png rename to vs/sdl2/VisualC-WinRT/tests/testthread/Assets/SmallLogo.png diff --git a/vs2015/sdl2/VisualC-WinRT/tests/testthread/Assets/SplashScreen.png b/vs/sdl2/VisualC-WinRT/tests/testthread/Assets/SplashScreen.png similarity index 100% rename from vs2015/sdl2/VisualC-WinRT/tests/testthread/Assets/SplashScreen.png rename to vs/sdl2/VisualC-WinRT/tests/testthread/Assets/SplashScreen.png diff --git a/vs2015/sdl2/VisualC-WinRT/tests/testthread/Assets/StoreLogo.png b/vs/sdl2/VisualC-WinRT/tests/testthread/Assets/StoreLogo.png similarity index 100% rename from vs2015/sdl2/VisualC-WinRT/tests/testthread/Assets/StoreLogo.png rename to vs/sdl2/VisualC-WinRT/tests/testthread/Assets/StoreLogo.png diff --git a/vs2015/sdl2/VisualC-WinRT/tests/testthread/Package.appxmanifest b/vs/sdl2/VisualC-WinRT/tests/testthread/Package.appxmanifest similarity index 100% rename from vs2015/sdl2/VisualC-WinRT/tests/testthread/Package.appxmanifest rename to vs/sdl2/VisualC-WinRT/tests/testthread/Package.appxmanifest diff --git a/vs2015/sdl2/VisualC-WinRT/tests/testthread/testthread_VS2012.vcxproj b/vs/sdl2/VisualC-WinRT/tests/testthread/testthread_VS2012.vcxproj similarity index 100% rename from vs2015/sdl2/VisualC-WinRT/tests/testthread/testthread_VS2012.vcxproj rename to vs/sdl2/VisualC-WinRT/tests/testthread/testthread_VS2012.vcxproj diff --git a/vs2015/sdl2/VisualC.html b/vs/sdl2/VisualC.html similarity index 100% rename from vs2015/sdl2/VisualC.html rename to vs/sdl2/VisualC.html diff --git a/vs2015/sdl2/VisualC/SDL.sln b/vs/sdl2/VisualC/SDL.sln similarity index 100% rename from vs2015/sdl2/VisualC/SDL.sln rename to vs/sdl2/VisualC/SDL.sln diff --git a/vs2015/sdl2/VisualC/SDL/SDL.vcxproj b/vs/sdl2/VisualC/SDL/SDL.vcxproj similarity index 100% rename from vs2015/sdl2/VisualC/SDL/SDL.vcxproj rename to vs/sdl2/VisualC/SDL/SDL.vcxproj diff --git a/vs2015/sdl2/VisualC/SDL/SDL.vcxproj.filters b/vs/sdl2/VisualC/SDL/SDL.vcxproj.filters similarity index 100% rename from vs2015/sdl2/VisualC/SDL/SDL.vcxproj.filters rename to vs/sdl2/VisualC/SDL/SDL.vcxproj.filters diff --git a/vs2015/sdl2/VisualC/SDLmain/SDLmain.vcxproj b/vs/sdl2/VisualC/SDLmain/SDLmain.vcxproj similarity index 100% rename from vs2015/sdl2/VisualC/SDLmain/SDLmain.vcxproj rename to vs/sdl2/VisualC/SDLmain/SDLmain.vcxproj diff --git a/vs2015/sdl2/VisualC/SDLtest/SDLtest.vcxproj b/vs/sdl2/VisualC/SDLtest/SDLtest.vcxproj similarity index 100% rename from vs2015/sdl2/VisualC/SDLtest/SDLtest.vcxproj rename to vs/sdl2/VisualC/SDLtest/SDLtest.vcxproj diff --git a/vs2015/sdl2/VisualC/clean.sh b/vs/sdl2/VisualC/clean.sh similarity index 100% rename from vs2015/sdl2/VisualC/clean.sh rename to vs/sdl2/VisualC/clean.sh diff --git a/vs2015/sdl2/VisualC/tests/checkkeys/checkkeys.vcxproj b/vs/sdl2/VisualC/tests/checkkeys/checkkeys.vcxproj similarity index 100% rename from vs2015/sdl2/VisualC/tests/checkkeys/checkkeys.vcxproj rename to vs/sdl2/VisualC/tests/checkkeys/checkkeys.vcxproj diff --git a/vs2015/sdl2/VisualC/tests/controllermap/controllermap.vcxproj b/vs/sdl2/VisualC/tests/controllermap/controllermap.vcxproj similarity index 100% rename from vs2015/sdl2/VisualC/tests/controllermap/controllermap.vcxproj rename to vs/sdl2/VisualC/tests/controllermap/controllermap.vcxproj diff --git a/vs2015/sdl2/VisualC/tests/loopwave/loopwave.vcxproj b/vs/sdl2/VisualC/tests/loopwave/loopwave.vcxproj similarity index 100% rename from vs2015/sdl2/VisualC/tests/loopwave/loopwave.vcxproj rename to vs/sdl2/VisualC/tests/loopwave/loopwave.vcxproj diff --git a/vs2015/sdl2/VisualC/tests/testatomic/testatomic.vcxproj b/vs/sdl2/VisualC/tests/testatomic/testatomic.vcxproj similarity index 100% rename from vs2015/sdl2/VisualC/tests/testatomic/testatomic.vcxproj rename to vs/sdl2/VisualC/tests/testatomic/testatomic.vcxproj diff --git a/vs2015/sdl2/VisualC/tests/testautomation/testautomation.vcxproj b/vs/sdl2/VisualC/tests/testautomation/testautomation.vcxproj similarity index 100% rename from vs2015/sdl2/VisualC/tests/testautomation/testautomation.vcxproj rename to vs/sdl2/VisualC/tests/testautomation/testautomation.vcxproj diff --git a/vs2015/sdl2/VisualC/tests/testdraw2/testdraw2.vcxproj b/vs/sdl2/VisualC/tests/testdraw2/testdraw2.vcxproj similarity index 100% rename from vs2015/sdl2/VisualC/tests/testdraw2/testdraw2.vcxproj rename to vs/sdl2/VisualC/tests/testdraw2/testdraw2.vcxproj diff --git a/vs2015/sdl2/VisualC/tests/testfile/testfile.vcxproj b/vs/sdl2/VisualC/tests/testfile/testfile.vcxproj similarity index 100% rename from vs2015/sdl2/VisualC/tests/testfile/testfile.vcxproj rename to vs/sdl2/VisualC/tests/testfile/testfile.vcxproj diff --git a/vs2015/sdl2/VisualC/tests/testgamecontroller/testgamecontroller.vcxproj b/vs/sdl2/VisualC/tests/testgamecontroller/testgamecontroller.vcxproj similarity index 100% rename from vs2015/sdl2/VisualC/tests/testgamecontroller/testgamecontroller.vcxproj rename to vs/sdl2/VisualC/tests/testgamecontroller/testgamecontroller.vcxproj diff --git a/vs2015/sdl2/VisualC/tests/testgesture/testgesture.vcxproj b/vs/sdl2/VisualC/tests/testgesture/testgesture.vcxproj similarity index 100% rename from vs2015/sdl2/VisualC/tests/testgesture/testgesture.vcxproj rename to vs/sdl2/VisualC/tests/testgesture/testgesture.vcxproj diff --git a/vs2015/sdl2/VisualC/tests/testgl2/testgl2.vcxproj b/vs/sdl2/VisualC/tests/testgl2/testgl2.vcxproj similarity index 100% rename from vs2015/sdl2/VisualC/tests/testgl2/testgl2.vcxproj rename to vs/sdl2/VisualC/tests/testgl2/testgl2.vcxproj diff --git a/vs2015/sdl2/VisualC/tests/testgles2/testgles2.vcxproj b/vs/sdl2/VisualC/tests/testgles2/testgles2.vcxproj similarity index 100% rename from vs2015/sdl2/VisualC/tests/testgles2/testgles2.vcxproj rename to vs/sdl2/VisualC/tests/testgles2/testgles2.vcxproj diff --git a/vs2015/sdl2/VisualC/tests/testjoystick/testjoystick.vcxproj b/vs/sdl2/VisualC/tests/testjoystick/testjoystick.vcxproj similarity index 100% rename from vs2015/sdl2/VisualC/tests/testjoystick/testjoystick.vcxproj rename to vs/sdl2/VisualC/tests/testjoystick/testjoystick.vcxproj diff --git a/vs2015/sdl2/VisualC/tests/testoverlay2/testoverlay2.vcxproj b/vs/sdl2/VisualC/tests/testoverlay2/testoverlay2.vcxproj similarity index 100% rename from vs2015/sdl2/VisualC/tests/testoverlay2/testoverlay2.vcxproj rename to vs/sdl2/VisualC/tests/testoverlay2/testoverlay2.vcxproj diff --git a/vs2015/sdl2/VisualC/tests/testplatform/testplatform.vcxproj b/vs/sdl2/VisualC/tests/testplatform/testplatform.vcxproj similarity index 100% rename from vs2015/sdl2/VisualC/tests/testplatform/testplatform.vcxproj rename to vs/sdl2/VisualC/tests/testplatform/testplatform.vcxproj diff --git a/vs2015/sdl2/VisualC/tests/testpower/testpower.vcxproj b/vs/sdl2/VisualC/tests/testpower/testpower.vcxproj similarity index 100% rename from vs2015/sdl2/VisualC/tests/testpower/testpower.vcxproj rename to vs/sdl2/VisualC/tests/testpower/testpower.vcxproj diff --git a/vs2015/sdl2/VisualC/tests/testrendertarget/testrendertarget.vcxproj b/vs/sdl2/VisualC/tests/testrendertarget/testrendertarget.vcxproj similarity index 100% rename from vs2015/sdl2/VisualC/tests/testrendertarget/testrendertarget.vcxproj rename to vs/sdl2/VisualC/tests/testrendertarget/testrendertarget.vcxproj diff --git a/vs2015/sdl2/VisualC/tests/testrumble/testrumble.vcxproj b/vs/sdl2/VisualC/tests/testrumble/testrumble.vcxproj similarity index 100% rename from vs2015/sdl2/VisualC/tests/testrumble/testrumble.vcxproj rename to vs/sdl2/VisualC/tests/testrumble/testrumble.vcxproj diff --git a/vs2015/sdl2/VisualC/tests/testscale/testscale.vcxproj b/vs/sdl2/VisualC/tests/testscale/testscale.vcxproj similarity index 100% rename from vs2015/sdl2/VisualC/tests/testscale/testscale.vcxproj rename to vs/sdl2/VisualC/tests/testscale/testscale.vcxproj diff --git a/vs2015/sdl2/VisualC/tests/testshape/testshape.vcxproj b/vs/sdl2/VisualC/tests/testshape/testshape.vcxproj similarity index 100% rename from vs2015/sdl2/VisualC/tests/testshape/testshape.vcxproj rename to vs/sdl2/VisualC/tests/testshape/testshape.vcxproj diff --git a/vs2015/sdl2/VisualC/tests/testsprite2/testsprite2.vcxproj b/vs/sdl2/VisualC/tests/testsprite2/testsprite2.vcxproj similarity index 100% rename from vs2015/sdl2/VisualC/tests/testsprite2/testsprite2.vcxproj rename to vs/sdl2/VisualC/tests/testsprite2/testsprite2.vcxproj diff --git a/vs2015/sdl2/VisualC/tests/testvulkan/testvulkan.vcxproj b/vs/sdl2/VisualC/tests/testvulkan/testvulkan.vcxproj similarity index 100% rename from vs2015/sdl2/VisualC/tests/testvulkan/testvulkan.vcxproj rename to vs/sdl2/VisualC/tests/testvulkan/testvulkan.vcxproj diff --git a/vs2015/sdl2/VisualC/tests/testyuv/testyuv.vcxproj b/vs/sdl2/VisualC/tests/testyuv/testyuv.vcxproj similarity index 100% rename from vs2015/sdl2/VisualC/tests/testyuv/testyuv.vcxproj rename to vs/sdl2/VisualC/tests/testyuv/testyuv.vcxproj diff --git a/vs2015/sdl2/VisualC/visualtest/unittest/testquit/testquit_VS2012.vcxproj b/vs/sdl2/VisualC/visualtest/unittest/testquit/testquit_VS2012.vcxproj similarity index 100% rename from vs2015/sdl2/VisualC/visualtest/unittest/testquit/testquit_VS2012.vcxproj rename to vs/sdl2/VisualC/visualtest/unittest/testquit/testquit_VS2012.vcxproj diff --git a/vs2015/sdl2/VisualC/visualtest/visualtest_VS2012.vcxproj b/vs/sdl2/VisualC/visualtest/visualtest_VS2012.vcxproj similarity index 100% rename from vs2015/sdl2/VisualC/visualtest/visualtest_VS2012.vcxproj rename to vs/sdl2/VisualC/visualtest/visualtest_VS2012.vcxproj diff --git a/vs2015/sdl2/WhatsNew.txt b/vs/sdl2/WhatsNew.txt similarity index 100% rename from vs2015/sdl2/WhatsNew.txt rename to vs/sdl2/WhatsNew.txt diff --git a/vs2015/sdl2/Xcode-iOS/Demos/Default.png b/vs/sdl2/Xcode-iOS/Demos/Default.png similarity index 100% rename from vs2015/sdl2/Xcode-iOS/Demos/Default.png rename to vs/sdl2/Xcode-iOS/Demos/Default.png diff --git a/vs2015/sdl2/Xcode-iOS/Demos/Demos.xcodeproj/project.pbxproj b/vs/sdl2/Xcode-iOS/Demos/Demos.xcodeproj/project.pbxproj similarity index 100% rename from vs2015/sdl2/Xcode-iOS/Demos/Demos.xcodeproj/project.pbxproj rename to vs/sdl2/Xcode-iOS/Demos/Demos.xcodeproj/project.pbxproj diff --git a/vs2015/sdl2/Xcode-iOS/Demos/Icon.png b/vs/sdl2/Xcode-iOS/Demos/Icon.png similarity index 100% rename from vs2015/sdl2/Xcode-iOS/Demos/Icon.png rename to vs/sdl2/Xcode-iOS/Demos/Icon.png diff --git a/vs2015/sdl2/Xcode-iOS/Demos/Info.plist b/vs/sdl2/Xcode-iOS/Demos/Info.plist similarity index 100% rename from vs2015/sdl2/Xcode-iOS/Demos/Info.plist rename to vs/sdl2/Xcode-iOS/Demos/Info.plist diff --git a/vs2015/sdl2/Xcode-iOS/Demos/README b/vs/sdl2/Xcode-iOS/Demos/README similarity index 100% rename from vs2015/sdl2/Xcode-iOS/Demos/README rename to vs/sdl2/Xcode-iOS/Demos/README diff --git a/vs2015/sdl2/Xcode-iOS/Demos/data/bitmapfont/kromasky_16x16.bmp b/vs/sdl2/Xcode-iOS/Demos/data/bitmapfont/kromasky_16x16.bmp similarity index 100% rename from vs2015/sdl2/Xcode-iOS/Demos/data/bitmapfont/kromasky_16x16.bmp rename to vs/sdl2/Xcode-iOS/Demos/data/bitmapfont/kromasky_16x16.bmp diff --git a/vs2015/sdl2/Xcode-iOS/Demos/data/bitmapfont/license.txt b/vs/sdl2/Xcode-iOS/Demos/data/bitmapfont/license.txt similarity index 100% rename from vs2015/sdl2/Xcode-iOS/Demos/data/bitmapfont/license.txt rename to vs/sdl2/Xcode-iOS/Demos/data/bitmapfont/license.txt diff --git a/vs2015/sdl2/Xcode-iOS/Demos/data/drums/ds_brush_snare.wav b/vs/sdl2/Xcode-iOS/Demos/data/drums/ds_brush_snare.wav similarity index 100% rename from vs2015/sdl2/Xcode-iOS/Demos/data/drums/ds_brush_snare.wav rename to vs/sdl2/Xcode-iOS/Demos/data/drums/ds_brush_snare.wav diff --git a/vs2015/sdl2/Xcode-iOS/Demos/data/drums/ds_china.wav b/vs/sdl2/Xcode-iOS/Demos/data/drums/ds_china.wav similarity index 100% rename from vs2015/sdl2/Xcode-iOS/Demos/data/drums/ds_china.wav rename to vs/sdl2/Xcode-iOS/Demos/data/drums/ds_china.wav diff --git a/vs2015/sdl2/Xcode-iOS/Demos/data/drums/ds_kick_big_amb.wav b/vs/sdl2/Xcode-iOS/Demos/data/drums/ds_kick_big_amb.wav similarity index 100% rename from vs2015/sdl2/Xcode-iOS/Demos/data/drums/ds_kick_big_amb.wav rename to vs/sdl2/Xcode-iOS/Demos/data/drums/ds_kick_big_amb.wav diff --git a/vs2015/sdl2/Xcode-iOS/Demos/data/drums/ds_loose_skin_mute.wav b/vs/sdl2/Xcode-iOS/Demos/data/drums/ds_loose_skin_mute.wav similarity index 100% rename from vs2015/sdl2/Xcode-iOS/Demos/data/drums/ds_loose_skin_mute.wav rename to vs/sdl2/Xcode-iOS/Demos/data/drums/ds_loose_skin_mute.wav diff --git a/vs2015/sdl2/Xcode-iOS/Demos/data/icon.bmp b/vs/sdl2/Xcode-iOS/Demos/data/icon.bmp similarity index 100% rename from vs2015/sdl2/Xcode-iOS/Demos/data/icon.bmp rename to vs/sdl2/Xcode-iOS/Demos/data/icon.bmp diff --git a/vs2015/sdl2/Xcode-iOS/Demos/data/ship.bmp b/vs/sdl2/Xcode-iOS/Demos/data/ship.bmp similarity index 100% rename from vs2015/sdl2/Xcode-iOS/Demos/data/ship.bmp rename to vs/sdl2/Xcode-iOS/Demos/data/ship.bmp diff --git a/vs2015/sdl2/Xcode-iOS/Demos/data/space.bmp b/vs/sdl2/Xcode-iOS/Demos/data/space.bmp similarity index 100% rename from vs2015/sdl2/Xcode-iOS/Demos/data/space.bmp rename to vs/sdl2/Xcode-iOS/Demos/data/space.bmp diff --git a/vs2015/sdl2/Xcode-iOS/Demos/data/stroke.bmp b/vs/sdl2/Xcode-iOS/Demos/data/stroke.bmp similarity index 100% rename from vs2015/sdl2/Xcode-iOS/Demos/data/stroke.bmp rename to vs/sdl2/Xcode-iOS/Demos/data/stroke.bmp diff --git a/vs2015/sdl2/Xcode-iOS/Demos/iOS Launch Screen.storyboard b/vs/sdl2/Xcode-iOS/Demos/iOS Launch Screen.storyboard similarity index 100% rename from vs2015/sdl2/Xcode-iOS/Demos/iOS Launch Screen.storyboard rename to vs/sdl2/Xcode-iOS/Demos/iOS Launch Screen.storyboard diff --git a/vs2015/sdl2/Xcode-iOS/Demos/src/accelerometer.c b/vs/sdl2/Xcode-iOS/Demos/src/accelerometer.c similarity index 100% rename from vs2015/sdl2/Xcode-iOS/Demos/src/accelerometer.c rename to vs/sdl2/Xcode-iOS/Demos/src/accelerometer.c diff --git a/vs2015/sdl2/Xcode-iOS/Demos/src/common.c b/vs/sdl2/Xcode-iOS/Demos/src/common.c similarity index 100% rename from vs2015/sdl2/Xcode-iOS/Demos/src/common.c rename to vs/sdl2/Xcode-iOS/Demos/src/common.c diff --git a/vs2015/sdl2/Xcode-iOS/Demos/src/common.h b/vs/sdl2/Xcode-iOS/Demos/src/common.h similarity index 100% rename from vs2015/sdl2/Xcode-iOS/Demos/src/common.h rename to vs/sdl2/Xcode-iOS/Demos/src/common.h diff --git a/vs2015/sdl2/Xcode-iOS/Demos/src/fireworks.c b/vs/sdl2/Xcode-iOS/Demos/src/fireworks.c similarity index 100% rename from vs2015/sdl2/Xcode-iOS/Demos/src/fireworks.c rename to vs/sdl2/Xcode-iOS/Demos/src/fireworks.c diff --git a/vs2015/sdl2/Xcode-iOS/Demos/src/happy.c b/vs/sdl2/Xcode-iOS/Demos/src/happy.c similarity index 100% rename from vs2015/sdl2/Xcode-iOS/Demos/src/happy.c rename to vs/sdl2/Xcode-iOS/Demos/src/happy.c diff --git a/vs2015/sdl2/Xcode-iOS/Demos/src/keyboard.c b/vs/sdl2/Xcode-iOS/Demos/src/keyboard.c similarity index 100% rename from vs2015/sdl2/Xcode-iOS/Demos/src/keyboard.c rename to vs/sdl2/Xcode-iOS/Demos/src/keyboard.c diff --git a/vs2015/sdl2/Xcode-iOS/Demos/src/mixer.c b/vs/sdl2/Xcode-iOS/Demos/src/mixer.c similarity index 100% rename from vs2015/sdl2/Xcode-iOS/Demos/src/mixer.c rename to vs/sdl2/Xcode-iOS/Demos/src/mixer.c diff --git a/vs2015/sdl2/Xcode-iOS/Demos/src/rectangles.c b/vs/sdl2/Xcode-iOS/Demos/src/rectangles.c similarity index 100% rename from vs2015/sdl2/Xcode-iOS/Demos/src/rectangles.c rename to vs/sdl2/Xcode-iOS/Demos/src/rectangles.c diff --git a/vs2015/sdl2/Xcode-iOS/Demos/src/touch.c b/vs/sdl2/Xcode-iOS/Demos/src/touch.c similarity index 100% rename from vs2015/sdl2/Xcode-iOS/Demos/src/touch.c rename to vs/sdl2/Xcode-iOS/Demos/src/touch.c diff --git a/vs2015/sdl2/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj b/vs/sdl2/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj similarity index 100% rename from vs2015/sdl2/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj rename to vs/sdl2/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj diff --git a/vs2015/sdl2/Xcode-iOS/SDLtest/SDL2test.xcodeproj/project.pbxproj b/vs/sdl2/Xcode-iOS/SDLtest/SDL2test.xcodeproj/project.pbxproj similarity index 100% rename from vs2015/sdl2/Xcode-iOS/SDLtest/SDL2test.xcodeproj/project.pbxproj rename to vs/sdl2/Xcode-iOS/SDLtest/SDL2test.xcodeproj/project.pbxproj diff --git a/vs2015/sdl2/Xcode-iOS/Template/SDL iOS Application/Default-568h@2x.png b/vs/sdl2/Xcode-iOS/Template/SDL iOS Application/Default-568h@2x.png similarity index 100% rename from vs2015/sdl2/Xcode-iOS/Template/SDL iOS Application/Default-568h@2x.png rename to vs/sdl2/Xcode-iOS/Template/SDL iOS Application/Default-568h@2x.png diff --git a/vs2015/sdl2/Xcode-iOS/Template/SDL iOS Application/Default.png b/vs/sdl2/Xcode-iOS/Template/SDL iOS Application/Default.png similarity index 100% rename from vs2015/sdl2/Xcode-iOS/Template/SDL iOS Application/Default.png rename to vs/sdl2/Xcode-iOS/Template/SDL iOS Application/Default.png diff --git a/vs2015/sdl2/Xcode-iOS/Template/SDL iOS Application/Icon.png b/vs/sdl2/Xcode-iOS/Template/SDL iOS Application/Icon.png similarity index 100% rename from vs2015/sdl2/Xcode-iOS/Template/SDL iOS Application/Icon.png rename to vs/sdl2/Xcode-iOS/Template/SDL iOS Application/Icon.png diff --git a/vs2015/sdl2/Xcode-iOS/Template/SDL iOS Application/Info.plist b/vs/sdl2/Xcode-iOS/Template/SDL iOS Application/Info.plist similarity index 100% rename from vs2015/sdl2/Xcode-iOS/Template/SDL iOS Application/Info.plist rename to vs/sdl2/Xcode-iOS/Template/SDL iOS Application/Info.plist diff --git a/vs2015/sdl2/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/TemplateIcon.icns b/vs/sdl2/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/TemplateIcon.icns similarity index 100% rename from vs2015/sdl2/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/TemplateIcon.icns rename to vs/sdl2/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/TemplateIcon.icns diff --git a/vs2015/sdl2/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/TemplateInfo.plist b/vs/sdl2/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/TemplateInfo.plist similarity index 100% rename from vs2015/sdl2/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/TemplateInfo.plist rename to vs/sdl2/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/TemplateInfo.plist diff --git a/vs2015/sdl2/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/project.pbxproj b/vs/sdl2/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/project.pbxproj similarity index 100% rename from vs2015/sdl2/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/project.pbxproj rename to vs/sdl2/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/project.pbxproj diff --git a/vs2015/sdl2/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/vs/sdl2/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from vs2015/sdl2/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to vs/sdl2/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/vs2015/sdl2/Xcode-iOS/Template/SDL iOS Application/main.c b/vs/sdl2/Xcode-iOS/Template/SDL iOS Application/main.c similarity index 100% rename from vs2015/sdl2/Xcode-iOS/Template/SDL iOS Application/main.c rename to vs/sdl2/Xcode-iOS/Template/SDL iOS Application/main.c diff --git a/vs2015/sdl2/Xcode-iOS/Test/Info.plist b/vs/sdl2/Xcode-iOS/Test/Info.plist similarity index 100% rename from vs2015/sdl2/Xcode-iOS/Test/Info.plist rename to vs/sdl2/Xcode-iOS/Test/Info.plist diff --git a/vs2015/sdl2/Xcode-iOS/Test/README b/vs/sdl2/Xcode-iOS/Test/README similarity index 100% rename from vs2015/sdl2/Xcode-iOS/Test/README rename to vs/sdl2/Xcode-iOS/Test/README diff --git a/vs2015/sdl2/Xcode-iOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj b/vs/sdl2/Xcode-iOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj similarity index 100% rename from vs2015/sdl2/Xcode-iOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj rename to vs/sdl2/Xcode-iOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj diff --git a/vs2015/sdl2/Xcode/SDL/Info-Framework.plist b/vs/sdl2/Xcode/SDL/Info-Framework.plist similarity index 100% rename from vs2015/sdl2/Xcode/SDL/Info-Framework.plist rename to vs/sdl2/Xcode/SDL/Info-Framework.plist diff --git a/vs2015/sdl2/Xcode/SDL/SDL.xcodeproj/project.pbxproj b/vs/sdl2/Xcode/SDL/SDL.xcodeproj/project.pbxproj similarity index 100% rename from vs2015/sdl2/Xcode/SDL/SDL.xcodeproj/project.pbxproj rename to vs/sdl2/Xcode/SDL/SDL.xcodeproj/project.pbxproj diff --git a/vs2015/sdl2/Xcode/SDL/pkg-support/SDL.info b/vs/sdl2/Xcode/SDL/pkg-support/SDL.info similarity index 100% rename from vs2015/sdl2/Xcode/SDL/pkg-support/SDL.info rename to vs/sdl2/Xcode/SDL/pkg-support/SDL.info diff --git a/vs2015/sdl2/Xcode/SDL/pkg-support/resources/License.txt b/vs/sdl2/Xcode/SDL/pkg-support/resources/License.txt similarity index 100% rename from vs2015/sdl2/Xcode/SDL/pkg-support/resources/License.txt rename to vs/sdl2/Xcode/SDL/pkg-support/resources/License.txt diff --git a/vs2015/sdl2/Xcode/SDL/pkg-support/resources/ReadMe.txt b/vs/sdl2/Xcode/SDL/pkg-support/resources/ReadMe.txt similarity index 100% rename from vs2015/sdl2/Xcode/SDL/pkg-support/resources/ReadMe.txt rename to vs/sdl2/Xcode/SDL/pkg-support/resources/ReadMe.txt diff --git a/vs2015/sdl2/Xcode/SDL/pkg-support/resources/SDL_DS_Store b/vs/sdl2/Xcode/SDL/pkg-support/resources/SDL_DS_Store similarity index 100% rename from vs2015/sdl2/Xcode/SDL/pkg-support/resources/SDL_DS_Store rename to vs/sdl2/Xcode/SDL/pkg-support/resources/SDL_DS_Store diff --git a/vs2015/sdl2/Xcode/SDL/pkg-support/sdl_logo.pdf b/vs/sdl2/Xcode/SDL/pkg-support/sdl_logo.pdf similarity index 100% rename from vs2015/sdl2/Xcode/SDL/pkg-support/sdl_logo.pdf rename to vs/sdl2/Xcode/SDL/pkg-support/sdl_logo.pdf diff --git a/vs2015/sdl2/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj b/vs/sdl2/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj similarity index 100% rename from vs2015/sdl2/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj rename to vs/sdl2/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj diff --git a/vs2015/sdl2/Xcode/SDLTest/TestDropFile-Info.plist b/vs/sdl2/Xcode/SDLTest/TestDropFile-Info.plist similarity index 100% rename from vs2015/sdl2/Xcode/SDLTest/TestDropFile-Info.plist rename to vs/sdl2/Xcode/SDLTest/TestDropFile-Info.plist diff --git a/vs2015/sdl2/Xcode/XcodeDocSet/Doxyfile b/vs/sdl2/Xcode/XcodeDocSet/Doxyfile similarity index 100% rename from vs2015/sdl2/Xcode/XcodeDocSet/Doxyfile rename to vs/sdl2/Xcode/XcodeDocSet/Doxyfile diff --git a/vs2015/sdl2/acinclude/ac_check_define.m4 b/vs/sdl2/acinclude/ac_check_define.m4 similarity index 100% rename from vs2015/sdl2/acinclude/ac_check_define.m4 rename to vs/sdl2/acinclude/ac_check_define.m4 diff --git a/vs2015/sdl2/acinclude/alsa.m4 b/vs/sdl2/acinclude/alsa.m4 similarity index 100% rename from vs2015/sdl2/acinclude/alsa.m4 rename to vs/sdl2/acinclude/alsa.m4 diff --git a/vs2015/sdl2/acinclude/ax_check_compiler_flags.m4 b/vs/sdl2/acinclude/ax_check_compiler_flags.m4 similarity index 100% rename from vs2015/sdl2/acinclude/ax_check_compiler_flags.m4 rename to vs/sdl2/acinclude/ax_check_compiler_flags.m4 diff --git a/vs2015/sdl2/acinclude/ax_gcc_archflag.m4 b/vs/sdl2/acinclude/ax_gcc_archflag.m4 similarity index 100% rename from vs2015/sdl2/acinclude/ax_gcc_archflag.m4 rename to vs/sdl2/acinclude/ax_gcc_archflag.m4 diff --git a/vs2015/sdl2/acinclude/ax_gcc_x86_cpuid.m4 b/vs/sdl2/acinclude/ax_gcc_x86_cpuid.m4 similarity index 100% rename from vs2015/sdl2/acinclude/ax_gcc_x86_cpuid.m4 rename to vs/sdl2/acinclude/ax_gcc_x86_cpuid.m4 diff --git a/vs2015/sdl2/acinclude/esd.m4 b/vs/sdl2/acinclude/esd.m4 similarity index 100% rename from vs2015/sdl2/acinclude/esd.m4 rename to vs/sdl2/acinclude/esd.m4 diff --git a/vs2015/sdl2/acinclude/libtool.m4 b/vs/sdl2/acinclude/libtool.m4 similarity index 100% rename from vs2015/sdl2/acinclude/libtool.m4 rename to vs/sdl2/acinclude/libtool.m4 diff --git a/vs2015/sdl2/acinclude/ltoptions.m4 b/vs/sdl2/acinclude/ltoptions.m4 similarity index 100% rename from vs2015/sdl2/acinclude/ltoptions.m4 rename to vs/sdl2/acinclude/ltoptions.m4 diff --git a/vs2015/sdl2/acinclude/ltsugar.m4 b/vs/sdl2/acinclude/ltsugar.m4 similarity index 100% rename from vs2015/sdl2/acinclude/ltsugar.m4 rename to vs/sdl2/acinclude/ltsugar.m4 diff --git a/vs2015/sdl2/acinclude/ltversion.m4 b/vs/sdl2/acinclude/ltversion.m4 similarity index 100% rename from vs2015/sdl2/acinclude/ltversion.m4 rename to vs/sdl2/acinclude/ltversion.m4 diff --git a/vs2015/sdl2/acinclude/lt~obsolete.m4 b/vs/sdl2/acinclude/lt~obsolete.m4 similarity index 100% rename from vs2015/sdl2/acinclude/lt~obsolete.m4 rename to vs/sdl2/acinclude/lt~obsolete.m4 diff --git a/vs2015/sdl2/android-project/app/build.gradle b/vs/sdl2/android-project/app/build.gradle similarity index 100% rename from vs2015/sdl2/android-project/app/build.gradle rename to vs/sdl2/android-project/app/build.gradle diff --git a/vs2015/sdl2/android-project/app/jni/Android.mk b/vs/sdl2/android-project/app/jni/Android.mk similarity index 100% rename from vs2015/sdl2/android-project/app/jni/Android.mk rename to vs/sdl2/android-project/app/jni/Android.mk diff --git a/vs2015/sdl2/android-project/app/jni/Application.mk b/vs/sdl2/android-project/app/jni/Application.mk similarity index 100% rename from vs2015/sdl2/android-project/app/jni/Application.mk rename to vs/sdl2/android-project/app/jni/Application.mk diff --git a/vs2015/sdl2/android-project/app/jni/src/Android.mk b/vs/sdl2/android-project/app/jni/src/Android.mk similarity index 100% rename from vs2015/sdl2/android-project/app/jni/src/Android.mk rename to vs/sdl2/android-project/app/jni/src/Android.mk diff --git a/vs2015/sdl2/android-project/app/proguard-rules.pro b/vs/sdl2/android-project/app/proguard-rules.pro similarity index 100% rename from vs2015/sdl2/android-project/app/proguard-rules.pro rename to vs/sdl2/android-project/app/proguard-rules.pro diff --git a/vs2015/sdl2/android-project/app/src/main/AndroidManifest.xml b/vs/sdl2/android-project/app/src/main/AndroidManifest.xml similarity index 100% rename from vs2015/sdl2/android-project/app/src/main/AndroidManifest.xml rename to vs/sdl2/android-project/app/src/main/AndroidManifest.xml diff --git a/vs2015/sdl2/android-project/app/src/main/java/org/libsdl/app/HIDDevice.java b/vs/sdl2/android-project/app/src/main/java/org/libsdl/app/HIDDevice.java similarity index 100% rename from vs2015/sdl2/android-project/app/src/main/java/org/libsdl/app/HIDDevice.java rename to vs/sdl2/android-project/app/src/main/java/org/libsdl/app/HIDDevice.java diff --git a/vs2015/sdl2/android-project/app/src/main/java/org/libsdl/app/HIDDeviceBLESteamController.java b/vs/sdl2/android-project/app/src/main/java/org/libsdl/app/HIDDeviceBLESteamController.java similarity index 100% rename from vs2015/sdl2/android-project/app/src/main/java/org/libsdl/app/HIDDeviceBLESteamController.java rename to vs/sdl2/android-project/app/src/main/java/org/libsdl/app/HIDDeviceBLESteamController.java diff --git a/vs2015/sdl2/android-project/app/src/main/java/org/libsdl/app/HIDDeviceManager.java b/vs/sdl2/android-project/app/src/main/java/org/libsdl/app/HIDDeviceManager.java similarity index 100% rename from vs2015/sdl2/android-project/app/src/main/java/org/libsdl/app/HIDDeviceManager.java rename to vs/sdl2/android-project/app/src/main/java/org/libsdl/app/HIDDeviceManager.java diff --git a/vs2015/sdl2/android-project/app/src/main/java/org/libsdl/app/HIDDeviceUSB.java b/vs/sdl2/android-project/app/src/main/java/org/libsdl/app/HIDDeviceUSB.java similarity index 100% rename from vs2015/sdl2/android-project/app/src/main/java/org/libsdl/app/HIDDeviceUSB.java rename to vs/sdl2/android-project/app/src/main/java/org/libsdl/app/HIDDeviceUSB.java diff --git a/vs2015/sdl2/android-project/app/src/main/java/org/libsdl/app/SDL.java b/vs/sdl2/android-project/app/src/main/java/org/libsdl/app/SDL.java similarity index 100% rename from vs2015/sdl2/android-project/app/src/main/java/org/libsdl/app/SDL.java rename to vs/sdl2/android-project/app/src/main/java/org/libsdl/app/SDL.java diff --git a/vs2015/sdl2/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java b/vs/sdl2/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java similarity index 100% rename from vs2015/sdl2/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java rename to vs/sdl2/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java diff --git a/vs2015/sdl2/android-project/app/src/main/java/org/libsdl/app/SDLAudioManager.java b/vs/sdl2/android-project/app/src/main/java/org/libsdl/app/SDLAudioManager.java similarity index 100% rename from vs2015/sdl2/android-project/app/src/main/java/org/libsdl/app/SDLAudioManager.java rename to vs/sdl2/android-project/app/src/main/java/org/libsdl/app/SDLAudioManager.java diff --git a/vs2015/sdl2/android-project/app/src/main/java/org/libsdl/app/SDLControllerManager.java b/vs/sdl2/android-project/app/src/main/java/org/libsdl/app/SDLControllerManager.java similarity index 100% rename from vs2015/sdl2/android-project/app/src/main/java/org/libsdl/app/SDLControllerManager.java rename to vs/sdl2/android-project/app/src/main/java/org/libsdl/app/SDLControllerManager.java diff --git a/vs2015/sdl2/android-project/app/src/main/res/mipmap-hdpi/ic_launcher.png b/vs/sdl2/android-project/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from vs2015/sdl2/android-project/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to vs/sdl2/android-project/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/vs2015/sdl2/android-project/app/src/main/res/mipmap-mdpi/ic_launcher.png b/vs/sdl2/android-project/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from vs2015/sdl2/android-project/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to vs/sdl2/android-project/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/vs2015/sdl2/android-project/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/vs/sdl2/android-project/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from vs2015/sdl2/android-project/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to vs/sdl2/android-project/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/vs2015/sdl2/android-project/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/vs/sdl2/android-project/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from vs2015/sdl2/android-project/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to vs/sdl2/android-project/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/vs2015/sdl2/android-project/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/vs/sdl2/android-project/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from vs2015/sdl2/android-project/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to vs/sdl2/android-project/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/vs2015/sdl2/android-project/app/src/main/res/values/colors.xml b/vs/sdl2/android-project/app/src/main/res/values/colors.xml similarity index 100% rename from vs2015/sdl2/android-project/app/src/main/res/values/colors.xml rename to vs/sdl2/android-project/app/src/main/res/values/colors.xml diff --git a/vs2015/sdl2/android-project/app/src/main/res/values/strings.xml b/vs/sdl2/android-project/app/src/main/res/values/strings.xml similarity index 100% rename from vs2015/sdl2/android-project/app/src/main/res/values/strings.xml rename to vs/sdl2/android-project/app/src/main/res/values/strings.xml diff --git a/vs2015/sdl2/android-project/app/src/main/res/values/styles.xml b/vs/sdl2/android-project/app/src/main/res/values/styles.xml similarity index 100% rename from vs2015/sdl2/android-project/app/src/main/res/values/styles.xml rename to vs/sdl2/android-project/app/src/main/res/values/styles.xml diff --git a/vs2015/sdl2/android-project/build.gradle b/vs/sdl2/android-project/build.gradle similarity index 100% rename from vs2015/sdl2/android-project/build.gradle rename to vs/sdl2/android-project/build.gradle diff --git a/vs2015/sdl2/android-project/gradle.properties b/vs/sdl2/android-project/gradle.properties similarity index 100% rename from vs2015/sdl2/android-project/gradle.properties rename to vs/sdl2/android-project/gradle.properties diff --git a/vs2015/sdl2/android-project/gradle/wrapper/gradle-wrapper.jar b/vs/sdl2/android-project/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from vs2015/sdl2/android-project/gradle/wrapper/gradle-wrapper.jar rename to vs/sdl2/android-project/gradle/wrapper/gradle-wrapper.jar diff --git a/vs2015/sdl2/android-project/gradle/wrapper/gradle-wrapper.properties b/vs/sdl2/android-project/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from vs2015/sdl2/android-project/gradle/wrapper/gradle-wrapper.properties rename to vs/sdl2/android-project/gradle/wrapper/gradle-wrapper.properties diff --git a/vs2015/sdl2/android-project/gradlew b/vs/sdl2/android-project/gradlew similarity index 100% rename from vs2015/sdl2/android-project/gradlew rename to vs/sdl2/android-project/gradlew diff --git a/vs2015/sdl2/android-project/gradlew.bat b/vs/sdl2/android-project/gradlew.bat similarity index 100% rename from vs2015/sdl2/android-project/gradlew.bat rename to vs/sdl2/android-project/gradlew.bat diff --git a/vs2015/sdl2/android-project/settings.gradle b/vs/sdl2/android-project/settings.gradle similarity index 100% rename from vs2015/sdl2/android-project/settings.gradle rename to vs/sdl2/android-project/settings.gradle diff --git a/vs2015/sdl2/autogen.sh b/vs/sdl2/autogen.sh similarity index 100% rename from vs2015/sdl2/autogen.sh rename to vs/sdl2/autogen.sh diff --git a/vs2015/sdl2/build-dosbox.sh b/vs/sdl2/build-dosbox.sh similarity index 100% rename from vs2015/sdl2/build-dosbox.sh rename to vs/sdl2/build-dosbox.sh diff --git a/vs2015/sdl2/build-scripts/androidbuild.sh b/vs/sdl2/build-scripts/androidbuild.sh similarity index 100% rename from vs2015/sdl2/build-scripts/androidbuild.sh rename to vs/sdl2/build-scripts/androidbuild.sh diff --git a/vs2015/sdl2/build-scripts/androidbuildlibs.sh b/vs/sdl2/build-scripts/androidbuildlibs.sh similarity index 100% rename from vs2015/sdl2/build-scripts/androidbuildlibs.sh rename to vs/sdl2/build-scripts/androidbuildlibs.sh diff --git a/vs2015/sdl2/build-scripts/checker-buildbot.sh b/vs/sdl2/build-scripts/checker-buildbot.sh similarity index 100% rename from vs2015/sdl2/build-scripts/checker-buildbot.sh rename to vs/sdl2/build-scripts/checker-buildbot.sh diff --git a/vs2015/sdl2/build-scripts/config.guess b/vs/sdl2/build-scripts/config.guess similarity index 100% rename from vs2015/sdl2/build-scripts/config.guess rename to vs/sdl2/build-scripts/config.guess diff --git a/vs2015/sdl2/build-scripts/config.sub b/vs/sdl2/build-scripts/config.sub similarity index 100% rename from vs2015/sdl2/build-scripts/config.sub rename to vs/sdl2/build-scripts/config.sub diff --git a/vs2015/sdl2/build-scripts/config.sub.patch b/vs/sdl2/build-scripts/config.sub.patch similarity index 100% rename from vs2015/sdl2/build-scripts/config.sub.patch rename to vs/sdl2/build-scripts/config.sub.patch diff --git a/vs2015/sdl2/build-scripts/emscripten-buildbot.sh b/vs/sdl2/build-scripts/emscripten-buildbot.sh similarity index 100% rename from vs2015/sdl2/build-scripts/emscripten-buildbot.sh rename to vs/sdl2/build-scripts/emscripten-buildbot.sh diff --git a/vs2015/sdl2/build-scripts/g++-fat.sh b/vs/sdl2/build-scripts/g++-fat.sh similarity index 100% rename from vs2015/sdl2/build-scripts/g++-fat.sh rename to vs/sdl2/build-scripts/g++-fat.sh diff --git a/vs2015/sdl2/build-scripts/gcc-fat.sh b/vs/sdl2/build-scripts/gcc-fat.sh similarity index 100% rename from vs2015/sdl2/build-scripts/gcc-fat.sh rename to vs/sdl2/build-scripts/gcc-fat.sh diff --git a/vs2015/sdl2/build-scripts/install-sh b/vs/sdl2/build-scripts/install-sh similarity index 100% rename from vs2015/sdl2/build-scripts/install-sh rename to vs/sdl2/build-scripts/install-sh diff --git a/vs2015/sdl2/build-scripts/iosbuild.sh b/vs/sdl2/build-scripts/iosbuild.sh similarity index 100% rename from vs2015/sdl2/build-scripts/iosbuild.sh rename to vs/sdl2/build-scripts/iosbuild.sh diff --git a/vs2015/sdl2/build-scripts/ltmain.sh b/vs/sdl2/build-scripts/ltmain.sh similarity index 100% rename from vs2015/sdl2/build-scripts/ltmain.sh rename to vs/sdl2/build-scripts/ltmain.sh diff --git a/vs2015/sdl2/build-scripts/mkinstalldirs b/vs/sdl2/build-scripts/mkinstalldirs similarity index 100% rename from vs2015/sdl2/build-scripts/mkinstalldirs rename to vs/sdl2/build-scripts/mkinstalldirs diff --git a/vs2015/sdl2/build-scripts/nacl-buildbot.sh b/vs/sdl2/build-scripts/nacl-buildbot.sh similarity index 100% rename from vs2015/sdl2/build-scripts/nacl-buildbot.sh rename to vs/sdl2/build-scripts/nacl-buildbot.sh diff --git a/vs2015/sdl2/build-scripts/naclbuild.sh b/vs/sdl2/build-scripts/naclbuild.sh similarity index 100% rename from vs2015/sdl2/build-scripts/naclbuild.sh rename to vs/sdl2/build-scripts/naclbuild.sh diff --git a/vs2015/sdl2/build-scripts/raspberrypi-buildbot.sh b/vs/sdl2/build-scripts/raspberrypi-buildbot.sh similarity index 100% rename from vs2015/sdl2/build-scripts/raspberrypi-buildbot.sh rename to vs/sdl2/build-scripts/raspberrypi-buildbot.sh diff --git a/vs2015/sdl2/build-scripts/showrev.sh b/vs/sdl2/build-scripts/showrev.sh similarity index 100% rename from vs2015/sdl2/build-scripts/showrev.sh rename to vs/sdl2/build-scripts/showrev.sh diff --git a/vs2015/sdl2/build-scripts/strip_fPIC.sh b/vs/sdl2/build-scripts/strip_fPIC.sh similarity index 100% rename from vs2015/sdl2/build-scripts/strip_fPIC.sh rename to vs/sdl2/build-scripts/strip_fPIC.sh diff --git a/vs2015/sdl2/build-scripts/update-copyright.sh b/vs/sdl2/build-scripts/update-copyright.sh similarity index 100% rename from vs2015/sdl2/build-scripts/update-copyright.sh rename to vs/sdl2/build-scripts/update-copyright.sh diff --git a/vs2015/sdl2/build-scripts/updaterev.sh b/vs/sdl2/build-scripts/updaterev.sh similarity index 100% rename from vs2015/sdl2/build-scripts/updaterev.sh rename to vs/sdl2/build-scripts/updaterev.sh diff --git a/vs2015/sdl2/build-scripts/windows-buildbot-zipper.bat b/vs/sdl2/build-scripts/windows-buildbot-zipper.bat similarity index 100% rename from vs2015/sdl2/build-scripts/windows-buildbot-zipper.bat rename to vs/sdl2/build-scripts/windows-buildbot-zipper.bat diff --git a/vs2015/sdl2/build-scripts/winrtbuild.bat b/vs/sdl2/build-scripts/winrtbuild.bat similarity index 100% rename from vs2015/sdl2/build-scripts/winrtbuild.bat rename to vs/sdl2/build-scripts/winrtbuild.bat diff --git a/vs2015/sdl2/build-scripts/winrtbuild.ps1 b/vs/sdl2/build-scripts/winrtbuild.ps1 similarity index 100% rename from vs2015/sdl2/build-scripts/winrtbuild.ps1 rename to vs/sdl2/build-scripts/winrtbuild.ps1 diff --git a/vs2015/sdl2/cmake/macros.cmake b/vs/sdl2/cmake/macros.cmake similarity index 100% rename from vs2015/sdl2/cmake/macros.cmake rename to vs/sdl2/cmake/macros.cmake diff --git a/vs2015/sdl2/cmake/sdlchecks.cmake b/vs/sdl2/cmake/sdlchecks.cmake similarity index 100% rename from vs2015/sdl2/cmake/sdlchecks.cmake rename to vs/sdl2/cmake/sdlchecks.cmake diff --git a/vs2015/sdl2/cmake_uninstall.cmake.in b/vs/sdl2/cmake_uninstall.cmake.in similarity index 100% rename from vs2015/sdl2/cmake_uninstall.cmake.in rename to vs/sdl2/cmake_uninstall.cmake.in diff --git a/vs2015/sdl2/configure b/vs/sdl2/configure similarity index 100% rename from vs2015/sdl2/configure rename to vs/sdl2/configure diff --git a/vs2015/sdl2/configure.ac b/vs/sdl2/configure.ac similarity index 100% rename from vs2015/sdl2/configure.ac rename to vs/sdl2/configure.ac diff --git a/vs2015/sdl2/debian/changelog b/vs/sdl2/debian/changelog similarity index 100% rename from vs2015/sdl2/debian/changelog rename to vs/sdl2/debian/changelog diff --git a/vs2015/sdl2/debian/compat b/vs/sdl2/debian/compat similarity index 100% rename from vs2015/sdl2/debian/compat rename to vs/sdl2/debian/compat diff --git a/vs2015/sdl2/debian/control b/vs/sdl2/debian/control similarity index 100% rename from vs2015/sdl2/debian/control rename to vs/sdl2/debian/control diff --git a/vs2015/sdl2/debian/copyright b/vs/sdl2/debian/copyright similarity index 100% rename from vs2015/sdl2/debian/copyright rename to vs/sdl2/debian/copyright diff --git a/vs2015/sdl2/debian/docs b/vs/sdl2/debian/docs similarity index 100% rename from vs2015/sdl2/debian/docs rename to vs/sdl2/debian/docs diff --git a/vs2015/sdl2/debian/libsdl2-dev.install b/vs/sdl2/debian/libsdl2-dev.install similarity index 100% rename from vs2015/sdl2/debian/libsdl2-dev.install rename to vs/sdl2/debian/libsdl2-dev.install diff --git a/vs2015/sdl2/debian/libsdl2-dev.manpages b/vs/sdl2/debian/libsdl2-dev.manpages similarity index 100% rename from vs2015/sdl2/debian/libsdl2-dev.manpages rename to vs/sdl2/debian/libsdl2-dev.manpages diff --git a/vs2015/sdl2/debian/libsdl2.install b/vs/sdl2/debian/libsdl2.install similarity index 100% rename from vs2015/sdl2/debian/libsdl2.install rename to vs/sdl2/debian/libsdl2.install diff --git a/vs2015/sdl2/debian/rules b/vs/sdl2/debian/rules similarity index 100% rename from vs2015/sdl2/debian/rules rename to vs/sdl2/debian/rules diff --git a/vs2015/sdl2/debian/sdl2-config.1 b/vs/sdl2/debian/sdl2-config.1 similarity index 100% rename from vs2015/sdl2/debian/sdl2-config.1 rename to vs/sdl2/debian/sdl2-config.1 diff --git a/vs2015/sdl2/debian/source/format b/vs/sdl2/debian/source/format similarity index 100% rename from vs2015/sdl2/debian/source/format rename to vs/sdl2/debian/source/format diff --git a/vs2015/sdl2/debian/watch b/vs/sdl2/debian/watch similarity index 100% rename from vs2015/sdl2/debian/watch rename to vs/sdl2/debian/watch diff --git a/vs2015/sdl2/docs/README-android.md b/vs/sdl2/docs/README-android.md similarity index 100% rename from vs2015/sdl2/docs/README-android.md rename to vs/sdl2/docs/README-android.md diff --git a/vs2015/sdl2/docs/README-cmake.md b/vs/sdl2/docs/README-cmake.md similarity index 100% rename from vs2015/sdl2/docs/README-cmake.md rename to vs/sdl2/docs/README-cmake.md diff --git a/vs2015/sdl2/docs/README-directfb.md b/vs/sdl2/docs/README-directfb.md similarity index 100% rename from vs2015/sdl2/docs/README-directfb.md rename to vs/sdl2/docs/README-directfb.md diff --git a/vs2015/sdl2/docs/README-dynapi.md b/vs/sdl2/docs/README-dynapi.md similarity index 100% rename from vs2015/sdl2/docs/README-dynapi.md rename to vs/sdl2/docs/README-dynapi.md diff --git a/vs2015/sdl2/docs/README-emscripten.md b/vs/sdl2/docs/README-emscripten.md similarity index 100% rename from vs2015/sdl2/docs/README-emscripten.md rename to vs/sdl2/docs/README-emscripten.md diff --git a/vs2015/sdl2/docs/README-gesture.md b/vs/sdl2/docs/README-gesture.md similarity index 100% rename from vs2015/sdl2/docs/README-gesture.md rename to vs/sdl2/docs/README-gesture.md diff --git a/vs2015/sdl2/docs/README-hg.md b/vs/sdl2/docs/README-hg.md similarity index 100% rename from vs2015/sdl2/docs/README-hg.md rename to vs/sdl2/docs/README-hg.md diff --git a/vs2015/sdl2/docs/README-ios.md b/vs/sdl2/docs/README-ios.md similarity index 100% rename from vs2015/sdl2/docs/README-ios.md rename to vs/sdl2/docs/README-ios.md diff --git a/vs2015/sdl2/docs/README-linux.md b/vs/sdl2/docs/README-linux.md similarity index 100% rename from vs2015/sdl2/docs/README-linux.md rename to vs/sdl2/docs/README-linux.md diff --git a/vs2015/sdl2/docs/README-macosx.md b/vs/sdl2/docs/README-macosx.md similarity index 100% rename from vs2015/sdl2/docs/README-macosx.md rename to vs/sdl2/docs/README-macosx.md diff --git a/vs2015/sdl2/docs/README-nacl.md b/vs/sdl2/docs/README-nacl.md similarity index 100% rename from vs2015/sdl2/docs/README-nacl.md rename to vs/sdl2/docs/README-nacl.md diff --git a/vs2015/sdl2/docs/README-pandora.md b/vs/sdl2/docs/README-pandora.md similarity index 100% rename from vs2015/sdl2/docs/README-pandora.md rename to vs/sdl2/docs/README-pandora.md diff --git a/vs2015/sdl2/docs/README-platforms.md b/vs/sdl2/docs/README-platforms.md similarity index 100% rename from vs2015/sdl2/docs/README-platforms.md rename to vs/sdl2/docs/README-platforms.md diff --git a/vs2015/sdl2/docs/README-porting.md b/vs/sdl2/docs/README-porting.md similarity index 100% rename from vs2015/sdl2/docs/README-porting.md rename to vs/sdl2/docs/README-porting.md diff --git a/vs2015/sdl2/docs/README-psp.md b/vs/sdl2/docs/README-psp.md similarity index 100% rename from vs2015/sdl2/docs/README-psp.md rename to vs/sdl2/docs/README-psp.md diff --git a/vs2015/sdl2/docs/README-raspberrypi.md b/vs/sdl2/docs/README-raspberrypi.md similarity index 100% rename from vs2015/sdl2/docs/README-raspberrypi.md rename to vs/sdl2/docs/README-raspberrypi.md diff --git a/vs2015/sdl2/docs/README-touch.md b/vs/sdl2/docs/README-touch.md similarity index 100% rename from vs2015/sdl2/docs/README-touch.md rename to vs/sdl2/docs/README-touch.md diff --git a/vs2015/sdl2/docs/README-wince.md b/vs/sdl2/docs/README-wince.md similarity index 100% rename from vs2015/sdl2/docs/README-wince.md rename to vs/sdl2/docs/README-wince.md diff --git a/vs2015/sdl2/docs/README-windows.md b/vs/sdl2/docs/README-windows.md similarity index 100% rename from vs2015/sdl2/docs/README-windows.md rename to vs/sdl2/docs/README-windows.md diff --git a/vs2015/sdl2/docs/README-winrt.md b/vs/sdl2/docs/README-winrt.md similarity index 100% rename from vs2015/sdl2/docs/README-winrt.md rename to vs/sdl2/docs/README-winrt.md diff --git a/vs2015/sdl2/docs/README.md b/vs/sdl2/docs/README.md similarity index 100% rename from vs2015/sdl2/docs/README.md rename to vs/sdl2/docs/README.md diff --git a/vs2015/sdl2/docs/doxyfile b/vs/sdl2/docs/doxyfile similarity index 100% rename from vs2015/sdl2/docs/doxyfile rename to vs/sdl2/docs/doxyfile diff --git a/vs2015/sdl2/include/SDL.h b/vs/sdl2/include/SDL.h similarity index 100% rename from vs2015/sdl2/include/SDL.h rename to vs/sdl2/include/SDL.h diff --git a/vs2015/sdl2/include/SDL_assert.h b/vs/sdl2/include/SDL_assert.h similarity index 100% rename from vs2015/sdl2/include/SDL_assert.h rename to vs/sdl2/include/SDL_assert.h diff --git a/vs2015/sdl2/include/SDL_atomic.h b/vs/sdl2/include/SDL_atomic.h similarity index 100% rename from vs2015/sdl2/include/SDL_atomic.h rename to vs/sdl2/include/SDL_atomic.h diff --git a/vs2015/sdl2/include/SDL_audio.h b/vs/sdl2/include/SDL_audio.h similarity index 100% rename from vs2015/sdl2/include/SDL_audio.h rename to vs/sdl2/include/SDL_audio.h diff --git a/vs2015/sdl2/include/SDL_bits.h b/vs/sdl2/include/SDL_bits.h similarity index 100% rename from vs2015/sdl2/include/SDL_bits.h rename to vs/sdl2/include/SDL_bits.h diff --git a/vs2015/sdl2/include/SDL_blendmode.h b/vs/sdl2/include/SDL_blendmode.h similarity index 100% rename from vs2015/sdl2/include/SDL_blendmode.h rename to vs/sdl2/include/SDL_blendmode.h diff --git a/vs2015/sdl2/include/SDL_clipboard.h b/vs/sdl2/include/SDL_clipboard.h similarity index 100% rename from vs2015/sdl2/include/SDL_clipboard.h rename to vs/sdl2/include/SDL_clipboard.h diff --git a/vs2015/sdl2/include/SDL_config.h b/vs/sdl2/include/SDL_config.h similarity index 100% rename from vs2015/sdl2/include/SDL_config.h rename to vs/sdl2/include/SDL_config.h diff --git a/vs2015/sdl2/include/SDL_config.h.cmake b/vs/sdl2/include/SDL_config.h.cmake similarity index 100% rename from vs2015/sdl2/include/SDL_config.h.cmake rename to vs/sdl2/include/SDL_config.h.cmake diff --git a/vs2015/sdl2/include/SDL_config.h.in b/vs/sdl2/include/SDL_config.h.in similarity index 100% rename from vs2015/sdl2/include/SDL_config.h.in rename to vs/sdl2/include/SDL_config.h.in diff --git a/vs2015/sdl2/include/SDL_config_android.h b/vs/sdl2/include/SDL_config_android.h similarity index 100% rename from vs2015/sdl2/include/SDL_config_android.h rename to vs/sdl2/include/SDL_config_android.h diff --git a/vs2015/sdl2/include/SDL_config_iphoneos.h b/vs/sdl2/include/SDL_config_iphoneos.h similarity index 100% rename from vs2015/sdl2/include/SDL_config_iphoneos.h rename to vs/sdl2/include/SDL_config_iphoneos.h diff --git a/vs2015/sdl2/include/SDL_config_macosx.h b/vs/sdl2/include/SDL_config_macosx.h similarity index 100% rename from vs2015/sdl2/include/SDL_config_macosx.h rename to vs/sdl2/include/SDL_config_macosx.h diff --git a/vs2015/sdl2/include/SDL_config_minimal.h b/vs/sdl2/include/SDL_config_minimal.h similarity index 100% rename from vs2015/sdl2/include/SDL_config_minimal.h rename to vs/sdl2/include/SDL_config_minimal.h diff --git a/vs2015/sdl2/include/SDL_config_os2.h b/vs/sdl2/include/SDL_config_os2.h similarity index 100% rename from vs2015/sdl2/include/SDL_config_os2.h rename to vs/sdl2/include/SDL_config_os2.h diff --git a/vs2015/sdl2/include/SDL_config_pandora.h b/vs/sdl2/include/SDL_config_pandora.h similarity index 100% rename from vs2015/sdl2/include/SDL_config_pandora.h rename to vs/sdl2/include/SDL_config_pandora.h diff --git a/vs2015/sdl2/include/SDL_config_psp.h b/vs/sdl2/include/SDL_config_psp.h similarity index 100% rename from vs2015/sdl2/include/SDL_config_psp.h rename to vs/sdl2/include/SDL_config_psp.h diff --git a/vs2015/sdl2/include/SDL_config_windows.h b/vs/sdl2/include/SDL_config_windows.h similarity index 100% rename from vs2015/sdl2/include/SDL_config_windows.h rename to vs/sdl2/include/SDL_config_windows.h diff --git a/vs2015/sdl2/include/SDL_config_winrt.h b/vs/sdl2/include/SDL_config_winrt.h similarity index 100% rename from vs2015/sdl2/include/SDL_config_winrt.h rename to vs/sdl2/include/SDL_config_winrt.h diff --git a/vs2015/sdl2/include/SDL_config_wiz.h b/vs/sdl2/include/SDL_config_wiz.h similarity index 100% rename from vs2015/sdl2/include/SDL_config_wiz.h rename to vs/sdl2/include/SDL_config_wiz.h diff --git a/vs2015/sdl2/include/SDL_copying.h b/vs/sdl2/include/SDL_copying.h similarity index 100% rename from vs2015/sdl2/include/SDL_copying.h rename to vs/sdl2/include/SDL_copying.h diff --git a/vs2015/sdl2/include/SDL_cpuinfo.h b/vs/sdl2/include/SDL_cpuinfo.h similarity index 100% rename from vs2015/sdl2/include/SDL_cpuinfo.h rename to vs/sdl2/include/SDL_cpuinfo.h diff --git a/vs2015/sdl2/include/SDL_egl.h b/vs/sdl2/include/SDL_egl.h similarity index 100% rename from vs2015/sdl2/include/SDL_egl.h rename to vs/sdl2/include/SDL_egl.h diff --git a/vs2015/sdl2/include/SDL_endian.h b/vs/sdl2/include/SDL_endian.h similarity index 100% rename from vs2015/sdl2/include/SDL_endian.h rename to vs/sdl2/include/SDL_endian.h diff --git a/vs2015/sdl2/include/SDL_error.h b/vs/sdl2/include/SDL_error.h similarity index 100% rename from vs2015/sdl2/include/SDL_error.h rename to vs/sdl2/include/SDL_error.h diff --git a/vs2015/sdl2/include/SDL_events.h b/vs/sdl2/include/SDL_events.h similarity index 100% rename from vs2015/sdl2/include/SDL_events.h rename to vs/sdl2/include/SDL_events.h diff --git a/vs2015/sdl2/include/SDL_filesystem.h b/vs/sdl2/include/SDL_filesystem.h similarity index 100% rename from vs2015/sdl2/include/SDL_filesystem.h rename to vs/sdl2/include/SDL_filesystem.h diff --git a/vs2015/sdl2/include/SDL_gamecontroller.h b/vs/sdl2/include/SDL_gamecontroller.h similarity index 100% rename from vs2015/sdl2/include/SDL_gamecontroller.h rename to vs/sdl2/include/SDL_gamecontroller.h diff --git a/vs2015/sdl2/include/SDL_gesture.h b/vs/sdl2/include/SDL_gesture.h similarity index 100% rename from vs2015/sdl2/include/SDL_gesture.h rename to vs/sdl2/include/SDL_gesture.h diff --git a/vs2015/sdl2/include/SDL_haptic.h b/vs/sdl2/include/SDL_haptic.h similarity index 100% rename from vs2015/sdl2/include/SDL_haptic.h rename to vs/sdl2/include/SDL_haptic.h diff --git a/vs2015/sdl2/include/SDL_hints.h b/vs/sdl2/include/SDL_hints.h similarity index 100% rename from vs2015/sdl2/include/SDL_hints.h rename to vs/sdl2/include/SDL_hints.h diff --git a/vs2015/sdl2/include/SDL_joystick.h b/vs/sdl2/include/SDL_joystick.h similarity index 100% rename from vs2015/sdl2/include/SDL_joystick.h rename to vs/sdl2/include/SDL_joystick.h diff --git a/vs2015/sdl2/include/SDL_keyboard.h b/vs/sdl2/include/SDL_keyboard.h similarity index 100% rename from vs2015/sdl2/include/SDL_keyboard.h rename to vs/sdl2/include/SDL_keyboard.h diff --git a/vs2015/sdl2/include/SDL_keycode.h b/vs/sdl2/include/SDL_keycode.h similarity index 100% rename from vs2015/sdl2/include/SDL_keycode.h rename to vs/sdl2/include/SDL_keycode.h diff --git a/vs2015/sdl2/include/SDL_loadso.h b/vs/sdl2/include/SDL_loadso.h similarity index 100% rename from vs2015/sdl2/include/SDL_loadso.h rename to vs/sdl2/include/SDL_loadso.h diff --git a/vs2015/sdl2/include/SDL_log.h b/vs/sdl2/include/SDL_log.h similarity index 100% rename from vs2015/sdl2/include/SDL_log.h rename to vs/sdl2/include/SDL_log.h diff --git a/vs2015/sdl2/include/SDL_main.h b/vs/sdl2/include/SDL_main.h similarity index 100% rename from vs2015/sdl2/include/SDL_main.h rename to vs/sdl2/include/SDL_main.h diff --git a/vs2015/sdl2/include/SDL_messagebox.h b/vs/sdl2/include/SDL_messagebox.h similarity index 100% rename from vs2015/sdl2/include/SDL_messagebox.h rename to vs/sdl2/include/SDL_messagebox.h diff --git a/vs2015/sdl2/include/SDL_mouse.h b/vs/sdl2/include/SDL_mouse.h similarity index 100% rename from vs2015/sdl2/include/SDL_mouse.h rename to vs/sdl2/include/SDL_mouse.h diff --git a/vs2015/sdl2/include/SDL_mutex.h b/vs/sdl2/include/SDL_mutex.h similarity index 100% rename from vs2015/sdl2/include/SDL_mutex.h rename to vs/sdl2/include/SDL_mutex.h diff --git a/vs2015/sdl2/include/SDL_name.h b/vs/sdl2/include/SDL_name.h similarity index 100% rename from vs2015/sdl2/include/SDL_name.h rename to vs/sdl2/include/SDL_name.h diff --git a/vs2015/sdl2/include/SDL_opengl.h b/vs/sdl2/include/SDL_opengl.h similarity index 100% rename from vs2015/sdl2/include/SDL_opengl.h rename to vs/sdl2/include/SDL_opengl.h diff --git a/vs2015/sdl2/include/SDL_opengl_glext.h b/vs/sdl2/include/SDL_opengl_glext.h similarity index 100% rename from vs2015/sdl2/include/SDL_opengl_glext.h rename to vs/sdl2/include/SDL_opengl_glext.h diff --git a/vs2015/sdl2/include/SDL_opengles.h b/vs/sdl2/include/SDL_opengles.h similarity index 100% rename from vs2015/sdl2/include/SDL_opengles.h rename to vs/sdl2/include/SDL_opengles.h diff --git a/vs2015/sdl2/include/SDL_opengles2.h b/vs/sdl2/include/SDL_opengles2.h similarity index 100% rename from vs2015/sdl2/include/SDL_opengles2.h rename to vs/sdl2/include/SDL_opengles2.h diff --git a/vs2015/sdl2/include/SDL_opengles2_gl2.h b/vs/sdl2/include/SDL_opengles2_gl2.h similarity index 100% rename from vs2015/sdl2/include/SDL_opengles2_gl2.h rename to vs/sdl2/include/SDL_opengles2_gl2.h diff --git a/vs2015/sdl2/include/SDL_opengles2_gl2ext.h b/vs/sdl2/include/SDL_opengles2_gl2ext.h similarity index 100% rename from vs2015/sdl2/include/SDL_opengles2_gl2ext.h rename to vs/sdl2/include/SDL_opengles2_gl2ext.h diff --git a/vs2015/sdl2/include/SDL_opengles2_gl2platform.h b/vs/sdl2/include/SDL_opengles2_gl2platform.h similarity index 100% rename from vs2015/sdl2/include/SDL_opengles2_gl2platform.h rename to vs/sdl2/include/SDL_opengles2_gl2platform.h diff --git a/vs2015/sdl2/include/SDL_opengles2_khrplatform.h b/vs/sdl2/include/SDL_opengles2_khrplatform.h similarity index 100% rename from vs2015/sdl2/include/SDL_opengles2_khrplatform.h rename to vs/sdl2/include/SDL_opengles2_khrplatform.h diff --git a/vs2015/sdl2/include/SDL_pixels.h b/vs/sdl2/include/SDL_pixels.h similarity index 100% rename from vs2015/sdl2/include/SDL_pixels.h rename to vs/sdl2/include/SDL_pixels.h diff --git a/vs2015/sdl2/include/SDL_platform.h b/vs/sdl2/include/SDL_platform.h similarity index 100% rename from vs2015/sdl2/include/SDL_platform.h rename to vs/sdl2/include/SDL_platform.h diff --git a/vs2015/sdl2/include/SDL_power.h b/vs/sdl2/include/SDL_power.h similarity index 100% rename from vs2015/sdl2/include/SDL_power.h rename to vs/sdl2/include/SDL_power.h diff --git a/vs2015/sdl2/include/SDL_quit.h b/vs/sdl2/include/SDL_quit.h similarity index 100% rename from vs2015/sdl2/include/SDL_quit.h rename to vs/sdl2/include/SDL_quit.h diff --git a/vs2015/sdl2/include/SDL_rect.h b/vs/sdl2/include/SDL_rect.h similarity index 100% rename from vs2015/sdl2/include/SDL_rect.h rename to vs/sdl2/include/SDL_rect.h diff --git a/vs2015/sdl2/include/SDL_render.h b/vs/sdl2/include/SDL_render.h similarity index 100% rename from vs2015/sdl2/include/SDL_render.h rename to vs/sdl2/include/SDL_render.h diff --git a/vs2015/sdl2/include/SDL_revision.h b/vs/sdl2/include/SDL_revision.h similarity index 100% rename from vs2015/sdl2/include/SDL_revision.h rename to vs/sdl2/include/SDL_revision.h diff --git a/vs2015/sdl2/include/SDL_rwops.h b/vs/sdl2/include/SDL_rwops.h similarity index 100% rename from vs2015/sdl2/include/SDL_rwops.h rename to vs/sdl2/include/SDL_rwops.h diff --git a/vs2015/sdl2/include/SDL_scancode.h b/vs/sdl2/include/SDL_scancode.h similarity index 100% rename from vs2015/sdl2/include/SDL_scancode.h rename to vs/sdl2/include/SDL_scancode.h diff --git a/vs2015/sdl2/include/SDL_sensor.h b/vs/sdl2/include/SDL_sensor.h similarity index 100% rename from vs2015/sdl2/include/SDL_sensor.h rename to vs/sdl2/include/SDL_sensor.h diff --git a/vs2015/sdl2/include/SDL_shape.h b/vs/sdl2/include/SDL_shape.h similarity index 100% rename from vs2015/sdl2/include/SDL_shape.h rename to vs/sdl2/include/SDL_shape.h diff --git a/vs2015/sdl2/include/SDL_stdinc.h b/vs/sdl2/include/SDL_stdinc.h similarity index 100% rename from vs2015/sdl2/include/SDL_stdinc.h rename to vs/sdl2/include/SDL_stdinc.h diff --git a/vs2015/sdl2/include/SDL_surface.h b/vs/sdl2/include/SDL_surface.h similarity index 100% rename from vs2015/sdl2/include/SDL_surface.h rename to vs/sdl2/include/SDL_surface.h diff --git a/vs2015/sdl2/include/SDL_system.h b/vs/sdl2/include/SDL_system.h similarity index 100% rename from vs2015/sdl2/include/SDL_system.h rename to vs/sdl2/include/SDL_system.h diff --git a/vs2015/sdl2/include/SDL_syswm.h b/vs/sdl2/include/SDL_syswm.h similarity index 100% rename from vs2015/sdl2/include/SDL_syswm.h rename to vs/sdl2/include/SDL_syswm.h diff --git a/vs2015/sdl2/include/SDL_test.h b/vs/sdl2/include/SDL_test.h similarity index 100% rename from vs2015/sdl2/include/SDL_test.h rename to vs/sdl2/include/SDL_test.h diff --git a/vs2015/sdl2/include/SDL_test_assert.h b/vs/sdl2/include/SDL_test_assert.h similarity index 100% rename from vs2015/sdl2/include/SDL_test_assert.h rename to vs/sdl2/include/SDL_test_assert.h diff --git a/vs2015/sdl2/include/SDL_test_common.h b/vs/sdl2/include/SDL_test_common.h similarity index 100% rename from vs2015/sdl2/include/SDL_test_common.h rename to vs/sdl2/include/SDL_test_common.h diff --git a/vs2015/sdl2/include/SDL_test_compare.h b/vs/sdl2/include/SDL_test_compare.h similarity index 100% rename from vs2015/sdl2/include/SDL_test_compare.h rename to vs/sdl2/include/SDL_test_compare.h diff --git a/vs2015/sdl2/include/SDL_test_crc32.h b/vs/sdl2/include/SDL_test_crc32.h similarity index 100% rename from vs2015/sdl2/include/SDL_test_crc32.h rename to vs/sdl2/include/SDL_test_crc32.h diff --git a/vs2015/sdl2/include/SDL_test_font.h b/vs/sdl2/include/SDL_test_font.h similarity index 100% rename from vs2015/sdl2/include/SDL_test_font.h rename to vs/sdl2/include/SDL_test_font.h diff --git a/vs2015/sdl2/include/SDL_test_fuzzer.h b/vs/sdl2/include/SDL_test_fuzzer.h similarity index 100% rename from vs2015/sdl2/include/SDL_test_fuzzer.h rename to vs/sdl2/include/SDL_test_fuzzer.h diff --git a/vs2015/sdl2/include/SDL_test_harness.h b/vs/sdl2/include/SDL_test_harness.h similarity index 100% rename from vs2015/sdl2/include/SDL_test_harness.h rename to vs/sdl2/include/SDL_test_harness.h diff --git a/vs2015/sdl2/include/SDL_test_images.h b/vs/sdl2/include/SDL_test_images.h similarity index 100% rename from vs2015/sdl2/include/SDL_test_images.h rename to vs/sdl2/include/SDL_test_images.h diff --git a/vs2015/sdl2/include/SDL_test_log.h b/vs/sdl2/include/SDL_test_log.h similarity index 100% rename from vs2015/sdl2/include/SDL_test_log.h rename to vs/sdl2/include/SDL_test_log.h diff --git a/vs2015/sdl2/include/SDL_test_md5.h b/vs/sdl2/include/SDL_test_md5.h similarity index 100% rename from vs2015/sdl2/include/SDL_test_md5.h rename to vs/sdl2/include/SDL_test_md5.h diff --git a/vs2015/sdl2/include/SDL_test_memory.h b/vs/sdl2/include/SDL_test_memory.h similarity index 100% rename from vs2015/sdl2/include/SDL_test_memory.h rename to vs/sdl2/include/SDL_test_memory.h diff --git a/vs2015/sdl2/include/SDL_test_random.h b/vs/sdl2/include/SDL_test_random.h similarity index 100% rename from vs2015/sdl2/include/SDL_test_random.h rename to vs/sdl2/include/SDL_test_random.h diff --git a/vs2015/sdl2/include/SDL_thread.h b/vs/sdl2/include/SDL_thread.h similarity index 100% rename from vs2015/sdl2/include/SDL_thread.h rename to vs/sdl2/include/SDL_thread.h diff --git a/vs2015/sdl2/include/SDL_timer.h b/vs/sdl2/include/SDL_timer.h similarity index 100% rename from vs2015/sdl2/include/SDL_timer.h rename to vs/sdl2/include/SDL_timer.h diff --git a/vs2015/sdl2/include/SDL_touch.h b/vs/sdl2/include/SDL_touch.h similarity index 100% rename from vs2015/sdl2/include/SDL_touch.h rename to vs/sdl2/include/SDL_touch.h diff --git a/vs2015/sdl2/include/SDL_types.h b/vs/sdl2/include/SDL_types.h similarity index 100% rename from vs2015/sdl2/include/SDL_types.h rename to vs/sdl2/include/SDL_types.h diff --git a/vs2015/sdl2/include/SDL_version.h b/vs/sdl2/include/SDL_version.h similarity index 100% rename from vs2015/sdl2/include/SDL_version.h rename to vs/sdl2/include/SDL_version.h diff --git a/vs2015/sdl2/include/SDL_video.h b/vs/sdl2/include/SDL_video.h similarity index 100% rename from vs2015/sdl2/include/SDL_video.h rename to vs/sdl2/include/SDL_video.h diff --git a/vs2015/sdl2/include/SDL_vulkan.h b/vs/sdl2/include/SDL_vulkan.h similarity index 100% rename from vs2015/sdl2/include/SDL_vulkan.h rename to vs/sdl2/include/SDL_vulkan.h diff --git a/vs2015/sdl2/include/begin_code.h b/vs/sdl2/include/begin_code.h similarity index 100% rename from vs2015/sdl2/include/begin_code.h rename to vs/sdl2/include/begin_code.h diff --git a/vs2015/sdl2/include/close_code.h b/vs/sdl2/include/close_code.h similarity index 100% rename from vs2015/sdl2/include/close_code.h rename to vs/sdl2/include/close_code.h diff --git a/vs2015/sdl2/sdl2-config.cmake.in b/vs/sdl2/sdl2-config.cmake.in similarity index 100% rename from vs2015/sdl2/sdl2-config.cmake.in rename to vs/sdl2/sdl2-config.cmake.in diff --git a/vs2015/sdl2/sdl2-config.in b/vs/sdl2/sdl2-config.in similarity index 100% rename from vs2015/sdl2/sdl2-config.in rename to vs/sdl2/sdl2-config.in diff --git a/vs2015/sdl2/sdl2.m4 b/vs/sdl2/sdl2.m4 similarity index 100% rename from vs2015/sdl2/sdl2.m4 rename to vs/sdl2/sdl2.m4 diff --git a/vs2015/sdl2/sdl2.pc.in b/vs/sdl2/sdl2.pc.in similarity index 100% rename from vs2015/sdl2/sdl2.pc.in rename to vs/sdl2/sdl2.pc.in diff --git a/vs2015/sdl2/src/SDL.c b/vs/sdl2/src/SDL.c similarity index 100% rename from vs2015/sdl2/src/SDL.c rename to vs/sdl2/src/SDL.c diff --git a/vs2015/sdl2/src/SDL_assert.c b/vs/sdl2/src/SDL_assert.c similarity index 100% rename from vs2015/sdl2/src/SDL_assert.c rename to vs/sdl2/src/SDL_assert.c diff --git a/vs2015/sdl2/src/SDL_assert_c.h b/vs/sdl2/src/SDL_assert_c.h similarity index 100% rename from vs2015/sdl2/src/SDL_assert_c.h rename to vs/sdl2/src/SDL_assert_c.h diff --git a/vs2015/sdl2/src/SDL_dataqueue.c b/vs/sdl2/src/SDL_dataqueue.c similarity index 100% rename from vs2015/sdl2/src/SDL_dataqueue.c rename to vs/sdl2/src/SDL_dataqueue.c diff --git a/vs2015/sdl2/src/SDL_dataqueue.h b/vs/sdl2/src/SDL_dataqueue.h similarity index 100% rename from vs2015/sdl2/src/SDL_dataqueue.h rename to vs/sdl2/src/SDL_dataqueue.h diff --git a/vs2015/sdl2/src/SDL_error.c b/vs/sdl2/src/SDL_error.c similarity index 100% rename from vs2015/sdl2/src/SDL_error.c rename to vs/sdl2/src/SDL_error.c diff --git a/vs2015/sdl2/src/SDL_error_c.h b/vs/sdl2/src/SDL_error_c.h similarity index 100% rename from vs2015/sdl2/src/SDL_error_c.h rename to vs/sdl2/src/SDL_error_c.h diff --git a/vs2015/sdl2/src/SDL_hints.c b/vs/sdl2/src/SDL_hints.c similarity index 100% rename from vs2015/sdl2/src/SDL_hints.c rename to vs/sdl2/src/SDL_hints.c diff --git a/vs2015/sdl2/src/SDL_internal.h b/vs/sdl2/src/SDL_internal.h similarity index 100% rename from vs2015/sdl2/src/SDL_internal.h rename to vs/sdl2/src/SDL_internal.h diff --git a/vs2015/sdl2/src/SDL_log.c b/vs/sdl2/src/SDL_log.c similarity index 100% rename from vs2015/sdl2/src/SDL_log.c rename to vs/sdl2/src/SDL_log.c diff --git a/vs2015/sdl2/src/atomic/SDL_atomic.c b/vs/sdl2/src/atomic/SDL_atomic.c similarity index 100% rename from vs2015/sdl2/src/atomic/SDL_atomic.c rename to vs/sdl2/src/atomic/SDL_atomic.c diff --git a/vs2015/sdl2/src/atomic/SDL_spinlock.c b/vs/sdl2/src/atomic/SDL_spinlock.c similarity index 100% rename from vs2015/sdl2/src/atomic/SDL_spinlock.c rename to vs/sdl2/src/atomic/SDL_spinlock.c diff --git a/vs2015/sdl2/src/audio/SDL_audio.c b/vs/sdl2/src/audio/SDL_audio.c similarity index 100% rename from vs2015/sdl2/src/audio/SDL_audio.c rename to vs/sdl2/src/audio/SDL_audio.c diff --git a/vs2015/sdl2/src/audio/SDL_audio_c.h b/vs/sdl2/src/audio/SDL_audio_c.h similarity index 100% rename from vs2015/sdl2/src/audio/SDL_audio_c.h rename to vs/sdl2/src/audio/SDL_audio_c.h diff --git a/vs2015/sdl2/src/audio/SDL_audiocvt.c b/vs/sdl2/src/audio/SDL_audiocvt.c similarity index 100% rename from vs2015/sdl2/src/audio/SDL_audiocvt.c rename to vs/sdl2/src/audio/SDL_audiocvt.c diff --git a/vs2015/sdl2/src/audio/SDL_audiodev.c b/vs/sdl2/src/audio/SDL_audiodev.c similarity index 100% rename from vs2015/sdl2/src/audio/SDL_audiodev.c rename to vs/sdl2/src/audio/SDL_audiodev.c diff --git a/vs2015/sdl2/src/audio/SDL_audiodev_c.h b/vs/sdl2/src/audio/SDL_audiodev_c.h similarity index 100% rename from vs2015/sdl2/src/audio/SDL_audiodev_c.h rename to vs/sdl2/src/audio/SDL_audiodev_c.h diff --git a/vs2015/sdl2/src/audio/SDL_audiotypecvt.c b/vs/sdl2/src/audio/SDL_audiotypecvt.c similarity index 100% rename from vs2015/sdl2/src/audio/SDL_audiotypecvt.c rename to vs/sdl2/src/audio/SDL_audiotypecvt.c diff --git a/vs2015/sdl2/src/audio/SDL_mixer.c b/vs/sdl2/src/audio/SDL_mixer.c similarity index 100% rename from vs2015/sdl2/src/audio/SDL_mixer.c rename to vs/sdl2/src/audio/SDL_mixer.c diff --git a/vs2015/sdl2/src/audio/SDL_sysaudio.h b/vs/sdl2/src/audio/SDL_sysaudio.h similarity index 100% rename from vs2015/sdl2/src/audio/SDL_sysaudio.h rename to vs/sdl2/src/audio/SDL_sysaudio.h diff --git a/vs2015/sdl2/src/audio/SDL_wave.c b/vs/sdl2/src/audio/SDL_wave.c similarity index 100% rename from vs2015/sdl2/src/audio/SDL_wave.c rename to vs/sdl2/src/audio/SDL_wave.c diff --git a/vs2015/sdl2/src/audio/SDL_wave.h b/vs/sdl2/src/audio/SDL_wave.h similarity index 100% rename from vs2015/sdl2/src/audio/SDL_wave.h rename to vs/sdl2/src/audio/SDL_wave.h diff --git a/vs2015/sdl2/src/audio/alsa/SDL_alsa_audio.c b/vs/sdl2/src/audio/alsa/SDL_alsa_audio.c similarity index 100% rename from vs2015/sdl2/src/audio/alsa/SDL_alsa_audio.c rename to vs/sdl2/src/audio/alsa/SDL_alsa_audio.c diff --git a/vs2015/sdl2/src/audio/alsa/SDL_alsa_audio.h b/vs/sdl2/src/audio/alsa/SDL_alsa_audio.h similarity index 100% rename from vs2015/sdl2/src/audio/alsa/SDL_alsa_audio.h rename to vs/sdl2/src/audio/alsa/SDL_alsa_audio.h diff --git a/vs2015/sdl2/src/audio/android/SDL_androidaudio.c b/vs/sdl2/src/audio/android/SDL_androidaudio.c similarity index 100% rename from vs2015/sdl2/src/audio/android/SDL_androidaudio.c rename to vs/sdl2/src/audio/android/SDL_androidaudio.c diff --git a/vs2015/sdl2/src/audio/android/SDL_androidaudio.h b/vs/sdl2/src/audio/android/SDL_androidaudio.h similarity index 100% rename from vs2015/sdl2/src/audio/android/SDL_androidaudio.h rename to vs/sdl2/src/audio/android/SDL_androidaudio.h diff --git a/vs2015/sdl2/src/audio/arts/SDL_artsaudio.c b/vs/sdl2/src/audio/arts/SDL_artsaudio.c similarity index 100% rename from vs2015/sdl2/src/audio/arts/SDL_artsaudio.c rename to vs/sdl2/src/audio/arts/SDL_artsaudio.c diff --git a/vs2015/sdl2/src/audio/arts/SDL_artsaudio.h b/vs/sdl2/src/audio/arts/SDL_artsaudio.h similarity index 100% rename from vs2015/sdl2/src/audio/arts/SDL_artsaudio.h rename to vs/sdl2/src/audio/arts/SDL_artsaudio.h diff --git a/vs2015/sdl2/src/audio/coreaudio/SDL_coreaudio.h b/vs/sdl2/src/audio/coreaudio/SDL_coreaudio.h similarity index 100% rename from vs2015/sdl2/src/audio/coreaudio/SDL_coreaudio.h rename to vs/sdl2/src/audio/coreaudio/SDL_coreaudio.h diff --git a/vs2015/sdl2/src/audio/coreaudio/SDL_coreaudio.m b/vs/sdl2/src/audio/coreaudio/SDL_coreaudio.m similarity index 100% rename from vs2015/sdl2/src/audio/coreaudio/SDL_coreaudio.m rename to vs/sdl2/src/audio/coreaudio/SDL_coreaudio.m diff --git a/vs2015/sdl2/src/audio/directsound/SDL_directsound.c b/vs/sdl2/src/audio/directsound/SDL_directsound.c similarity index 100% rename from vs2015/sdl2/src/audio/directsound/SDL_directsound.c rename to vs/sdl2/src/audio/directsound/SDL_directsound.c diff --git a/vs2015/sdl2/src/audio/directsound/SDL_directsound.h b/vs/sdl2/src/audio/directsound/SDL_directsound.h similarity index 100% rename from vs2015/sdl2/src/audio/directsound/SDL_directsound.h rename to vs/sdl2/src/audio/directsound/SDL_directsound.h diff --git a/vs2015/sdl2/src/audio/disk/SDL_diskaudio.c b/vs/sdl2/src/audio/disk/SDL_diskaudio.c similarity index 100% rename from vs2015/sdl2/src/audio/disk/SDL_diskaudio.c rename to vs/sdl2/src/audio/disk/SDL_diskaudio.c diff --git a/vs2015/sdl2/src/audio/disk/SDL_diskaudio.h b/vs/sdl2/src/audio/disk/SDL_diskaudio.h similarity index 100% rename from vs2015/sdl2/src/audio/disk/SDL_diskaudio.h rename to vs/sdl2/src/audio/disk/SDL_diskaudio.h diff --git a/vs2015/sdl2/src/audio/dsp/SDL_dspaudio.c b/vs/sdl2/src/audio/dsp/SDL_dspaudio.c similarity index 100% rename from vs2015/sdl2/src/audio/dsp/SDL_dspaudio.c rename to vs/sdl2/src/audio/dsp/SDL_dspaudio.c diff --git a/vs2015/sdl2/src/audio/dsp/SDL_dspaudio.h b/vs/sdl2/src/audio/dsp/SDL_dspaudio.h similarity index 100% rename from vs2015/sdl2/src/audio/dsp/SDL_dspaudio.h rename to vs/sdl2/src/audio/dsp/SDL_dspaudio.h diff --git a/vs2015/sdl2/src/audio/dummy/SDL_dummyaudio.c b/vs/sdl2/src/audio/dummy/SDL_dummyaudio.c similarity index 100% rename from vs2015/sdl2/src/audio/dummy/SDL_dummyaudio.c rename to vs/sdl2/src/audio/dummy/SDL_dummyaudio.c diff --git a/vs2015/sdl2/src/audio/dummy/SDL_dummyaudio.h b/vs/sdl2/src/audio/dummy/SDL_dummyaudio.h similarity index 100% rename from vs2015/sdl2/src/audio/dummy/SDL_dummyaudio.h rename to vs/sdl2/src/audio/dummy/SDL_dummyaudio.h diff --git a/vs2015/sdl2/src/audio/emscripten/SDL_emscriptenaudio.c b/vs/sdl2/src/audio/emscripten/SDL_emscriptenaudio.c similarity index 100% rename from vs2015/sdl2/src/audio/emscripten/SDL_emscriptenaudio.c rename to vs/sdl2/src/audio/emscripten/SDL_emscriptenaudio.c diff --git a/vs2015/sdl2/src/audio/emscripten/SDL_emscriptenaudio.h b/vs/sdl2/src/audio/emscripten/SDL_emscriptenaudio.h similarity index 100% rename from vs2015/sdl2/src/audio/emscripten/SDL_emscriptenaudio.h rename to vs/sdl2/src/audio/emscripten/SDL_emscriptenaudio.h diff --git a/vs2015/sdl2/src/audio/esd/SDL_esdaudio.c b/vs/sdl2/src/audio/esd/SDL_esdaudio.c similarity index 100% rename from vs2015/sdl2/src/audio/esd/SDL_esdaudio.c rename to vs/sdl2/src/audio/esd/SDL_esdaudio.c diff --git a/vs2015/sdl2/src/audio/esd/SDL_esdaudio.h b/vs/sdl2/src/audio/esd/SDL_esdaudio.h similarity index 100% rename from vs2015/sdl2/src/audio/esd/SDL_esdaudio.h rename to vs/sdl2/src/audio/esd/SDL_esdaudio.h diff --git a/vs2015/sdl2/src/audio/fusionsound/SDL_fsaudio.c b/vs/sdl2/src/audio/fusionsound/SDL_fsaudio.c similarity index 100% rename from vs2015/sdl2/src/audio/fusionsound/SDL_fsaudio.c rename to vs/sdl2/src/audio/fusionsound/SDL_fsaudio.c diff --git a/vs2015/sdl2/src/audio/fusionsound/SDL_fsaudio.h b/vs/sdl2/src/audio/fusionsound/SDL_fsaudio.h similarity index 100% rename from vs2015/sdl2/src/audio/fusionsound/SDL_fsaudio.h rename to vs/sdl2/src/audio/fusionsound/SDL_fsaudio.h diff --git a/vs2015/sdl2/src/audio/haiku/SDL_haikuaudio.cc b/vs/sdl2/src/audio/haiku/SDL_haikuaudio.cc similarity index 100% rename from vs2015/sdl2/src/audio/haiku/SDL_haikuaudio.cc rename to vs/sdl2/src/audio/haiku/SDL_haikuaudio.cc diff --git a/vs2015/sdl2/src/audio/haiku/SDL_haikuaudio.h b/vs/sdl2/src/audio/haiku/SDL_haikuaudio.h similarity index 100% rename from vs2015/sdl2/src/audio/haiku/SDL_haikuaudio.h rename to vs/sdl2/src/audio/haiku/SDL_haikuaudio.h diff --git a/vs2015/sdl2/src/audio/jack/SDL_jackaudio.c b/vs/sdl2/src/audio/jack/SDL_jackaudio.c similarity index 100% rename from vs2015/sdl2/src/audio/jack/SDL_jackaudio.c rename to vs/sdl2/src/audio/jack/SDL_jackaudio.c diff --git a/vs2015/sdl2/src/audio/jack/SDL_jackaudio.h b/vs/sdl2/src/audio/jack/SDL_jackaudio.h similarity index 100% rename from vs2015/sdl2/src/audio/jack/SDL_jackaudio.h rename to vs/sdl2/src/audio/jack/SDL_jackaudio.h diff --git a/vs2015/sdl2/src/audio/nacl/SDL_naclaudio.c b/vs/sdl2/src/audio/nacl/SDL_naclaudio.c similarity index 100% rename from vs2015/sdl2/src/audio/nacl/SDL_naclaudio.c rename to vs/sdl2/src/audio/nacl/SDL_naclaudio.c diff --git a/vs2015/sdl2/src/audio/nacl/SDL_naclaudio.h b/vs/sdl2/src/audio/nacl/SDL_naclaudio.h similarity index 100% rename from vs2015/sdl2/src/audio/nacl/SDL_naclaudio.h rename to vs/sdl2/src/audio/nacl/SDL_naclaudio.h diff --git a/vs2015/sdl2/src/audio/nas/SDL_nasaudio.c b/vs/sdl2/src/audio/nas/SDL_nasaudio.c similarity index 100% rename from vs2015/sdl2/src/audio/nas/SDL_nasaudio.c rename to vs/sdl2/src/audio/nas/SDL_nasaudio.c diff --git a/vs2015/sdl2/src/audio/nas/SDL_nasaudio.h b/vs/sdl2/src/audio/nas/SDL_nasaudio.h similarity index 100% rename from vs2015/sdl2/src/audio/nas/SDL_nasaudio.h rename to vs/sdl2/src/audio/nas/SDL_nasaudio.h diff --git a/vs2015/sdl2/src/audio/netbsd/SDL_netbsdaudio.c b/vs/sdl2/src/audio/netbsd/SDL_netbsdaudio.c similarity index 100% rename from vs2015/sdl2/src/audio/netbsd/SDL_netbsdaudio.c rename to vs/sdl2/src/audio/netbsd/SDL_netbsdaudio.c diff --git a/vs2015/sdl2/src/audio/netbsd/SDL_netbsdaudio.h b/vs/sdl2/src/audio/netbsd/SDL_netbsdaudio.h similarity index 100% rename from vs2015/sdl2/src/audio/netbsd/SDL_netbsdaudio.h rename to vs/sdl2/src/audio/netbsd/SDL_netbsdaudio.h diff --git a/vs2015/sdl2/src/audio/paudio/SDL_paudio.c b/vs/sdl2/src/audio/paudio/SDL_paudio.c similarity index 100% rename from vs2015/sdl2/src/audio/paudio/SDL_paudio.c rename to vs/sdl2/src/audio/paudio/SDL_paudio.c diff --git a/vs2015/sdl2/src/audio/paudio/SDL_paudio.h b/vs/sdl2/src/audio/paudio/SDL_paudio.h similarity index 100% rename from vs2015/sdl2/src/audio/paudio/SDL_paudio.h rename to vs/sdl2/src/audio/paudio/SDL_paudio.h diff --git a/vs2015/sdl2/src/audio/psp/SDL_pspaudio.c b/vs/sdl2/src/audio/psp/SDL_pspaudio.c similarity index 100% rename from vs2015/sdl2/src/audio/psp/SDL_pspaudio.c rename to vs/sdl2/src/audio/psp/SDL_pspaudio.c diff --git a/vs2015/sdl2/src/audio/psp/SDL_pspaudio.h b/vs/sdl2/src/audio/psp/SDL_pspaudio.h similarity index 100% rename from vs2015/sdl2/src/audio/psp/SDL_pspaudio.h rename to vs/sdl2/src/audio/psp/SDL_pspaudio.h diff --git a/vs2015/sdl2/src/audio/pulseaudio/SDL_pulseaudio.c b/vs/sdl2/src/audio/pulseaudio/SDL_pulseaudio.c similarity index 100% rename from vs2015/sdl2/src/audio/pulseaudio/SDL_pulseaudio.c rename to vs/sdl2/src/audio/pulseaudio/SDL_pulseaudio.c diff --git a/vs2015/sdl2/src/audio/pulseaudio/SDL_pulseaudio.h b/vs/sdl2/src/audio/pulseaudio/SDL_pulseaudio.h similarity index 100% rename from vs2015/sdl2/src/audio/pulseaudio/SDL_pulseaudio.h rename to vs/sdl2/src/audio/pulseaudio/SDL_pulseaudio.h diff --git a/vs2015/sdl2/src/audio/qsa/SDL_qsa_audio.c b/vs/sdl2/src/audio/qsa/SDL_qsa_audio.c similarity index 100% rename from vs2015/sdl2/src/audio/qsa/SDL_qsa_audio.c rename to vs/sdl2/src/audio/qsa/SDL_qsa_audio.c diff --git a/vs2015/sdl2/src/audio/qsa/SDL_qsa_audio.h b/vs/sdl2/src/audio/qsa/SDL_qsa_audio.h similarity index 100% rename from vs2015/sdl2/src/audio/qsa/SDL_qsa_audio.h rename to vs/sdl2/src/audio/qsa/SDL_qsa_audio.h diff --git a/vs2015/sdl2/src/audio/sndio/SDL_sndioaudio.c b/vs/sdl2/src/audio/sndio/SDL_sndioaudio.c similarity index 100% rename from vs2015/sdl2/src/audio/sndio/SDL_sndioaudio.c rename to vs/sdl2/src/audio/sndio/SDL_sndioaudio.c diff --git a/vs2015/sdl2/src/audio/sndio/SDL_sndioaudio.h b/vs/sdl2/src/audio/sndio/SDL_sndioaudio.h similarity index 100% rename from vs2015/sdl2/src/audio/sndio/SDL_sndioaudio.h rename to vs/sdl2/src/audio/sndio/SDL_sndioaudio.h diff --git a/vs2015/sdl2/src/audio/sun/SDL_sunaudio.c b/vs/sdl2/src/audio/sun/SDL_sunaudio.c similarity index 100% rename from vs2015/sdl2/src/audio/sun/SDL_sunaudio.c rename to vs/sdl2/src/audio/sun/SDL_sunaudio.c diff --git a/vs2015/sdl2/src/audio/sun/SDL_sunaudio.h b/vs/sdl2/src/audio/sun/SDL_sunaudio.h similarity index 100% rename from vs2015/sdl2/src/audio/sun/SDL_sunaudio.h rename to vs/sdl2/src/audio/sun/SDL_sunaudio.h diff --git a/vs2015/sdl2/src/audio/wasapi/SDL_wasapi.c b/vs/sdl2/src/audio/wasapi/SDL_wasapi.c similarity index 100% rename from vs2015/sdl2/src/audio/wasapi/SDL_wasapi.c rename to vs/sdl2/src/audio/wasapi/SDL_wasapi.c diff --git a/vs2015/sdl2/src/audio/wasapi/SDL_wasapi.h b/vs/sdl2/src/audio/wasapi/SDL_wasapi.h similarity index 100% rename from vs2015/sdl2/src/audio/wasapi/SDL_wasapi.h rename to vs/sdl2/src/audio/wasapi/SDL_wasapi.h diff --git a/vs2015/sdl2/src/audio/wasapi/SDL_wasapi_win32.c b/vs/sdl2/src/audio/wasapi/SDL_wasapi_win32.c similarity index 100% rename from vs2015/sdl2/src/audio/wasapi/SDL_wasapi_win32.c rename to vs/sdl2/src/audio/wasapi/SDL_wasapi_win32.c diff --git a/vs2015/sdl2/src/audio/wasapi/SDL_wasapi_winrt.cpp b/vs/sdl2/src/audio/wasapi/SDL_wasapi_winrt.cpp similarity index 100% rename from vs2015/sdl2/src/audio/wasapi/SDL_wasapi_winrt.cpp rename to vs/sdl2/src/audio/wasapi/SDL_wasapi_winrt.cpp diff --git a/vs2015/sdl2/src/audio/winmm/SDL_winmm.c b/vs/sdl2/src/audio/winmm/SDL_winmm.c similarity index 100% rename from vs2015/sdl2/src/audio/winmm/SDL_winmm.c rename to vs/sdl2/src/audio/winmm/SDL_winmm.c diff --git a/vs2015/sdl2/src/audio/winmm/SDL_winmm.h b/vs/sdl2/src/audio/winmm/SDL_winmm.h similarity index 100% rename from vs2015/sdl2/src/audio/winmm/SDL_winmm.h rename to vs/sdl2/src/audio/winmm/SDL_winmm.h diff --git a/vs2015/sdl2/src/core/android/SDL_android.c b/vs/sdl2/src/core/android/SDL_android.c similarity index 100% rename from vs2015/sdl2/src/core/android/SDL_android.c rename to vs/sdl2/src/core/android/SDL_android.c diff --git a/vs2015/sdl2/src/core/android/SDL_android.h b/vs/sdl2/src/core/android/SDL_android.h similarity index 100% rename from vs2015/sdl2/src/core/android/SDL_android.h rename to vs/sdl2/src/core/android/SDL_android.h diff --git a/vs2015/sdl2/src/core/android/keyinfotable.h b/vs/sdl2/src/core/android/keyinfotable.h similarity index 100% rename from vs2015/sdl2/src/core/android/keyinfotable.h rename to vs/sdl2/src/core/android/keyinfotable.h diff --git a/vs2015/sdl2/src/core/linux/SDL_dbus.c b/vs/sdl2/src/core/linux/SDL_dbus.c similarity index 100% rename from vs2015/sdl2/src/core/linux/SDL_dbus.c rename to vs/sdl2/src/core/linux/SDL_dbus.c diff --git a/vs2015/sdl2/src/core/linux/SDL_dbus.h b/vs/sdl2/src/core/linux/SDL_dbus.h similarity index 100% rename from vs2015/sdl2/src/core/linux/SDL_dbus.h rename to vs/sdl2/src/core/linux/SDL_dbus.h diff --git a/vs2015/sdl2/src/core/linux/SDL_evdev.c b/vs/sdl2/src/core/linux/SDL_evdev.c similarity index 100% rename from vs2015/sdl2/src/core/linux/SDL_evdev.c rename to vs/sdl2/src/core/linux/SDL_evdev.c diff --git a/vs2015/sdl2/src/core/linux/SDL_evdev.h b/vs/sdl2/src/core/linux/SDL_evdev.h similarity index 100% rename from vs2015/sdl2/src/core/linux/SDL_evdev.h rename to vs/sdl2/src/core/linux/SDL_evdev.h diff --git a/vs2015/sdl2/src/core/linux/SDL_evdev_kbd.c b/vs/sdl2/src/core/linux/SDL_evdev_kbd.c similarity index 100% rename from vs2015/sdl2/src/core/linux/SDL_evdev_kbd.c rename to vs/sdl2/src/core/linux/SDL_evdev_kbd.c diff --git a/vs2015/sdl2/src/core/linux/SDL_evdev_kbd.h b/vs/sdl2/src/core/linux/SDL_evdev_kbd.h similarity index 100% rename from vs2015/sdl2/src/core/linux/SDL_evdev_kbd.h rename to vs/sdl2/src/core/linux/SDL_evdev_kbd.h diff --git a/vs2015/sdl2/src/core/linux/SDL_evdev_kbd_default_accents.h b/vs/sdl2/src/core/linux/SDL_evdev_kbd_default_accents.h similarity index 100% rename from vs2015/sdl2/src/core/linux/SDL_evdev_kbd_default_accents.h rename to vs/sdl2/src/core/linux/SDL_evdev_kbd_default_accents.h diff --git a/vs2015/sdl2/src/core/linux/SDL_evdev_kbd_default_keymap.h b/vs/sdl2/src/core/linux/SDL_evdev_kbd_default_keymap.h similarity index 100% rename from vs2015/sdl2/src/core/linux/SDL_evdev_kbd_default_keymap.h rename to vs/sdl2/src/core/linux/SDL_evdev_kbd_default_keymap.h diff --git a/vs2015/sdl2/src/core/linux/SDL_fcitx.c b/vs/sdl2/src/core/linux/SDL_fcitx.c similarity index 100% rename from vs2015/sdl2/src/core/linux/SDL_fcitx.c rename to vs/sdl2/src/core/linux/SDL_fcitx.c diff --git a/vs2015/sdl2/src/core/linux/SDL_fcitx.h b/vs/sdl2/src/core/linux/SDL_fcitx.h similarity index 100% rename from vs2015/sdl2/src/core/linux/SDL_fcitx.h rename to vs/sdl2/src/core/linux/SDL_fcitx.h diff --git a/vs2015/sdl2/src/core/linux/SDL_ibus.c b/vs/sdl2/src/core/linux/SDL_ibus.c similarity index 100% rename from vs2015/sdl2/src/core/linux/SDL_ibus.c rename to vs/sdl2/src/core/linux/SDL_ibus.c diff --git a/vs2015/sdl2/src/core/linux/SDL_ibus.h b/vs/sdl2/src/core/linux/SDL_ibus.h similarity index 100% rename from vs2015/sdl2/src/core/linux/SDL_ibus.h rename to vs/sdl2/src/core/linux/SDL_ibus.h diff --git a/vs2015/sdl2/src/core/linux/SDL_ime.c b/vs/sdl2/src/core/linux/SDL_ime.c similarity index 100% rename from vs2015/sdl2/src/core/linux/SDL_ime.c rename to vs/sdl2/src/core/linux/SDL_ime.c diff --git a/vs2015/sdl2/src/core/linux/SDL_ime.h b/vs/sdl2/src/core/linux/SDL_ime.h similarity index 100% rename from vs2015/sdl2/src/core/linux/SDL_ime.h rename to vs/sdl2/src/core/linux/SDL_ime.h diff --git a/vs2015/sdl2/src/core/linux/SDL_udev.c b/vs/sdl2/src/core/linux/SDL_udev.c similarity index 100% rename from vs2015/sdl2/src/core/linux/SDL_udev.c rename to vs/sdl2/src/core/linux/SDL_udev.c diff --git a/vs2015/sdl2/src/core/linux/SDL_udev.h b/vs/sdl2/src/core/linux/SDL_udev.h similarity index 100% rename from vs2015/sdl2/src/core/linux/SDL_udev.h rename to vs/sdl2/src/core/linux/SDL_udev.h diff --git a/vs2015/sdl2/src/core/unix/SDL_poll.c b/vs/sdl2/src/core/unix/SDL_poll.c similarity index 100% rename from vs2015/sdl2/src/core/unix/SDL_poll.c rename to vs/sdl2/src/core/unix/SDL_poll.c diff --git a/vs2015/sdl2/src/core/unix/SDL_poll.h b/vs/sdl2/src/core/unix/SDL_poll.h similarity index 100% rename from vs2015/sdl2/src/core/unix/SDL_poll.h rename to vs/sdl2/src/core/unix/SDL_poll.h diff --git a/vs2015/sdl2/src/core/windows/SDL_directx.h b/vs/sdl2/src/core/windows/SDL_directx.h similarity index 100% rename from vs2015/sdl2/src/core/windows/SDL_directx.h rename to vs/sdl2/src/core/windows/SDL_directx.h diff --git a/vs2015/sdl2/src/core/windows/SDL_windows.c b/vs/sdl2/src/core/windows/SDL_windows.c similarity index 100% rename from vs2015/sdl2/src/core/windows/SDL_windows.c rename to vs/sdl2/src/core/windows/SDL_windows.c diff --git a/vs2015/sdl2/src/core/windows/SDL_windows.h b/vs/sdl2/src/core/windows/SDL_windows.h similarity index 100% rename from vs2015/sdl2/src/core/windows/SDL_windows.h rename to vs/sdl2/src/core/windows/SDL_windows.h diff --git a/vs2015/sdl2/src/core/windows/SDL_xinput.c b/vs/sdl2/src/core/windows/SDL_xinput.c similarity index 100% rename from vs2015/sdl2/src/core/windows/SDL_xinput.c rename to vs/sdl2/src/core/windows/SDL_xinput.c diff --git a/vs2015/sdl2/src/core/windows/SDL_xinput.h b/vs/sdl2/src/core/windows/SDL_xinput.h similarity index 100% rename from vs2015/sdl2/src/core/windows/SDL_xinput.h rename to vs/sdl2/src/core/windows/SDL_xinput.h diff --git a/vs2015/sdl2/src/core/winrt/SDL_winrtapp_common.cpp b/vs/sdl2/src/core/winrt/SDL_winrtapp_common.cpp similarity index 100% rename from vs2015/sdl2/src/core/winrt/SDL_winrtapp_common.cpp rename to vs/sdl2/src/core/winrt/SDL_winrtapp_common.cpp diff --git a/vs2015/sdl2/src/core/winrt/SDL_winrtapp_common.h b/vs/sdl2/src/core/winrt/SDL_winrtapp_common.h similarity index 100% rename from vs2015/sdl2/src/core/winrt/SDL_winrtapp_common.h rename to vs/sdl2/src/core/winrt/SDL_winrtapp_common.h diff --git a/vs2015/sdl2/src/core/winrt/SDL_winrtapp_direct3d.cpp b/vs/sdl2/src/core/winrt/SDL_winrtapp_direct3d.cpp similarity index 100% rename from vs2015/sdl2/src/core/winrt/SDL_winrtapp_direct3d.cpp rename to vs/sdl2/src/core/winrt/SDL_winrtapp_direct3d.cpp diff --git a/vs2015/sdl2/src/core/winrt/SDL_winrtapp_direct3d.h b/vs/sdl2/src/core/winrt/SDL_winrtapp_direct3d.h similarity index 100% rename from vs2015/sdl2/src/core/winrt/SDL_winrtapp_direct3d.h rename to vs/sdl2/src/core/winrt/SDL_winrtapp_direct3d.h diff --git a/vs2015/sdl2/src/core/winrt/SDL_winrtapp_xaml.cpp b/vs/sdl2/src/core/winrt/SDL_winrtapp_xaml.cpp similarity index 100% rename from vs2015/sdl2/src/core/winrt/SDL_winrtapp_xaml.cpp rename to vs/sdl2/src/core/winrt/SDL_winrtapp_xaml.cpp diff --git a/vs2015/sdl2/src/core/winrt/SDL_winrtapp_xaml.h b/vs/sdl2/src/core/winrt/SDL_winrtapp_xaml.h similarity index 100% rename from vs2015/sdl2/src/core/winrt/SDL_winrtapp_xaml.h rename to vs/sdl2/src/core/winrt/SDL_winrtapp_xaml.h diff --git a/vs2015/sdl2/src/cpuinfo/SDL_cpuinfo.c b/vs/sdl2/src/cpuinfo/SDL_cpuinfo.c similarity index 100% rename from vs2015/sdl2/src/cpuinfo/SDL_cpuinfo.c rename to vs/sdl2/src/cpuinfo/SDL_cpuinfo.c diff --git a/vs2015/sdl2/src/cpuinfo/SDL_simd.h b/vs/sdl2/src/cpuinfo/SDL_simd.h similarity index 100% rename from vs2015/sdl2/src/cpuinfo/SDL_simd.h rename to vs/sdl2/src/cpuinfo/SDL_simd.h diff --git a/vs2015/sdl2/src/dynapi/SDL_dynapi.c b/vs/sdl2/src/dynapi/SDL_dynapi.c similarity index 100% rename from vs2015/sdl2/src/dynapi/SDL_dynapi.c rename to vs/sdl2/src/dynapi/SDL_dynapi.c diff --git a/vs2015/sdl2/src/dynapi/SDL_dynapi.h b/vs/sdl2/src/dynapi/SDL_dynapi.h similarity index 100% rename from vs2015/sdl2/src/dynapi/SDL_dynapi.h rename to vs/sdl2/src/dynapi/SDL_dynapi.h diff --git a/vs2015/sdl2/src/dynapi/SDL_dynapi_overrides.h b/vs/sdl2/src/dynapi/SDL_dynapi_overrides.h similarity index 100% rename from vs2015/sdl2/src/dynapi/SDL_dynapi_overrides.h rename to vs/sdl2/src/dynapi/SDL_dynapi_overrides.h diff --git a/vs2015/sdl2/src/dynapi/SDL_dynapi_procs.h b/vs/sdl2/src/dynapi/SDL_dynapi_procs.h similarity index 100% rename from vs2015/sdl2/src/dynapi/SDL_dynapi_procs.h rename to vs/sdl2/src/dynapi/SDL_dynapi_procs.h diff --git a/vs2015/sdl2/src/dynapi/gendynapi.pl b/vs/sdl2/src/dynapi/gendynapi.pl similarity index 100% rename from vs2015/sdl2/src/dynapi/gendynapi.pl rename to vs/sdl2/src/dynapi/gendynapi.pl diff --git a/vs2015/sdl2/src/events/SDL_clipboardevents.c b/vs/sdl2/src/events/SDL_clipboardevents.c similarity index 100% rename from vs2015/sdl2/src/events/SDL_clipboardevents.c rename to vs/sdl2/src/events/SDL_clipboardevents.c diff --git a/vs2015/sdl2/src/events/SDL_clipboardevents_c.h b/vs/sdl2/src/events/SDL_clipboardevents_c.h similarity index 100% rename from vs2015/sdl2/src/events/SDL_clipboardevents_c.h rename to vs/sdl2/src/events/SDL_clipboardevents_c.h diff --git a/vs2015/sdl2/src/events/SDL_displayevents.c b/vs/sdl2/src/events/SDL_displayevents.c similarity index 100% rename from vs2015/sdl2/src/events/SDL_displayevents.c rename to vs/sdl2/src/events/SDL_displayevents.c diff --git a/vs2015/sdl2/src/events/SDL_displayevents_c.h b/vs/sdl2/src/events/SDL_displayevents_c.h similarity index 100% rename from vs2015/sdl2/src/events/SDL_displayevents_c.h rename to vs/sdl2/src/events/SDL_displayevents_c.h diff --git a/vs2015/sdl2/src/events/SDL_dropevents.c b/vs/sdl2/src/events/SDL_dropevents.c similarity index 100% rename from vs2015/sdl2/src/events/SDL_dropevents.c rename to vs/sdl2/src/events/SDL_dropevents.c diff --git a/vs2015/sdl2/src/events/SDL_dropevents_c.h b/vs/sdl2/src/events/SDL_dropevents_c.h similarity index 100% rename from vs2015/sdl2/src/events/SDL_dropevents_c.h rename to vs/sdl2/src/events/SDL_dropevents_c.h diff --git a/vs2015/sdl2/src/events/SDL_events.c b/vs/sdl2/src/events/SDL_events.c similarity index 100% rename from vs2015/sdl2/src/events/SDL_events.c rename to vs/sdl2/src/events/SDL_events.c diff --git a/vs2015/sdl2/src/events/SDL_events_c.h b/vs/sdl2/src/events/SDL_events_c.h similarity index 100% rename from vs2015/sdl2/src/events/SDL_events_c.h rename to vs/sdl2/src/events/SDL_events_c.h diff --git a/vs2015/sdl2/src/events/SDL_gesture.c b/vs/sdl2/src/events/SDL_gesture.c similarity index 100% rename from vs2015/sdl2/src/events/SDL_gesture.c rename to vs/sdl2/src/events/SDL_gesture.c diff --git a/vs2015/sdl2/src/events/SDL_gesture_c.h b/vs/sdl2/src/events/SDL_gesture_c.h similarity index 100% rename from vs2015/sdl2/src/events/SDL_gesture_c.h rename to vs/sdl2/src/events/SDL_gesture_c.h diff --git a/vs2015/sdl2/src/events/SDL_keyboard.c b/vs/sdl2/src/events/SDL_keyboard.c similarity index 100% rename from vs2015/sdl2/src/events/SDL_keyboard.c rename to vs/sdl2/src/events/SDL_keyboard.c diff --git a/vs2015/sdl2/src/events/SDL_keyboard_c.h b/vs/sdl2/src/events/SDL_keyboard_c.h similarity index 100% rename from vs2015/sdl2/src/events/SDL_keyboard_c.h rename to vs/sdl2/src/events/SDL_keyboard_c.h diff --git a/vs2015/sdl2/src/events/SDL_mouse.c b/vs/sdl2/src/events/SDL_mouse.c similarity index 100% rename from vs2015/sdl2/src/events/SDL_mouse.c rename to vs/sdl2/src/events/SDL_mouse.c diff --git a/vs2015/sdl2/src/events/SDL_mouse_c.h b/vs/sdl2/src/events/SDL_mouse_c.h similarity index 100% rename from vs2015/sdl2/src/events/SDL_mouse_c.h rename to vs/sdl2/src/events/SDL_mouse_c.h diff --git a/vs2015/sdl2/src/events/SDL_quit.c b/vs/sdl2/src/events/SDL_quit.c similarity index 100% rename from vs2015/sdl2/src/events/SDL_quit.c rename to vs/sdl2/src/events/SDL_quit.c diff --git a/vs2015/sdl2/src/events/SDL_sysevents.h b/vs/sdl2/src/events/SDL_sysevents.h similarity index 100% rename from vs2015/sdl2/src/events/SDL_sysevents.h rename to vs/sdl2/src/events/SDL_sysevents.h diff --git a/vs2015/sdl2/src/events/SDL_touch.c b/vs/sdl2/src/events/SDL_touch.c similarity index 100% rename from vs2015/sdl2/src/events/SDL_touch.c rename to vs/sdl2/src/events/SDL_touch.c diff --git a/vs2015/sdl2/src/events/SDL_touch_c.h b/vs/sdl2/src/events/SDL_touch_c.h similarity index 100% rename from vs2015/sdl2/src/events/SDL_touch_c.h rename to vs/sdl2/src/events/SDL_touch_c.h diff --git a/vs2015/sdl2/src/events/SDL_windowevents.c b/vs/sdl2/src/events/SDL_windowevents.c similarity index 100% rename from vs2015/sdl2/src/events/SDL_windowevents.c rename to vs/sdl2/src/events/SDL_windowevents.c diff --git a/vs2015/sdl2/src/events/SDL_windowevents_c.h b/vs/sdl2/src/events/SDL_windowevents_c.h similarity index 100% rename from vs2015/sdl2/src/events/SDL_windowevents_c.h rename to vs/sdl2/src/events/SDL_windowevents_c.h diff --git a/vs2015/sdl2/src/events/blank_cursor.h b/vs/sdl2/src/events/blank_cursor.h similarity index 100% rename from vs2015/sdl2/src/events/blank_cursor.h rename to vs/sdl2/src/events/blank_cursor.h diff --git a/vs2015/sdl2/src/events/default_cursor.h b/vs/sdl2/src/events/default_cursor.h similarity index 100% rename from vs2015/sdl2/src/events/default_cursor.h rename to vs/sdl2/src/events/default_cursor.h diff --git a/vs2015/sdl2/src/events/scancodes_darwin.h b/vs/sdl2/src/events/scancodes_darwin.h similarity index 100% rename from vs2015/sdl2/src/events/scancodes_darwin.h rename to vs/sdl2/src/events/scancodes_darwin.h diff --git a/vs2015/sdl2/src/events/scancodes_linux.h b/vs/sdl2/src/events/scancodes_linux.h similarity index 100% rename from vs2015/sdl2/src/events/scancodes_linux.h rename to vs/sdl2/src/events/scancodes_linux.h diff --git a/vs2015/sdl2/src/events/scancodes_windows.h b/vs/sdl2/src/events/scancodes_windows.h similarity index 100% rename from vs2015/sdl2/src/events/scancodes_windows.h rename to vs/sdl2/src/events/scancodes_windows.h diff --git a/vs2015/sdl2/src/events/scancodes_xfree86.h b/vs/sdl2/src/events/scancodes_xfree86.h similarity index 100% rename from vs2015/sdl2/src/events/scancodes_xfree86.h rename to vs/sdl2/src/events/scancodes_xfree86.h diff --git a/vs2015/sdl2/src/file/SDL_rwops.c b/vs/sdl2/src/file/SDL_rwops.c similarity index 100% rename from vs2015/sdl2/src/file/SDL_rwops.c rename to vs/sdl2/src/file/SDL_rwops.c diff --git a/vs2015/sdl2/src/file/cocoa/SDL_rwopsbundlesupport.h b/vs/sdl2/src/file/cocoa/SDL_rwopsbundlesupport.h similarity index 100% rename from vs2015/sdl2/src/file/cocoa/SDL_rwopsbundlesupport.h rename to vs/sdl2/src/file/cocoa/SDL_rwopsbundlesupport.h diff --git a/vs2015/sdl2/src/file/cocoa/SDL_rwopsbundlesupport.m b/vs/sdl2/src/file/cocoa/SDL_rwopsbundlesupport.m similarity index 100% rename from vs2015/sdl2/src/file/cocoa/SDL_rwopsbundlesupport.m rename to vs/sdl2/src/file/cocoa/SDL_rwopsbundlesupport.m diff --git a/vs2015/sdl2/src/filesystem/android/SDL_sysfilesystem.c b/vs/sdl2/src/filesystem/android/SDL_sysfilesystem.c similarity index 100% rename from vs2015/sdl2/src/filesystem/android/SDL_sysfilesystem.c rename to vs/sdl2/src/filesystem/android/SDL_sysfilesystem.c diff --git a/vs2015/sdl2/src/filesystem/cocoa/SDL_sysfilesystem.m b/vs/sdl2/src/filesystem/cocoa/SDL_sysfilesystem.m similarity index 100% rename from vs2015/sdl2/src/filesystem/cocoa/SDL_sysfilesystem.m rename to vs/sdl2/src/filesystem/cocoa/SDL_sysfilesystem.m diff --git a/vs2015/sdl2/src/filesystem/dummy/SDL_sysfilesystem.c b/vs/sdl2/src/filesystem/dummy/SDL_sysfilesystem.c similarity index 100% rename from vs2015/sdl2/src/filesystem/dummy/SDL_sysfilesystem.c rename to vs/sdl2/src/filesystem/dummy/SDL_sysfilesystem.c diff --git a/vs2015/sdl2/src/filesystem/emscripten/SDL_sysfilesystem.c b/vs/sdl2/src/filesystem/emscripten/SDL_sysfilesystem.c similarity index 100% rename from vs2015/sdl2/src/filesystem/emscripten/SDL_sysfilesystem.c rename to vs/sdl2/src/filesystem/emscripten/SDL_sysfilesystem.c diff --git a/vs2015/sdl2/src/filesystem/haiku/SDL_sysfilesystem.cc b/vs/sdl2/src/filesystem/haiku/SDL_sysfilesystem.cc similarity index 100% rename from vs2015/sdl2/src/filesystem/haiku/SDL_sysfilesystem.cc rename to vs/sdl2/src/filesystem/haiku/SDL_sysfilesystem.cc diff --git a/vs2015/sdl2/src/filesystem/nacl/SDL_sysfilesystem.c b/vs/sdl2/src/filesystem/nacl/SDL_sysfilesystem.c similarity index 100% rename from vs2015/sdl2/src/filesystem/nacl/SDL_sysfilesystem.c rename to vs/sdl2/src/filesystem/nacl/SDL_sysfilesystem.c diff --git a/vs2015/sdl2/src/filesystem/unix/SDL_sysfilesystem.c b/vs/sdl2/src/filesystem/unix/SDL_sysfilesystem.c similarity index 100% rename from vs2015/sdl2/src/filesystem/unix/SDL_sysfilesystem.c rename to vs/sdl2/src/filesystem/unix/SDL_sysfilesystem.c diff --git a/vs2015/sdl2/src/filesystem/windows/SDL_sysfilesystem.c b/vs/sdl2/src/filesystem/windows/SDL_sysfilesystem.c similarity index 100% rename from vs2015/sdl2/src/filesystem/windows/SDL_sysfilesystem.c rename to vs/sdl2/src/filesystem/windows/SDL_sysfilesystem.c diff --git a/vs2015/sdl2/src/filesystem/winrt/SDL_sysfilesystem.cpp b/vs/sdl2/src/filesystem/winrt/SDL_sysfilesystem.cpp similarity index 100% rename from vs2015/sdl2/src/filesystem/winrt/SDL_sysfilesystem.cpp rename to vs/sdl2/src/filesystem/winrt/SDL_sysfilesystem.cpp diff --git a/vs2015/sdl2/src/haptic/SDL_haptic.c b/vs/sdl2/src/haptic/SDL_haptic.c similarity index 100% rename from vs2015/sdl2/src/haptic/SDL_haptic.c rename to vs/sdl2/src/haptic/SDL_haptic.c diff --git a/vs2015/sdl2/src/haptic/SDL_haptic_c.h b/vs/sdl2/src/haptic/SDL_haptic_c.h similarity index 100% rename from vs2015/sdl2/src/haptic/SDL_haptic_c.h rename to vs/sdl2/src/haptic/SDL_haptic_c.h diff --git a/vs2015/sdl2/src/haptic/SDL_syshaptic.h b/vs/sdl2/src/haptic/SDL_syshaptic.h similarity index 100% rename from vs2015/sdl2/src/haptic/SDL_syshaptic.h rename to vs/sdl2/src/haptic/SDL_syshaptic.h diff --git a/vs2015/sdl2/src/haptic/android/SDL_syshaptic.c b/vs/sdl2/src/haptic/android/SDL_syshaptic.c similarity index 100% rename from vs2015/sdl2/src/haptic/android/SDL_syshaptic.c rename to vs/sdl2/src/haptic/android/SDL_syshaptic.c diff --git a/vs2015/sdl2/src/haptic/android/SDL_syshaptic_c.h b/vs/sdl2/src/haptic/android/SDL_syshaptic_c.h similarity index 100% rename from vs2015/sdl2/src/haptic/android/SDL_syshaptic_c.h rename to vs/sdl2/src/haptic/android/SDL_syshaptic_c.h diff --git a/vs2015/sdl2/src/haptic/darwin/SDL_syshaptic.c b/vs/sdl2/src/haptic/darwin/SDL_syshaptic.c similarity index 100% rename from vs2015/sdl2/src/haptic/darwin/SDL_syshaptic.c rename to vs/sdl2/src/haptic/darwin/SDL_syshaptic.c diff --git a/vs2015/sdl2/src/haptic/darwin/SDL_syshaptic_c.h b/vs/sdl2/src/haptic/darwin/SDL_syshaptic_c.h similarity index 100% rename from vs2015/sdl2/src/haptic/darwin/SDL_syshaptic_c.h rename to vs/sdl2/src/haptic/darwin/SDL_syshaptic_c.h diff --git a/vs2015/sdl2/src/haptic/dummy/SDL_syshaptic.c b/vs/sdl2/src/haptic/dummy/SDL_syshaptic.c similarity index 100% rename from vs2015/sdl2/src/haptic/dummy/SDL_syshaptic.c rename to vs/sdl2/src/haptic/dummy/SDL_syshaptic.c diff --git a/vs2015/sdl2/src/haptic/linux/SDL_syshaptic.c b/vs/sdl2/src/haptic/linux/SDL_syshaptic.c similarity index 100% rename from vs2015/sdl2/src/haptic/linux/SDL_syshaptic.c rename to vs/sdl2/src/haptic/linux/SDL_syshaptic.c diff --git a/vs2015/sdl2/src/haptic/windows/SDL_dinputhaptic.c b/vs/sdl2/src/haptic/windows/SDL_dinputhaptic.c similarity index 100% rename from vs2015/sdl2/src/haptic/windows/SDL_dinputhaptic.c rename to vs/sdl2/src/haptic/windows/SDL_dinputhaptic.c diff --git a/vs2015/sdl2/src/haptic/windows/SDL_dinputhaptic_c.h b/vs/sdl2/src/haptic/windows/SDL_dinputhaptic_c.h similarity index 100% rename from vs2015/sdl2/src/haptic/windows/SDL_dinputhaptic_c.h rename to vs/sdl2/src/haptic/windows/SDL_dinputhaptic_c.h diff --git a/vs2015/sdl2/src/haptic/windows/SDL_windowshaptic.c b/vs/sdl2/src/haptic/windows/SDL_windowshaptic.c similarity index 100% rename from vs2015/sdl2/src/haptic/windows/SDL_windowshaptic.c rename to vs/sdl2/src/haptic/windows/SDL_windowshaptic.c diff --git a/vs2015/sdl2/src/haptic/windows/SDL_windowshaptic_c.h b/vs/sdl2/src/haptic/windows/SDL_windowshaptic_c.h similarity index 100% rename from vs2015/sdl2/src/haptic/windows/SDL_windowshaptic_c.h rename to vs/sdl2/src/haptic/windows/SDL_windowshaptic_c.h diff --git a/vs2015/sdl2/src/haptic/windows/SDL_xinputhaptic.c b/vs/sdl2/src/haptic/windows/SDL_xinputhaptic.c similarity index 100% rename from vs2015/sdl2/src/haptic/windows/SDL_xinputhaptic.c rename to vs/sdl2/src/haptic/windows/SDL_xinputhaptic.c diff --git a/vs2015/sdl2/src/haptic/windows/SDL_xinputhaptic_c.h b/vs/sdl2/src/haptic/windows/SDL_xinputhaptic_c.h similarity index 100% rename from vs2015/sdl2/src/haptic/windows/SDL_xinputhaptic_c.h rename to vs/sdl2/src/haptic/windows/SDL_xinputhaptic_c.h diff --git a/vs2015/sdl2/src/hidapi/AUTHORS.txt b/vs/sdl2/src/hidapi/AUTHORS.txt similarity index 100% rename from vs2015/sdl2/src/hidapi/AUTHORS.txt rename to vs/sdl2/src/hidapi/AUTHORS.txt diff --git a/vs2015/sdl2/src/hidapi/HACKING.txt b/vs/sdl2/src/hidapi/HACKING.txt similarity index 100% rename from vs2015/sdl2/src/hidapi/HACKING.txt rename to vs/sdl2/src/hidapi/HACKING.txt diff --git a/vs2015/sdl2/src/hidapi/LICENSE-bsd.txt b/vs/sdl2/src/hidapi/LICENSE-bsd.txt similarity index 100% rename from vs2015/sdl2/src/hidapi/LICENSE-bsd.txt rename to vs/sdl2/src/hidapi/LICENSE-bsd.txt diff --git a/vs2015/sdl2/src/hidapi/LICENSE-gpl3.txt b/vs/sdl2/src/hidapi/LICENSE-gpl3.txt similarity index 100% rename from vs2015/sdl2/src/hidapi/LICENSE-gpl3.txt rename to vs/sdl2/src/hidapi/LICENSE-gpl3.txt diff --git a/vs2015/sdl2/src/hidapi/LICENSE-orig.txt b/vs/sdl2/src/hidapi/LICENSE-orig.txt similarity index 100% rename from vs2015/sdl2/src/hidapi/LICENSE-orig.txt rename to vs/sdl2/src/hidapi/LICENSE-orig.txt diff --git a/vs2015/sdl2/src/hidapi/LICENSE.txt b/vs/sdl2/src/hidapi/LICENSE.txt similarity index 100% rename from vs2015/sdl2/src/hidapi/LICENSE.txt rename to vs/sdl2/src/hidapi/LICENSE.txt diff --git a/vs2015/sdl2/src/hidapi/Makefile.am b/vs/sdl2/src/hidapi/Makefile.am similarity index 100% rename from vs2015/sdl2/src/hidapi/Makefile.am rename to vs/sdl2/src/hidapi/Makefile.am diff --git a/vs2015/sdl2/src/hidapi/README.txt b/vs/sdl2/src/hidapi/README.txt similarity index 100% rename from vs2015/sdl2/src/hidapi/README.txt rename to vs/sdl2/src/hidapi/README.txt diff --git a/vs2015/sdl2/src/hidapi/android/hid.cpp b/vs/sdl2/src/hidapi/android/hid.cpp similarity index 100% rename from vs2015/sdl2/src/hidapi/android/hid.cpp rename to vs/sdl2/src/hidapi/android/hid.cpp diff --git a/vs2015/sdl2/src/hidapi/android/jni/Android.mk b/vs/sdl2/src/hidapi/android/jni/Android.mk similarity index 100% rename from vs2015/sdl2/src/hidapi/android/jni/Android.mk rename to vs/sdl2/src/hidapi/android/jni/Android.mk diff --git a/vs2015/sdl2/src/hidapi/android/jni/Application.mk b/vs/sdl2/src/hidapi/android/jni/Application.mk similarity index 100% rename from vs2015/sdl2/src/hidapi/android/jni/Application.mk rename to vs/sdl2/src/hidapi/android/jni/Application.mk diff --git a/vs2015/sdl2/src/hidapi/android/project.properties b/vs/sdl2/src/hidapi/android/project.properties similarity index 100% rename from vs2015/sdl2/src/hidapi/android/project.properties rename to vs/sdl2/src/hidapi/android/project.properties diff --git a/vs2015/sdl2/src/hidapi/bootstrap b/vs/sdl2/src/hidapi/bootstrap similarity index 100% rename from vs2015/sdl2/src/hidapi/bootstrap rename to vs/sdl2/src/hidapi/bootstrap diff --git a/vs2015/sdl2/src/hidapi/configure.ac b/vs/sdl2/src/hidapi/configure.ac similarity index 100% rename from vs2015/sdl2/src/hidapi/configure.ac rename to vs/sdl2/src/hidapi/configure.ac diff --git a/vs2015/sdl2/src/hidapi/hidapi/hidapi.h b/vs/sdl2/src/hidapi/hidapi/hidapi.h similarity index 100% rename from vs2015/sdl2/src/hidapi/hidapi/hidapi.h rename to vs/sdl2/src/hidapi/hidapi/hidapi.h diff --git a/vs2015/sdl2/src/hidapi/hidtest/Makefile.am b/vs/sdl2/src/hidapi/hidtest/Makefile.am similarity index 100% rename from vs2015/sdl2/src/hidapi/hidtest/Makefile.am rename to vs/sdl2/src/hidapi/hidtest/Makefile.am diff --git a/vs2015/sdl2/src/hidapi/hidtest/hidtest.cpp b/vs/sdl2/src/hidapi/hidtest/hidtest.cpp similarity index 100% rename from vs2015/sdl2/src/hidapi/hidtest/hidtest.cpp rename to vs/sdl2/src/hidapi/hidtest/hidtest.cpp diff --git a/vs2015/sdl2/src/hidapi/ios/Makefile-manual b/vs/sdl2/src/hidapi/ios/Makefile-manual similarity index 100% rename from vs2015/sdl2/src/hidapi/ios/Makefile-manual rename to vs/sdl2/src/hidapi/ios/Makefile-manual diff --git a/vs2015/sdl2/src/hidapi/ios/Makefile.am b/vs/sdl2/src/hidapi/ios/Makefile.am similarity index 100% rename from vs2015/sdl2/src/hidapi/ios/Makefile.am rename to vs/sdl2/src/hidapi/ios/Makefile.am diff --git a/vs2015/sdl2/src/hidapi/ios/hid.m b/vs/sdl2/src/hidapi/ios/hid.m similarity index 100% rename from vs2015/sdl2/src/hidapi/ios/hid.m rename to vs/sdl2/src/hidapi/ios/hid.m diff --git a/vs2015/sdl2/src/hidapi/libusb/Makefile-manual b/vs/sdl2/src/hidapi/libusb/Makefile-manual similarity index 100% rename from vs2015/sdl2/src/hidapi/libusb/Makefile-manual rename to vs/sdl2/src/hidapi/libusb/Makefile-manual diff --git a/vs2015/sdl2/src/hidapi/libusb/Makefile.am b/vs/sdl2/src/hidapi/libusb/Makefile.am similarity index 100% rename from vs2015/sdl2/src/hidapi/libusb/Makefile.am rename to vs/sdl2/src/hidapi/libusb/Makefile.am diff --git a/vs2015/sdl2/src/hidapi/libusb/Makefile.freebsd b/vs/sdl2/src/hidapi/libusb/Makefile.freebsd similarity index 100% rename from vs2015/sdl2/src/hidapi/libusb/Makefile.freebsd rename to vs/sdl2/src/hidapi/libusb/Makefile.freebsd diff --git a/vs2015/sdl2/src/hidapi/libusb/Makefile.linux b/vs/sdl2/src/hidapi/libusb/Makefile.linux similarity index 100% rename from vs2015/sdl2/src/hidapi/libusb/Makefile.linux rename to vs/sdl2/src/hidapi/libusb/Makefile.linux diff --git a/vs2015/sdl2/src/hidapi/libusb/hid.c b/vs/sdl2/src/hidapi/libusb/hid.c similarity index 100% rename from vs2015/sdl2/src/hidapi/libusb/hid.c rename to vs/sdl2/src/hidapi/libusb/hid.c diff --git a/vs2015/sdl2/src/hidapi/libusb/hidusb.cpp b/vs/sdl2/src/hidapi/libusb/hidusb.cpp similarity index 100% rename from vs2015/sdl2/src/hidapi/libusb/hidusb.cpp rename to vs/sdl2/src/hidapi/libusb/hidusb.cpp diff --git a/vs2015/sdl2/src/hidapi/linux/Makefile-manual b/vs/sdl2/src/hidapi/linux/Makefile-manual similarity index 100% rename from vs2015/sdl2/src/hidapi/linux/Makefile-manual rename to vs/sdl2/src/hidapi/linux/Makefile-manual diff --git a/vs2015/sdl2/src/hidapi/linux/Makefile.am b/vs/sdl2/src/hidapi/linux/Makefile.am similarity index 100% rename from vs2015/sdl2/src/hidapi/linux/Makefile.am rename to vs/sdl2/src/hidapi/linux/Makefile.am diff --git a/vs2015/sdl2/src/hidapi/linux/README.txt b/vs/sdl2/src/hidapi/linux/README.txt similarity index 100% rename from vs2015/sdl2/src/hidapi/linux/README.txt rename to vs/sdl2/src/hidapi/linux/README.txt diff --git a/vs2015/sdl2/src/hidapi/linux/hid.c b/vs/sdl2/src/hidapi/linux/hid.c similarity index 100% rename from vs2015/sdl2/src/hidapi/linux/hid.c rename to vs/sdl2/src/hidapi/linux/hid.c diff --git a/vs2015/sdl2/src/hidapi/linux/hid.cpp b/vs/sdl2/src/hidapi/linux/hid.cpp similarity index 100% rename from vs2015/sdl2/src/hidapi/linux/hid.cpp rename to vs/sdl2/src/hidapi/linux/hid.cpp diff --git a/vs2015/sdl2/src/hidapi/linux/hidraw.cpp b/vs/sdl2/src/hidapi/linux/hidraw.cpp similarity index 100% rename from vs2015/sdl2/src/hidapi/linux/hidraw.cpp rename to vs/sdl2/src/hidapi/linux/hidraw.cpp diff --git a/vs2015/sdl2/src/hidapi/m4/ax_pthread.m4 b/vs/sdl2/src/hidapi/m4/ax_pthread.m4 similarity index 100% rename from vs2015/sdl2/src/hidapi/m4/ax_pthread.m4 rename to vs/sdl2/src/hidapi/m4/ax_pthread.m4 diff --git a/vs2015/sdl2/src/hidapi/m4/pkg.m4 b/vs/sdl2/src/hidapi/m4/pkg.m4 similarity index 100% rename from vs2015/sdl2/src/hidapi/m4/pkg.m4 rename to vs/sdl2/src/hidapi/m4/pkg.m4 diff --git a/vs2015/sdl2/src/hidapi/mac/Makefile-manual b/vs/sdl2/src/hidapi/mac/Makefile-manual similarity index 100% rename from vs2015/sdl2/src/hidapi/mac/Makefile-manual rename to vs/sdl2/src/hidapi/mac/Makefile-manual diff --git a/vs2015/sdl2/src/hidapi/mac/Makefile.am b/vs/sdl2/src/hidapi/mac/Makefile.am similarity index 100% rename from vs2015/sdl2/src/hidapi/mac/Makefile.am rename to vs/sdl2/src/hidapi/mac/Makefile.am diff --git a/vs2015/sdl2/src/hidapi/mac/hid.c b/vs/sdl2/src/hidapi/mac/hid.c similarity index 100% rename from vs2015/sdl2/src/hidapi/mac/hid.c rename to vs/sdl2/src/hidapi/mac/hid.c diff --git a/vs2015/sdl2/src/hidapi/testgui/Makefile-manual b/vs/sdl2/src/hidapi/testgui/Makefile-manual similarity index 100% rename from vs2015/sdl2/src/hidapi/testgui/Makefile-manual rename to vs/sdl2/src/hidapi/testgui/Makefile-manual diff --git a/vs2015/sdl2/src/hidapi/testgui/Makefile.am b/vs/sdl2/src/hidapi/testgui/Makefile.am similarity index 100% rename from vs2015/sdl2/src/hidapi/testgui/Makefile.am rename to vs/sdl2/src/hidapi/testgui/Makefile.am diff --git a/vs2015/sdl2/src/hidapi/testgui/Makefile.freebsd b/vs/sdl2/src/hidapi/testgui/Makefile.freebsd similarity index 100% rename from vs2015/sdl2/src/hidapi/testgui/Makefile.freebsd rename to vs/sdl2/src/hidapi/testgui/Makefile.freebsd diff --git a/vs2015/sdl2/src/hidapi/testgui/Makefile.linux b/vs/sdl2/src/hidapi/testgui/Makefile.linux similarity index 100% rename from vs2015/sdl2/src/hidapi/testgui/Makefile.linux rename to vs/sdl2/src/hidapi/testgui/Makefile.linux diff --git a/vs2015/sdl2/src/hidapi/testgui/Makefile.mac b/vs/sdl2/src/hidapi/testgui/Makefile.mac similarity index 100% rename from vs2015/sdl2/src/hidapi/testgui/Makefile.mac rename to vs/sdl2/src/hidapi/testgui/Makefile.mac diff --git a/vs2015/sdl2/src/hidapi/testgui/Makefile.mingw b/vs/sdl2/src/hidapi/testgui/Makefile.mingw similarity index 100% rename from vs2015/sdl2/src/hidapi/testgui/Makefile.mingw rename to vs/sdl2/src/hidapi/testgui/Makefile.mingw diff --git a/vs2015/sdl2/src/hidapi/testgui/copy_to_bundle.sh b/vs/sdl2/src/hidapi/testgui/copy_to_bundle.sh similarity index 100% rename from vs2015/sdl2/src/hidapi/testgui/copy_to_bundle.sh rename to vs/sdl2/src/hidapi/testgui/copy_to_bundle.sh diff --git a/vs2015/sdl2/src/hidapi/testgui/mac_support.cpp b/vs/sdl2/src/hidapi/testgui/mac_support.cpp similarity index 100% rename from vs2015/sdl2/src/hidapi/testgui/mac_support.cpp rename to vs/sdl2/src/hidapi/testgui/mac_support.cpp diff --git a/vs2015/sdl2/src/hidapi/testgui/mac_support.h b/vs/sdl2/src/hidapi/testgui/mac_support.h similarity index 100% rename from vs2015/sdl2/src/hidapi/testgui/mac_support.h rename to vs/sdl2/src/hidapi/testgui/mac_support.h diff --git a/vs2015/sdl2/src/hidapi/testgui/mac_support_cocoa.m b/vs/sdl2/src/hidapi/testgui/mac_support_cocoa.m similarity index 100% rename from vs2015/sdl2/src/hidapi/testgui/mac_support_cocoa.m rename to vs/sdl2/src/hidapi/testgui/mac_support_cocoa.m diff --git a/vs2015/sdl2/src/hidapi/testgui/start.sh b/vs/sdl2/src/hidapi/testgui/start.sh similarity index 100% rename from vs2015/sdl2/src/hidapi/testgui/start.sh rename to vs/sdl2/src/hidapi/testgui/start.sh diff --git a/vs2015/sdl2/src/hidapi/testgui/test.cpp b/vs/sdl2/src/hidapi/testgui/test.cpp similarity index 100% rename from vs2015/sdl2/src/hidapi/testgui/test.cpp rename to vs/sdl2/src/hidapi/testgui/test.cpp diff --git a/vs2015/sdl2/src/hidapi/testgui/testgui.sln b/vs/sdl2/src/hidapi/testgui/testgui.sln similarity index 100% rename from vs2015/sdl2/src/hidapi/testgui/testgui.sln rename to vs/sdl2/src/hidapi/testgui/testgui.sln diff --git a/vs2015/sdl2/src/hidapi/testgui/testgui.vcproj b/vs/sdl2/src/hidapi/testgui/testgui.vcproj similarity index 100% rename from vs2015/sdl2/src/hidapi/testgui/testgui.vcproj rename to vs/sdl2/src/hidapi/testgui/testgui.vcproj diff --git a/vs2015/sdl2/src/hidapi/udev/99-hid.rules b/vs/sdl2/src/hidapi/udev/99-hid.rules similarity index 100% rename from vs2015/sdl2/src/hidapi/udev/99-hid.rules rename to vs/sdl2/src/hidapi/udev/99-hid.rules diff --git a/vs2015/sdl2/src/hidapi/windows/Makefile-manual b/vs/sdl2/src/hidapi/windows/Makefile-manual similarity index 100% rename from vs2015/sdl2/src/hidapi/windows/Makefile-manual rename to vs/sdl2/src/hidapi/windows/Makefile-manual diff --git a/vs2015/sdl2/src/hidapi/windows/Makefile.am b/vs/sdl2/src/hidapi/windows/Makefile.am similarity index 100% rename from vs2015/sdl2/src/hidapi/windows/Makefile.am rename to vs/sdl2/src/hidapi/windows/Makefile.am diff --git a/vs2015/sdl2/src/hidapi/windows/Makefile.mingw b/vs/sdl2/src/hidapi/windows/Makefile.mingw similarity index 100% rename from vs2015/sdl2/src/hidapi/windows/Makefile.mingw rename to vs/sdl2/src/hidapi/windows/Makefile.mingw diff --git a/vs2015/sdl2/src/hidapi/windows/ddk_build/hidapi.def b/vs/sdl2/src/hidapi/windows/ddk_build/hidapi.def similarity index 100% rename from vs2015/sdl2/src/hidapi/windows/ddk_build/hidapi.def rename to vs/sdl2/src/hidapi/windows/ddk_build/hidapi.def diff --git a/vs2015/sdl2/src/hidapi/windows/ddk_build/makefile b/vs/sdl2/src/hidapi/windows/ddk_build/makefile similarity index 100% rename from vs2015/sdl2/src/hidapi/windows/ddk_build/makefile rename to vs/sdl2/src/hidapi/windows/ddk_build/makefile diff --git a/vs2015/sdl2/src/hidapi/windows/ddk_build/sources b/vs/sdl2/src/hidapi/windows/ddk_build/sources similarity index 100% rename from vs2015/sdl2/src/hidapi/windows/ddk_build/sources rename to vs/sdl2/src/hidapi/windows/ddk_build/sources diff --git a/vs2015/sdl2/src/hidapi/windows/hid.c b/vs/sdl2/src/hidapi/windows/hid.c similarity index 100% rename from vs2015/sdl2/src/hidapi/windows/hid.c rename to vs/sdl2/src/hidapi/windows/hid.c diff --git a/vs2015/sdl2/src/hidapi/windows/hidapi.sln b/vs/sdl2/src/hidapi/windows/hidapi.sln similarity index 100% rename from vs2015/sdl2/src/hidapi/windows/hidapi.sln rename to vs/sdl2/src/hidapi/windows/hidapi.sln diff --git a/vs2015/sdl2/src/hidapi/windows/hidapi.vcproj b/vs/sdl2/src/hidapi/windows/hidapi.vcproj similarity index 100% rename from vs2015/sdl2/src/hidapi/windows/hidapi.vcproj rename to vs/sdl2/src/hidapi/windows/hidapi.vcproj diff --git a/vs2015/sdl2/src/hidapi/windows/hidtest.vcproj b/vs/sdl2/src/hidapi/windows/hidtest.vcproj similarity index 100% rename from vs2015/sdl2/src/hidapi/windows/hidtest.vcproj rename to vs/sdl2/src/hidapi/windows/hidtest.vcproj diff --git a/vs2015/sdl2/src/joystick/SDL_gamecontroller.c b/vs/sdl2/src/joystick/SDL_gamecontroller.c similarity index 100% rename from vs2015/sdl2/src/joystick/SDL_gamecontroller.c rename to vs/sdl2/src/joystick/SDL_gamecontroller.c diff --git a/vs2015/sdl2/src/joystick/SDL_gamecontrollerdb.h b/vs/sdl2/src/joystick/SDL_gamecontrollerdb.h similarity index 100% rename from vs2015/sdl2/src/joystick/SDL_gamecontrollerdb.h rename to vs/sdl2/src/joystick/SDL_gamecontrollerdb.h diff --git a/vs2015/sdl2/src/joystick/SDL_joystick.c b/vs/sdl2/src/joystick/SDL_joystick.c similarity index 100% rename from vs2015/sdl2/src/joystick/SDL_joystick.c rename to vs/sdl2/src/joystick/SDL_joystick.c diff --git a/vs2015/sdl2/src/joystick/SDL_joystick_c.h b/vs/sdl2/src/joystick/SDL_joystick_c.h similarity index 100% rename from vs2015/sdl2/src/joystick/SDL_joystick_c.h rename to vs/sdl2/src/joystick/SDL_joystick_c.h diff --git a/vs2015/sdl2/src/joystick/SDL_sysjoystick.h b/vs/sdl2/src/joystick/SDL_sysjoystick.h similarity index 100% rename from vs2015/sdl2/src/joystick/SDL_sysjoystick.h rename to vs/sdl2/src/joystick/SDL_sysjoystick.h diff --git a/vs2015/sdl2/src/joystick/android/SDL_sysjoystick.c b/vs/sdl2/src/joystick/android/SDL_sysjoystick.c similarity index 100% rename from vs2015/sdl2/src/joystick/android/SDL_sysjoystick.c rename to vs/sdl2/src/joystick/android/SDL_sysjoystick.c diff --git a/vs2015/sdl2/src/joystick/android/SDL_sysjoystick_c.h b/vs/sdl2/src/joystick/android/SDL_sysjoystick_c.h similarity index 100% rename from vs2015/sdl2/src/joystick/android/SDL_sysjoystick_c.h rename to vs/sdl2/src/joystick/android/SDL_sysjoystick_c.h diff --git a/vs2015/sdl2/src/joystick/bsd/SDL_sysjoystick.c b/vs/sdl2/src/joystick/bsd/SDL_sysjoystick.c similarity index 100% rename from vs2015/sdl2/src/joystick/bsd/SDL_sysjoystick.c rename to vs/sdl2/src/joystick/bsd/SDL_sysjoystick.c diff --git a/vs2015/sdl2/src/joystick/controller_type.h b/vs/sdl2/src/joystick/controller_type.h similarity index 100% rename from vs2015/sdl2/src/joystick/controller_type.h rename to vs/sdl2/src/joystick/controller_type.h diff --git a/vs2015/sdl2/src/joystick/darwin/SDL_sysjoystick.c b/vs/sdl2/src/joystick/darwin/SDL_sysjoystick.c similarity index 100% rename from vs2015/sdl2/src/joystick/darwin/SDL_sysjoystick.c rename to vs/sdl2/src/joystick/darwin/SDL_sysjoystick.c diff --git a/vs2015/sdl2/src/joystick/darwin/SDL_sysjoystick_c.h b/vs/sdl2/src/joystick/darwin/SDL_sysjoystick_c.h similarity index 100% rename from vs2015/sdl2/src/joystick/darwin/SDL_sysjoystick_c.h rename to vs/sdl2/src/joystick/darwin/SDL_sysjoystick_c.h diff --git a/vs2015/sdl2/src/joystick/dummy/SDL_sysjoystick.c b/vs/sdl2/src/joystick/dummy/SDL_sysjoystick.c similarity index 100% rename from vs2015/sdl2/src/joystick/dummy/SDL_sysjoystick.c rename to vs/sdl2/src/joystick/dummy/SDL_sysjoystick.c diff --git a/vs2015/sdl2/src/joystick/emscripten/SDL_sysjoystick.c b/vs/sdl2/src/joystick/emscripten/SDL_sysjoystick.c similarity index 100% rename from vs2015/sdl2/src/joystick/emscripten/SDL_sysjoystick.c rename to vs/sdl2/src/joystick/emscripten/SDL_sysjoystick.c diff --git a/vs2015/sdl2/src/joystick/emscripten/SDL_sysjoystick_c.h b/vs/sdl2/src/joystick/emscripten/SDL_sysjoystick_c.h similarity index 100% rename from vs2015/sdl2/src/joystick/emscripten/SDL_sysjoystick_c.h rename to vs/sdl2/src/joystick/emscripten/SDL_sysjoystick_c.h diff --git a/vs2015/sdl2/src/joystick/haiku/SDL_haikujoystick.cc b/vs/sdl2/src/joystick/haiku/SDL_haikujoystick.cc similarity index 100% rename from vs2015/sdl2/src/joystick/haiku/SDL_haikujoystick.cc rename to vs/sdl2/src/joystick/haiku/SDL_haikujoystick.cc diff --git a/vs2015/sdl2/src/joystick/hidapi/SDL_hidapi_ps4.c b/vs/sdl2/src/joystick/hidapi/SDL_hidapi_ps4.c similarity index 100% rename from vs2015/sdl2/src/joystick/hidapi/SDL_hidapi_ps4.c rename to vs/sdl2/src/joystick/hidapi/SDL_hidapi_ps4.c diff --git a/vs2015/sdl2/src/joystick/hidapi/SDL_hidapi_switch.c b/vs/sdl2/src/joystick/hidapi/SDL_hidapi_switch.c similarity index 100% rename from vs2015/sdl2/src/joystick/hidapi/SDL_hidapi_switch.c rename to vs/sdl2/src/joystick/hidapi/SDL_hidapi_switch.c diff --git a/vs2015/sdl2/src/joystick/hidapi/SDL_hidapi_xbox360.c b/vs/sdl2/src/joystick/hidapi/SDL_hidapi_xbox360.c similarity index 100% rename from vs2015/sdl2/src/joystick/hidapi/SDL_hidapi_xbox360.c rename to vs/sdl2/src/joystick/hidapi/SDL_hidapi_xbox360.c diff --git a/vs2015/sdl2/src/joystick/hidapi/SDL_hidapi_xboxone.c b/vs/sdl2/src/joystick/hidapi/SDL_hidapi_xboxone.c similarity index 100% rename from vs2015/sdl2/src/joystick/hidapi/SDL_hidapi_xboxone.c rename to vs/sdl2/src/joystick/hidapi/SDL_hidapi_xboxone.c diff --git a/vs2015/sdl2/src/joystick/hidapi/SDL_hidapijoystick.c b/vs/sdl2/src/joystick/hidapi/SDL_hidapijoystick.c similarity index 100% rename from vs2015/sdl2/src/joystick/hidapi/SDL_hidapijoystick.c rename to vs/sdl2/src/joystick/hidapi/SDL_hidapijoystick.c diff --git a/vs2015/sdl2/src/joystick/hidapi/SDL_hidapijoystick_c.h b/vs/sdl2/src/joystick/hidapi/SDL_hidapijoystick_c.h similarity index 100% rename from vs2015/sdl2/src/joystick/hidapi/SDL_hidapijoystick_c.h rename to vs/sdl2/src/joystick/hidapi/SDL_hidapijoystick_c.h diff --git a/vs2015/sdl2/src/joystick/iphoneos/SDL_sysjoystick.m b/vs/sdl2/src/joystick/iphoneos/SDL_sysjoystick.m similarity index 100% rename from vs2015/sdl2/src/joystick/iphoneos/SDL_sysjoystick.m rename to vs/sdl2/src/joystick/iphoneos/SDL_sysjoystick.m diff --git a/vs2015/sdl2/src/joystick/iphoneos/SDL_sysjoystick_c.h b/vs/sdl2/src/joystick/iphoneos/SDL_sysjoystick_c.h similarity index 100% rename from vs2015/sdl2/src/joystick/iphoneos/SDL_sysjoystick_c.h rename to vs/sdl2/src/joystick/iphoneos/SDL_sysjoystick_c.h diff --git a/vs2015/sdl2/src/joystick/linux/SDL_sysjoystick.c b/vs/sdl2/src/joystick/linux/SDL_sysjoystick.c similarity index 100% rename from vs2015/sdl2/src/joystick/linux/SDL_sysjoystick.c rename to vs/sdl2/src/joystick/linux/SDL_sysjoystick.c diff --git a/vs2015/sdl2/src/joystick/linux/SDL_sysjoystick_c.h b/vs/sdl2/src/joystick/linux/SDL_sysjoystick_c.h similarity index 100% rename from vs2015/sdl2/src/joystick/linux/SDL_sysjoystick_c.h rename to vs/sdl2/src/joystick/linux/SDL_sysjoystick_c.h diff --git a/vs2015/sdl2/src/joystick/psp/SDL_sysjoystick.c b/vs/sdl2/src/joystick/psp/SDL_sysjoystick.c similarity index 100% rename from vs2015/sdl2/src/joystick/psp/SDL_sysjoystick.c rename to vs/sdl2/src/joystick/psp/SDL_sysjoystick.c diff --git a/vs2015/sdl2/src/joystick/sort_controllers.py b/vs/sdl2/src/joystick/sort_controllers.py similarity index 100% rename from vs2015/sdl2/src/joystick/sort_controllers.py rename to vs/sdl2/src/joystick/sort_controllers.py diff --git a/vs2015/sdl2/src/joystick/steam/SDL_steamcontroller.c b/vs/sdl2/src/joystick/steam/SDL_steamcontroller.c similarity index 100% rename from vs2015/sdl2/src/joystick/steam/SDL_steamcontroller.c rename to vs/sdl2/src/joystick/steam/SDL_steamcontroller.c diff --git a/vs2015/sdl2/src/joystick/steam/SDL_steamcontroller.h b/vs/sdl2/src/joystick/steam/SDL_steamcontroller.h similarity index 100% rename from vs2015/sdl2/src/joystick/steam/SDL_steamcontroller.h rename to vs/sdl2/src/joystick/steam/SDL_steamcontroller.h diff --git a/vs2015/sdl2/src/joystick/windows/SDL_dinputjoystick.c b/vs/sdl2/src/joystick/windows/SDL_dinputjoystick.c similarity index 100% rename from vs2015/sdl2/src/joystick/windows/SDL_dinputjoystick.c rename to vs/sdl2/src/joystick/windows/SDL_dinputjoystick.c diff --git a/vs2015/sdl2/src/joystick/windows/SDL_dinputjoystick_c.h b/vs/sdl2/src/joystick/windows/SDL_dinputjoystick_c.h similarity index 100% rename from vs2015/sdl2/src/joystick/windows/SDL_dinputjoystick_c.h rename to vs/sdl2/src/joystick/windows/SDL_dinputjoystick_c.h diff --git a/vs2015/sdl2/src/joystick/windows/SDL_mmjoystick.c b/vs/sdl2/src/joystick/windows/SDL_mmjoystick.c similarity index 100% rename from vs2015/sdl2/src/joystick/windows/SDL_mmjoystick.c rename to vs/sdl2/src/joystick/windows/SDL_mmjoystick.c diff --git a/vs2015/sdl2/src/joystick/windows/SDL_windowsjoystick.c b/vs/sdl2/src/joystick/windows/SDL_windowsjoystick.c similarity index 100% rename from vs2015/sdl2/src/joystick/windows/SDL_windowsjoystick.c rename to vs/sdl2/src/joystick/windows/SDL_windowsjoystick.c diff --git a/vs2015/sdl2/src/joystick/windows/SDL_windowsjoystick_c.h b/vs/sdl2/src/joystick/windows/SDL_windowsjoystick_c.h similarity index 100% rename from vs2015/sdl2/src/joystick/windows/SDL_windowsjoystick_c.h rename to vs/sdl2/src/joystick/windows/SDL_windowsjoystick_c.h diff --git a/vs2015/sdl2/src/joystick/windows/SDL_xinputjoystick.c b/vs/sdl2/src/joystick/windows/SDL_xinputjoystick.c similarity index 100% rename from vs2015/sdl2/src/joystick/windows/SDL_xinputjoystick.c rename to vs/sdl2/src/joystick/windows/SDL_xinputjoystick.c diff --git a/vs2015/sdl2/src/joystick/windows/SDL_xinputjoystick_c.h b/vs/sdl2/src/joystick/windows/SDL_xinputjoystick_c.h similarity index 100% rename from vs2015/sdl2/src/joystick/windows/SDL_xinputjoystick_c.h rename to vs/sdl2/src/joystick/windows/SDL_xinputjoystick_c.h diff --git a/vs2015/sdl2/src/libm/e_atan2.c b/vs/sdl2/src/libm/e_atan2.c similarity index 100% rename from vs2015/sdl2/src/libm/e_atan2.c rename to vs/sdl2/src/libm/e_atan2.c diff --git a/vs2015/sdl2/src/libm/e_exp.c b/vs/sdl2/src/libm/e_exp.c similarity index 100% rename from vs2015/sdl2/src/libm/e_exp.c rename to vs/sdl2/src/libm/e_exp.c diff --git a/vs2015/sdl2/src/libm/e_fmod.c b/vs/sdl2/src/libm/e_fmod.c similarity index 100% rename from vs2015/sdl2/src/libm/e_fmod.c rename to vs/sdl2/src/libm/e_fmod.c diff --git a/vs2015/sdl2/src/libm/e_log.c b/vs/sdl2/src/libm/e_log.c similarity index 100% rename from vs2015/sdl2/src/libm/e_log.c rename to vs/sdl2/src/libm/e_log.c diff --git a/vs2015/sdl2/src/libm/e_log10.c b/vs/sdl2/src/libm/e_log10.c similarity index 100% rename from vs2015/sdl2/src/libm/e_log10.c rename to vs/sdl2/src/libm/e_log10.c diff --git a/vs2015/sdl2/src/libm/e_pow.c b/vs/sdl2/src/libm/e_pow.c similarity index 100% rename from vs2015/sdl2/src/libm/e_pow.c rename to vs/sdl2/src/libm/e_pow.c diff --git a/vs2015/sdl2/src/libm/e_rem_pio2.c b/vs/sdl2/src/libm/e_rem_pio2.c similarity index 100% rename from vs2015/sdl2/src/libm/e_rem_pio2.c rename to vs/sdl2/src/libm/e_rem_pio2.c diff --git a/vs2015/sdl2/src/libm/e_sqrt.c b/vs/sdl2/src/libm/e_sqrt.c similarity index 100% rename from vs2015/sdl2/src/libm/e_sqrt.c rename to vs/sdl2/src/libm/e_sqrt.c diff --git a/vs2015/sdl2/src/libm/k_cos.c b/vs/sdl2/src/libm/k_cos.c similarity index 100% rename from vs2015/sdl2/src/libm/k_cos.c rename to vs/sdl2/src/libm/k_cos.c diff --git a/vs2015/sdl2/src/libm/k_rem_pio2.c b/vs/sdl2/src/libm/k_rem_pio2.c similarity index 100% rename from vs2015/sdl2/src/libm/k_rem_pio2.c rename to vs/sdl2/src/libm/k_rem_pio2.c diff --git a/vs2015/sdl2/src/libm/k_sin.c b/vs/sdl2/src/libm/k_sin.c similarity index 100% rename from vs2015/sdl2/src/libm/k_sin.c rename to vs/sdl2/src/libm/k_sin.c diff --git a/vs2015/sdl2/src/libm/k_tan.c b/vs/sdl2/src/libm/k_tan.c similarity index 100% rename from vs2015/sdl2/src/libm/k_tan.c rename to vs/sdl2/src/libm/k_tan.c diff --git a/vs2015/sdl2/src/libm/math_libm.h b/vs/sdl2/src/libm/math_libm.h similarity index 100% rename from vs2015/sdl2/src/libm/math_libm.h rename to vs/sdl2/src/libm/math_libm.h diff --git a/vs2015/sdl2/src/libm/math_private.h b/vs/sdl2/src/libm/math_private.h similarity index 100% rename from vs2015/sdl2/src/libm/math_private.h rename to vs/sdl2/src/libm/math_private.h diff --git a/vs2015/sdl2/src/libm/s_atan.c b/vs/sdl2/src/libm/s_atan.c similarity index 100% rename from vs2015/sdl2/src/libm/s_atan.c rename to vs/sdl2/src/libm/s_atan.c diff --git a/vs2015/sdl2/src/libm/s_copysign.c b/vs/sdl2/src/libm/s_copysign.c similarity index 100% rename from vs2015/sdl2/src/libm/s_copysign.c rename to vs/sdl2/src/libm/s_copysign.c diff --git a/vs2015/sdl2/src/libm/s_cos.c b/vs/sdl2/src/libm/s_cos.c similarity index 100% rename from vs2015/sdl2/src/libm/s_cos.c rename to vs/sdl2/src/libm/s_cos.c diff --git a/vs2015/sdl2/src/libm/s_fabs.c b/vs/sdl2/src/libm/s_fabs.c similarity index 100% rename from vs2015/sdl2/src/libm/s_fabs.c rename to vs/sdl2/src/libm/s_fabs.c diff --git a/vs2015/sdl2/src/libm/s_floor.c b/vs/sdl2/src/libm/s_floor.c similarity index 100% rename from vs2015/sdl2/src/libm/s_floor.c rename to vs/sdl2/src/libm/s_floor.c diff --git a/vs2015/sdl2/src/libm/s_scalbn.c b/vs/sdl2/src/libm/s_scalbn.c similarity index 100% rename from vs2015/sdl2/src/libm/s_scalbn.c rename to vs/sdl2/src/libm/s_scalbn.c diff --git a/vs2015/sdl2/src/libm/s_sin.c b/vs/sdl2/src/libm/s_sin.c similarity index 100% rename from vs2015/sdl2/src/libm/s_sin.c rename to vs/sdl2/src/libm/s_sin.c diff --git a/vs2015/sdl2/src/libm/s_tan.c b/vs/sdl2/src/libm/s_tan.c similarity index 100% rename from vs2015/sdl2/src/libm/s_tan.c rename to vs/sdl2/src/libm/s_tan.c diff --git a/vs2015/sdl2/src/loadso/dlopen/SDL_sysloadso.c b/vs/sdl2/src/loadso/dlopen/SDL_sysloadso.c similarity index 100% rename from vs2015/sdl2/src/loadso/dlopen/SDL_sysloadso.c rename to vs/sdl2/src/loadso/dlopen/SDL_sysloadso.c diff --git a/vs2015/sdl2/src/loadso/dummy/SDL_sysloadso.c b/vs/sdl2/src/loadso/dummy/SDL_sysloadso.c similarity index 100% rename from vs2015/sdl2/src/loadso/dummy/SDL_sysloadso.c rename to vs/sdl2/src/loadso/dummy/SDL_sysloadso.c diff --git a/vs2015/sdl2/src/loadso/windows/SDL_sysloadso.c b/vs/sdl2/src/loadso/windows/SDL_sysloadso.c similarity index 100% rename from vs2015/sdl2/src/loadso/windows/SDL_sysloadso.c rename to vs/sdl2/src/loadso/windows/SDL_sysloadso.c diff --git a/vs2015/sdl2/src/main/android/SDL_android_main.c b/vs/sdl2/src/main/android/SDL_android_main.c similarity index 100% rename from vs2015/sdl2/src/main/android/SDL_android_main.c rename to vs/sdl2/src/main/android/SDL_android_main.c diff --git a/vs2015/sdl2/src/main/dummy/SDL_dummy_main.c b/vs/sdl2/src/main/dummy/SDL_dummy_main.c similarity index 100% rename from vs2015/sdl2/src/main/dummy/SDL_dummy_main.c rename to vs/sdl2/src/main/dummy/SDL_dummy_main.c diff --git a/vs2015/sdl2/src/main/haiku/SDL_BApp.h b/vs/sdl2/src/main/haiku/SDL_BApp.h similarity index 100% rename from vs2015/sdl2/src/main/haiku/SDL_BApp.h rename to vs/sdl2/src/main/haiku/SDL_BApp.h diff --git a/vs2015/sdl2/src/main/haiku/SDL_BeApp.cc b/vs/sdl2/src/main/haiku/SDL_BeApp.cc similarity index 100% rename from vs2015/sdl2/src/main/haiku/SDL_BeApp.cc rename to vs/sdl2/src/main/haiku/SDL_BeApp.cc diff --git a/vs2015/sdl2/src/main/haiku/SDL_BeApp.h b/vs/sdl2/src/main/haiku/SDL_BeApp.h similarity index 100% rename from vs2015/sdl2/src/main/haiku/SDL_BeApp.h rename to vs/sdl2/src/main/haiku/SDL_BeApp.h diff --git a/vs2015/sdl2/src/main/nacl/SDL_nacl_main.c b/vs/sdl2/src/main/nacl/SDL_nacl_main.c similarity index 100% rename from vs2015/sdl2/src/main/nacl/SDL_nacl_main.c rename to vs/sdl2/src/main/nacl/SDL_nacl_main.c diff --git a/vs2015/sdl2/src/main/psp/SDL_psp_main.c b/vs/sdl2/src/main/psp/SDL_psp_main.c similarity index 100% rename from vs2015/sdl2/src/main/psp/SDL_psp_main.c rename to vs/sdl2/src/main/psp/SDL_psp_main.c diff --git a/vs2015/sdl2/src/main/windows/SDL_windows_main.c b/vs/sdl2/src/main/windows/SDL_windows_main.c similarity index 100% rename from vs2015/sdl2/src/main/windows/SDL_windows_main.c rename to vs/sdl2/src/main/windows/SDL_windows_main.c diff --git a/vs2015/sdl2/src/main/windows/version.rc b/vs/sdl2/src/main/windows/version.rc similarity index 100% rename from vs2015/sdl2/src/main/windows/version.rc rename to vs/sdl2/src/main/windows/version.rc diff --git a/vs2015/sdl2/src/main/winrt/SDL2-WinRTResource_BlankCursor.cur b/vs/sdl2/src/main/winrt/SDL2-WinRTResource_BlankCursor.cur similarity index 100% rename from vs2015/sdl2/src/main/winrt/SDL2-WinRTResource_BlankCursor.cur rename to vs/sdl2/src/main/winrt/SDL2-WinRTResource_BlankCursor.cur diff --git a/vs2015/sdl2/src/main/winrt/SDL2-WinRTResources.rc b/vs/sdl2/src/main/winrt/SDL2-WinRTResources.rc similarity index 100% rename from vs2015/sdl2/src/main/winrt/SDL2-WinRTResources.rc rename to vs/sdl2/src/main/winrt/SDL2-WinRTResources.rc diff --git a/vs2015/sdl2/src/main/winrt/SDL_winrt_main_NonXAML.cpp b/vs/sdl2/src/main/winrt/SDL_winrt_main_NonXAML.cpp similarity index 100% rename from vs2015/sdl2/src/main/winrt/SDL_winrt_main_NonXAML.cpp rename to vs/sdl2/src/main/winrt/SDL_winrt_main_NonXAML.cpp diff --git a/vs2015/sdl2/src/power/SDL_power.c b/vs/sdl2/src/power/SDL_power.c similarity index 100% rename from vs2015/sdl2/src/power/SDL_power.c rename to vs/sdl2/src/power/SDL_power.c diff --git a/vs2015/sdl2/src/power/SDL_syspower.h b/vs/sdl2/src/power/SDL_syspower.h similarity index 100% rename from vs2015/sdl2/src/power/SDL_syspower.h rename to vs/sdl2/src/power/SDL_syspower.h diff --git a/vs2015/sdl2/src/power/android/SDL_syspower.c b/vs/sdl2/src/power/android/SDL_syspower.c similarity index 100% rename from vs2015/sdl2/src/power/android/SDL_syspower.c rename to vs/sdl2/src/power/android/SDL_syspower.c diff --git a/vs2015/sdl2/src/power/emscripten/SDL_syspower.c b/vs/sdl2/src/power/emscripten/SDL_syspower.c similarity index 100% rename from vs2015/sdl2/src/power/emscripten/SDL_syspower.c rename to vs/sdl2/src/power/emscripten/SDL_syspower.c diff --git a/vs2015/sdl2/src/power/haiku/SDL_syspower.c b/vs/sdl2/src/power/haiku/SDL_syspower.c similarity index 100% rename from vs2015/sdl2/src/power/haiku/SDL_syspower.c rename to vs/sdl2/src/power/haiku/SDL_syspower.c diff --git a/vs2015/sdl2/src/power/linux/SDL_syspower.c b/vs/sdl2/src/power/linux/SDL_syspower.c similarity index 100% rename from vs2015/sdl2/src/power/linux/SDL_syspower.c rename to vs/sdl2/src/power/linux/SDL_syspower.c diff --git a/vs2015/sdl2/src/power/macosx/SDL_syspower.c b/vs/sdl2/src/power/macosx/SDL_syspower.c similarity index 100% rename from vs2015/sdl2/src/power/macosx/SDL_syspower.c rename to vs/sdl2/src/power/macosx/SDL_syspower.c diff --git a/vs2015/sdl2/src/power/psp/SDL_syspower.c b/vs/sdl2/src/power/psp/SDL_syspower.c similarity index 100% rename from vs2015/sdl2/src/power/psp/SDL_syspower.c rename to vs/sdl2/src/power/psp/SDL_syspower.c diff --git a/vs2015/sdl2/src/power/uikit/SDL_syspower.h b/vs/sdl2/src/power/uikit/SDL_syspower.h similarity index 100% rename from vs2015/sdl2/src/power/uikit/SDL_syspower.h rename to vs/sdl2/src/power/uikit/SDL_syspower.h diff --git a/vs2015/sdl2/src/power/uikit/SDL_syspower.m b/vs/sdl2/src/power/uikit/SDL_syspower.m similarity index 100% rename from vs2015/sdl2/src/power/uikit/SDL_syspower.m rename to vs/sdl2/src/power/uikit/SDL_syspower.m diff --git a/vs2015/sdl2/src/power/windows/SDL_syspower.c b/vs/sdl2/src/power/windows/SDL_syspower.c similarity index 100% rename from vs2015/sdl2/src/power/windows/SDL_syspower.c rename to vs/sdl2/src/power/windows/SDL_syspower.c diff --git a/vs2015/sdl2/src/power/winrt/SDL_syspower.cpp b/vs/sdl2/src/power/winrt/SDL_syspower.cpp similarity index 100% rename from vs2015/sdl2/src/power/winrt/SDL_syspower.cpp rename to vs/sdl2/src/power/winrt/SDL_syspower.cpp diff --git a/vs2015/sdl2/src/render/SDL_d3dmath.c b/vs/sdl2/src/render/SDL_d3dmath.c similarity index 100% rename from vs2015/sdl2/src/render/SDL_d3dmath.c rename to vs/sdl2/src/render/SDL_d3dmath.c diff --git a/vs2015/sdl2/src/render/SDL_d3dmath.h b/vs/sdl2/src/render/SDL_d3dmath.h similarity index 100% rename from vs2015/sdl2/src/render/SDL_d3dmath.h rename to vs/sdl2/src/render/SDL_d3dmath.h diff --git a/vs2015/sdl2/src/render/SDL_render.c b/vs/sdl2/src/render/SDL_render.c similarity index 100% rename from vs2015/sdl2/src/render/SDL_render.c rename to vs/sdl2/src/render/SDL_render.c diff --git a/vs2015/sdl2/src/render/SDL_sysrender.h b/vs/sdl2/src/render/SDL_sysrender.h similarity index 100% rename from vs2015/sdl2/src/render/SDL_sysrender.h rename to vs/sdl2/src/render/SDL_sysrender.h diff --git a/vs2015/sdl2/src/render/SDL_yuv_sw.c b/vs/sdl2/src/render/SDL_yuv_sw.c similarity index 100% rename from vs2015/sdl2/src/render/SDL_yuv_sw.c rename to vs/sdl2/src/render/SDL_yuv_sw.c diff --git a/vs2015/sdl2/src/render/SDL_yuv_sw_c.h b/vs/sdl2/src/render/SDL_yuv_sw_c.h similarity index 100% rename from vs2015/sdl2/src/render/SDL_yuv_sw_c.h rename to vs/sdl2/src/render/SDL_yuv_sw_c.h diff --git a/vs2015/sdl2/src/render/direct3d/SDL_render_d3d.c b/vs/sdl2/src/render/direct3d/SDL_render_d3d.c similarity index 100% rename from vs2015/sdl2/src/render/direct3d/SDL_render_d3d.c rename to vs/sdl2/src/render/direct3d/SDL_render_d3d.c diff --git a/vs2015/sdl2/src/render/direct3d/SDL_shaders_d3d.c b/vs/sdl2/src/render/direct3d/SDL_shaders_d3d.c similarity index 100% rename from vs2015/sdl2/src/render/direct3d/SDL_shaders_d3d.c rename to vs/sdl2/src/render/direct3d/SDL_shaders_d3d.c diff --git a/vs2015/sdl2/src/render/direct3d/SDL_shaders_d3d.h b/vs/sdl2/src/render/direct3d/SDL_shaders_d3d.h similarity index 100% rename from vs2015/sdl2/src/render/direct3d/SDL_shaders_d3d.h rename to vs/sdl2/src/render/direct3d/SDL_shaders_d3d.h diff --git a/vs2015/sdl2/src/render/direct3d11/SDL_render_d3d11.c b/vs/sdl2/src/render/direct3d11/SDL_render_d3d11.c similarity index 100% rename from vs2015/sdl2/src/render/direct3d11/SDL_render_d3d11.c rename to vs/sdl2/src/render/direct3d11/SDL_render_d3d11.c diff --git a/vs2015/sdl2/src/render/direct3d11/SDL_render_winrt.cpp b/vs/sdl2/src/render/direct3d11/SDL_render_winrt.cpp similarity index 100% rename from vs2015/sdl2/src/render/direct3d11/SDL_render_winrt.cpp rename to vs/sdl2/src/render/direct3d11/SDL_render_winrt.cpp diff --git a/vs2015/sdl2/src/render/direct3d11/SDL_render_winrt.h b/vs/sdl2/src/render/direct3d11/SDL_render_winrt.h similarity index 100% rename from vs2015/sdl2/src/render/direct3d11/SDL_render_winrt.h rename to vs/sdl2/src/render/direct3d11/SDL_render_winrt.h diff --git a/vs2015/sdl2/src/render/direct3d11/SDL_shaders_d3d11.c b/vs/sdl2/src/render/direct3d11/SDL_shaders_d3d11.c similarity index 100% rename from vs2015/sdl2/src/render/direct3d11/SDL_shaders_d3d11.c rename to vs/sdl2/src/render/direct3d11/SDL_shaders_d3d11.c diff --git a/vs2015/sdl2/src/render/direct3d11/SDL_shaders_d3d11.h b/vs/sdl2/src/render/direct3d11/SDL_shaders_d3d11.h similarity index 100% rename from vs2015/sdl2/src/render/direct3d11/SDL_shaders_d3d11.h rename to vs/sdl2/src/render/direct3d11/SDL_shaders_d3d11.h diff --git a/vs2015/sdl2/src/render/metal/SDL_render_metal.m b/vs/sdl2/src/render/metal/SDL_render_metal.m similarity index 100% rename from vs2015/sdl2/src/render/metal/SDL_render_metal.m rename to vs/sdl2/src/render/metal/SDL_render_metal.m diff --git a/vs2015/sdl2/src/render/metal/SDL_shaders_metal.metal b/vs/sdl2/src/render/metal/SDL_shaders_metal.metal similarity index 100% rename from vs2015/sdl2/src/render/metal/SDL_shaders_metal.metal rename to vs/sdl2/src/render/metal/SDL_shaders_metal.metal diff --git a/vs2015/sdl2/src/render/metal/SDL_shaders_metal_ios.h b/vs/sdl2/src/render/metal/SDL_shaders_metal_ios.h similarity index 100% rename from vs2015/sdl2/src/render/metal/SDL_shaders_metal_ios.h rename to vs/sdl2/src/render/metal/SDL_shaders_metal_ios.h diff --git a/vs2015/sdl2/src/render/metal/SDL_shaders_metal_osx.h b/vs/sdl2/src/render/metal/SDL_shaders_metal_osx.h similarity index 100% rename from vs2015/sdl2/src/render/metal/SDL_shaders_metal_osx.h rename to vs/sdl2/src/render/metal/SDL_shaders_metal_osx.h diff --git a/vs2015/sdl2/src/render/metal/build-metal-shaders.sh b/vs/sdl2/src/render/metal/build-metal-shaders.sh similarity index 100% rename from vs2015/sdl2/src/render/metal/build-metal-shaders.sh rename to vs/sdl2/src/render/metal/build-metal-shaders.sh diff --git a/vs2015/sdl2/src/render/opengl/SDL_glfuncs.h b/vs/sdl2/src/render/opengl/SDL_glfuncs.h similarity index 100% rename from vs2015/sdl2/src/render/opengl/SDL_glfuncs.h rename to vs/sdl2/src/render/opengl/SDL_glfuncs.h diff --git a/vs2015/sdl2/src/render/opengl/SDL_render_gl.c b/vs/sdl2/src/render/opengl/SDL_render_gl.c similarity index 100% rename from vs2015/sdl2/src/render/opengl/SDL_render_gl.c rename to vs/sdl2/src/render/opengl/SDL_render_gl.c diff --git a/vs2015/sdl2/src/render/opengl/SDL_shaders_gl.c b/vs/sdl2/src/render/opengl/SDL_shaders_gl.c similarity index 100% rename from vs2015/sdl2/src/render/opengl/SDL_shaders_gl.c rename to vs/sdl2/src/render/opengl/SDL_shaders_gl.c diff --git a/vs2015/sdl2/src/render/opengl/SDL_shaders_gl.h b/vs/sdl2/src/render/opengl/SDL_shaders_gl.h similarity index 100% rename from vs2015/sdl2/src/render/opengl/SDL_shaders_gl.h rename to vs/sdl2/src/render/opengl/SDL_shaders_gl.h diff --git a/vs2015/sdl2/src/render/opengles/SDL_glesfuncs.h b/vs/sdl2/src/render/opengles/SDL_glesfuncs.h similarity index 100% rename from vs2015/sdl2/src/render/opengles/SDL_glesfuncs.h rename to vs/sdl2/src/render/opengles/SDL_glesfuncs.h diff --git a/vs2015/sdl2/src/render/opengles/SDL_render_gles.c b/vs/sdl2/src/render/opengles/SDL_render_gles.c similarity index 100% rename from vs2015/sdl2/src/render/opengles/SDL_render_gles.c rename to vs/sdl2/src/render/opengles/SDL_render_gles.c diff --git a/vs2015/sdl2/src/render/opengles2/SDL_gles2funcs.h b/vs/sdl2/src/render/opengles2/SDL_gles2funcs.h similarity index 100% rename from vs2015/sdl2/src/render/opengles2/SDL_gles2funcs.h rename to vs/sdl2/src/render/opengles2/SDL_gles2funcs.h diff --git a/vs2015/sdl2/src/render/opengles2/SDL_render_gles2.c b/vs/sdl2/src/render/opengles2/SDL_render_gles2.c similarity index 100% rename from vs2015/sdl2/src/render/opengles2/SDL_render_gles2.c rename to vs/sdl2/src/render/opengles2/SDL_render_gles2.c diff --git a/vs2015/sdl2/src/render/opengles2/SDL_shaders_gles2.c b/vs/sdl2/src/render/opengles2/SDL_shaders_gles2.c similarity index 100% rename from vs2015/sdl2/src/render/opengles2/SDL_shaders_gles2.c rename to vs/sdl2/src/render/opengles2/SDL_shaders_gles2.c diff --git a/vs2015/sdl2/src/render/opengles2/SDL_shaders_gles2.h b/vs/sdl2/src/render/opengles2/SDL_shaders_gles2.h similarity index 100% rename from vs2015/sdl2/src/render/opengles2/SDL_shaders_gles2.h rename to vs/sdl2/src/render/opengles2/SDL_shaders_gles2.h diff --git a/vs2015/sdl2/src/render/psp/SDL_render_psp.c b/vs/sdl2/src/render/psp/SDL_render_psp.c similarity index 100% rename from vs2015/sdl2/src/render/psp/SDL_render_psp.c rename to vs/sdl2/src/render/psp/SDL_render_psp.c diff --git a/vs2015/sdl2/src/render/software/SDL_blendfillrect.c b/vs/sdl2/src/render/software/SDL_blendfillrect.c similarity index 100% rename from vs2015/sdl2/src/render/software/SDL_blendfillrect.c rename to vs/sdl2/src/render/software/SDL_blendfillrect.c diff --git a/vs2015/sdl2/src/render/software/SDL_blendfillrect.h b/vs/sdl2/src/render/software/SDL_blendfillrect.h similarity index 100% rename from vs2015/sdl2/src/render/software/SDL_blendfillrect.h rename to vs/sdl2/src/render/software/SDL_blendfillrect.h diff --git a/vs2015/sdl2/src/render/software/SDL_blendline.c b/vs/sdl2/src/render/software/SDL_blendline.c similarity index 100% rename from vs2015/sdl2/src/render/software/SDL_blendline.c rename to vs/sdl2/src/render/software/SDL_blendline.c diff --git a/vs2015/sdl2/src/render/software/SDL_blendline.h b/vs/sdl2/src/render/software/SDL_blendline.h similarity index 100% rename from vs2015/sdl2/src/render/software/SDL_blendline.h rename to vs/sdl2/src/render/software/SDL_blendline.h diff --git a/vs2015/sdl2/src/render/software/SDL_blendpoint.c b/vs/sdl2/src/render/software/SDL_blendpoint.c similarity index 100% rename from vs2015/sdl2/src/render/software/SDL_blendpoint.c rename to vs/sdl2/src/render/software/SDL_blendpoint.c diff --git a/vs2015/sdl2/src/render/software/SDL_blendpoint.h b/vs/sdl2/src/render/software/SDL_blendpoint.h similarity index 100% rename from vs2015/sdl2/src/render/software/SDL_blendpoint.h rename to vs/sdl2/src/render/software/SDL_blendpoint.h diff --git a/vs2015/sdl2/src/render/software/SDL_draw.h b/vs/sdl2/src/render/software/SDL_draw.h similarity index 100% rename from vs2015/sdl2/src/render/software/SDL_draw.h rename to vs/sdl2/src/render/software/SDL_draw.h diff --git a/vs2015/sdl2/src/render/software/SDL_drawline.c b/vs/sdl2/src/render/software/SDL_drawline.c similarity index 100% rename from vs2015/sdl2/src/render/software/SDL_drawline.c rename to vs/sdl2/src/render/software/SDL_drawline.c diff --git a/vs2015/sdl2/src/render/software/SDL_drawline.h b/vs/sdl2/src/render/software/SDL_drawline.h similarity index 100% rename from vs2015/sdl2/src/render/software/SDL_drawline.h rename to vs/sdl2/src/render/software/SDL_drawline.h diff --git a/vs2015/sdl2/src/render/software/SDL_drawpoint.c b/vs/sdl2/src/render/software/SDL_drawpoint.c similarity index 100% rename from vs2015/sdl2/src/render/software/SDL_drawpoint.c rename to vs/sdl2/src/render/software/SDL_drawpoint.c diff --git a/vs2015/sdl2/src/render/software/SDL_drawpoint.h b/vs/sdl2/src/render/software/SDL_drawpoint.h similarity index 100% rename from vs2015/sdl2/src/render/software/SDL_drawpoint.h rename to vs/sdl2/src/render/software/SDL_drawpoint.h diff --git a/vs2015/sdl2/src/render/software/SDL_render_sw.c b/vs/sdl2/src/render/software/SDL_render_sw.c similarity index 100% rename from vs2015/sdl2/src/render/software/SDL_render_sw.c rename to vs/sdl2/src/render/software/SDL_render_sw.c diff --git a/vs2015/sdl2/src/render/software/SDL_render_sw_c.h b/vs/sdl2/src/render/software/SDL_render_sw_c.h similarity index 100% rename from vs2015/sdl2/src/render/software/SDL_render_sw_c.h rename to vs/sdl2/src/render/software/SDL_render_sw_c.h diff --git a/vs2015/sdl2/src/render/software/SDL_rotate.c b/vs/sdl2/src/render/software/SDL_rotate.c similarity index 100% rename from vs2015/sdl2/src/render/software/SDL_rotate.c rename to vs/sdl2/src/render/software/SDL_rotate.c diff --git a/vs2015/sdl2/src/render/software/SDL_rotate.h b/vs/sdl2/src/render/software/SDL_rotate.h similarity index 100% rename from vs2015/sdl2/src/render/software/SDL_rotate.h rename to vs/sdl2/src/render/software/SDL_rotate.h diff --git a/vs2015/sdl2/src/sensor/SDL_sensor.c b/vs/sdl2/src/sensor/SDL_sensor.c similarity index 100% rename from vs2015/sdl2/src/sensor/SDL_sensor.c rename to vs/sdl2/src/sensor/SDL_sensor.c diff --git a/vs2015/sdl2/src/sensor/SDL_sensor_c.h b/vs/sdl2/src/sensor/SDL_sensor_c.h similarity index 100% rename from vs2015/sdl2/src/sensor/SDL_sensor_c.h rename to vs/sdl2/src/sensor/SDL_sensor_c.h diff --git a/vs2015/sdl2/src/sensor/SDL_syssensor.h b/vs/sdl2/src/sensor/SDL_syssensor.h similarity index 100% rename from vs2015/sdl2/src/sensor/SDL_syssensor.h rename to vs/sdl2/src/sensor/SDL_syssensor.h diff --git a/vs2015/sdl2/src/sensor/android/SDL_androidsensor.c b/vs/sdl2/src/sensor/android/SDL_androidsensor.c similarity index 100% rename from vs2015/sdl2/src/sensor/android/SDL_androidsensor.c rename to vs/sdl2/src/sensor/android/SDL_androidsensor.c diff --git a/vs2015/sdl2/src/sensor/android/SDL_androidsensor.h b/vs/sdl2/src/sensor/android/SDL_androidsensor.h similarity index 100% rename from vs2015/sdl2/src/sensor/android/SDL_androidsensor.h rename to vs/sdl2/src/sensor/android/SDL_androidsensor.h diff --git a/vs2015/sdl2/src/sensor/coremotion/SDL_coremotionsensor.h b/vs/sdl2/src/sensor/coremotion/SDL_coremotionsensor.h similarity index 100% rename from vs2015/sdl2/src/sensor/coremotion/SDL_coremotionsensor.h rename to vs/sdl2/src/sensor/coremotion/SDL_coremotionsensor.h diff --git a/vs2015/sdl2/src/sensor/coremotion/SDL_coremotionsensor.m b/vs/sdl2/src/sensor/coremotion/SDL_coremotionsensor.m similarity index 100% rename from vs2015/sdl2/src/sensor/coremotion/SDL_coremotionsensor.m rename to vs/sdl2/src/sensor/coremotion/SDL_coremotionsensor.m diff --git a/vs2015/sdl2/src/sensor/dummy/SDL_dummysensor.c b/vs/sdl2/src/sensor/dummy/SDL_dummysensor.c similarity index 100% rename from vs2015/sdl2/src/sensor/dummy/SDL_dummysensor.c rename to vs/sdl2/src/sensor/dummy/SDL_dummysensor.c diff --git a/vs2015/sdl2/src/sensor/dummy/SDL_dummysensor.h b/vs/sdl2/src/sensor/dummy/SDL_dummysensor.h similarity index 100% rename from vs2015/sdl2/src/sensor/dummy/SDL_dummysensor.h rename to vs/sdl2/src/sensor/dummy/SDL_dummysensor.h diff --git a/vs2015/sdl2/src/stdlib/SDL_getenv.c b/vs/sdl2/src/stdlib/SDL_getenv.c similarity index 100% rename from vs2015/sdl2/src/stdlib/SDL_getenv.c rename to vs/sdl2/src/stdlib/SDL_getenv.c diff --git a/vs2015/sdl2/src/stdlib/SDL_iconv.c b/vs/sdl2/src/stdlib/SDL_iconv.c similarity index 100% rename from vs2015/sdl2/src/stdlib/SDL_iconv.c rename to vs/sdl2/src/stdlib/SDL_iconv.c diff --git a/vs2015/sdl2/src/stdlib/SDL_malloc.c b/vs/sdl2/src/stdlib/SDL_malloc.c similarity index 100% rename from vs2015/sdl2/src/stdlib/SDL_malloc.c rename to vs/sdl2/src/stdlib/SDL_malloc.c diff --git a/vs2015/sdl2/src/stdlib/SDL_qsort.c b/vs/sdl2/src/stdlib/SDL_qsort.c similarity index 100% rename from vs2015/sdl2/src/stdlib/SDL_qsort.c rename to vs/sdl2/src/stdlib/SDL_qsort.c diff --git a/vs2015/sdl2/src/stdlib/SDL_stdlib.c b/vs/sdl2/src/stdlib/SDL_stdlib.c similarity index 100% rename from vs2015/sdl2/src/stdlib/SDL_stdlib.c rename to vs/sdl2/src/stdlib/SDL_stdlib.c diff --git a/vs2015/sdl2/src/stdlib/SDL_string.c b/vs/sdl2/src/stdlib/SDL_string.c similarity index 100% rename from vs2015/sdl2/src/stdlib/SDL_string.c rename to vs/sdl2/src/stdlib/SDL_string.c diff --git a/vs2015/sdl2/src/test/SDL_test_assert.c b/vs/sdl2/src/test/SDL_test_assert.c similarity index 100% rename from vs2015/sdl2/src/test/SDL_test_assert.c rename to vs/sdl2/src/test/SDL_test_assert.c diff --git a/vs2015/sdl2/src/test/SDL_test_common.c b/vs/sdl2/src/test/SDL_test_common.c similarity index 100% rename from vs2015/sdl2/src/test/SDL_test_common.c rename to vs/sdl2/src/test/SDL_test_common.c diff --git a/vs2015/sdl2/src/test/SDL_test_compare.c b/vs/sdl2/src/test/SDL_test_compare.c similarity index 100% rename from vs2015/sdl2/src/test/SDL_test_compare.c rename to vs/sdl2/src/test/SDL_test_compare.c diff --git a/vs2015/sdl2/src/test/SDL_test_crc32.c b/vs/sdl2/src/test/SDL_test_crc32.c similarity index 100% rename from vs2015/sdl2/src/test/SDL_test_crc32.c rename to vs/sdl2/src/test/SDL_test_crc32.c diff --git a/vs2015/sdl2/src/test/SDL_test_font.c b/vs/sdl2/src/test/SDL_test_font.c similarity index 100% rename from vs2015/sdl2/src/test/SDL_test_font.c rename to vs/sdl2/src/test/SDL_test_font.c diff --git a/vs2015/sdl2/src/test/SDL_test_fuzzer.c b/vs/sdl2/src/test/SDL_test_fuzzer.c similarity index 100% rename from vs2015/sdl2/src/test/SDL_test_fuzzer.c rename to vs/sdl2/src/test/SDL_test_fuzzer.c diff --git a/vs2015/sdl2/src/test/SDL_test_harness.c b/vs/sdl2/src/test/SDL_test_harness.c similarity index 100% rename from vs2015/sdl2/src/test/SDL_test_harness.c rename to vs/sdl2/src/test/SDL_test_harness.c diff --git a/vs2015/sdl2/src/test/SDL_test_imageBlit.c b/vs/sdl2/src/test/SDL_test_imageBlit.c similarity index 100% rename from vs2015/sdl2/src/test/SDL_test_imageBlit.c rename to vs/sdl2/src/test/SDL_test_imageBlit.c diff --git a/vs2015/sdl2/src/test/SDL_test_imageBlitBlend.c b/vs/sdl2/src/test/SDL_test_imageBlitBlend.c similarity index 100% rename from vs2015/sdl2/src/test/SDL_test_imageBlitBlend.c rename to vs/sdl2/src/test/SDL_test_imageBlitBlend.c diff --git a/vs2015/sdl2/src/test/SDL_test_imageFace.c b/vs/sdl2/src/test/SDL_test_imageFace.c similarity index 100% rename from vs2015/sdl2/src/test/SDL_test_imageFace.c rename to vs/sdl2/src/test/SDL_test_imageFace.c diff --git a/vs2015/sdl2/src/test/SDL_test_imagePrimitives.c b/vs/sdl2/src/test/SDL_test_imagePrimitives.c similarity index 100% rename from vs2015/sdl2/src/test/SDL_test_imagePrimitives.c rename to vs/sdl2/src/test/SDL_test_imagePrimitives.c diff --git a/vs2015/sdl2/src/test/SDL_test_imagePrimitivesBlend.c b/vs/sdl2/src/test/SDL_test_imagePrimitivesBlend.c similarity index 100% rename from vs2015/sdl2/src/test/SDL_test_imagePrimitivesBlend.c rename to vs/sdl2/src/test/SDL_test_imagePrimitivesBlend.c diff --git a/vs2015/sdl2/src/test/SDL_test_log.c b/vs/sdl2/src/test/SDL_test_log.c similarity index 100% rename from vs2015/sdl2/src/test/SDL_test_log.c rename to vs/sdl2/src/test/SDL_test_log.c diff --git a/vs2015/sdl2/src/test/SDL_test_md5.c b/vs/sdl2/src/test/SDL_test_md5.c similarity index 100% rename from vs2015/sdl2/src/test/SDL_test_md5.c rename to vs/sdl2/src/test/SDL_test_md5.c diff --git a/vs2015/sdl2/src/test/SDL_test_memory.c b/vs/sdl2/src/test/SDL_test_memory.c similarity index 100% rename from vs2015/sdl2/src/test/SDL_test_memory.c rename to vs/sdl2/src/test/SDL_test_memory.c diff --git a/vs2015/sdl2/src/test/SDL_test_random.c b/vs/sdl2/src/test/SDL_test_random.c similarity index 100% rename from vs2015/sdl2/src/test/SDL_test_random.c rename to vs/sdl2/src/test/SDL_test_random.c diff --git a/vs2015/sdl2/src/thread/SDL_systhread.h b/vs/sdl2/src/thread/SDL_systhread.h similarity index 100% rename from vs2015/sdl2/src/thread/SDL_systhread.h rename to vs/sdl2/src/thread/SDL_systhread.h diff --git a/vs2015/sdl2/src/thread/SDL_thread.c b/vs/sdl2/src/thread/SDL_thread.c similarity index 100% rename from vs2015/sdl2/src/thread/SDL_thread.c rename to vs/sdl2/src/thread/SDL_thread.c diff --git a/vs2015/sdl2/src/thread/SDL_thread_c.h b/vs/sdl2/src/thread/SDL_thread_c.h similarity index 100% rename from vs2015/sdl2/src/thread/SDL_thread_c.h rename to vs/sdl2/src/thread/SDL_thread_c.h diff --git a/vs2015/sdl2/src/thread/generic/SDL_syscond.c b/vs/sdl2/src/thread/generic/SDL_syscond.c similarity index 100% rename from vs2015/sdl2/src/thread/generic/SDL_syscond.c rename to vs/sdl2/src/thread/generic/SDL_syscond.c diff --git a/vs2015/sdl2/src/thread/generic/SDL_sysmutex.c b/vs/sdl2/src/thread/generic/SDL_sysmutex.c similarity index 100% rename from vs2015/sdl2/src/thread/generic/SDL_sysmutex.c rename to vs/sdl2/src/thread/generic/SDL_sysmutex.c diff --git a/vs2015/sdl2/src/thread/generic/SDL_sysmutex_c.h b/vs/sdl2/src/thread/generic/SDL_sysmutex_c.h similarity index 100% rename from vs2015/sdl2/src/thread/generic/SDL_sysmutex_c.h rename to vs/sdl2/src/thread/generic/SDL_sysmutex_c.h diff --git a/vs2015/sdl2/src/thread/generic/SDL_syssem.c b/vs/sdl2/src/thread/generic/SDL_syssem.c similarity index 100% rename from vs2015/sdl2/src/thread/generic/SDL_syssem.c rename to vs/sdl2/src/thread/generic/SDL_syssem.c diff --git a/vs2015/sdl2/src/thread/generic/SDL_systhread.c b/vs/sdl2/src/thread/generic/SDL_systhread.c similarity index 100% rename from vs2015/sdl2/src/thread/generic/SDL_systhread.c rename to vs/sdl2/src/thread/generic/SDL_systhread.c diff --git a/vs2015/sdl2/src/thread/generic/SDL_systhread_c.h b/vs/sdl2/src/thread/generic/SDL_systhread_c.h similarity index 100% rename from vs2015/sdl2/src/thread/generic/SDL_systhread_c.h rename to vs/sdl2/src/thread/generic/SDL_systhread_c.h diff --git a/vs2015/sdl2/src/thread/generic/SDL_systls.c b/vs/sdl2/src/thread/generic/SDL_systls.c similarity index 100% rename from vs2015/sdl2/src/thread/generic/SDL_systls.c rename to vs/sdl2/src/thread/generic/SDL_systls.c diff --git a/vs2015/sdl2/src/thread/psp/SDL_syscond.c b/vs/sdl2/src/thread/psp/SDL_syscond.c similarity index 100% rename from vs2015/sdl2/src/thread/psp/SDL_syscond.c rename to vs/sdl2/src/thread/psp/SDL_syscond.c diff --git a/vs2015/sdl2/src/thread/psp/SDL_sysmutex.c b/vs/sdl2/src/thread/psp/SDL_sysmutex.c similarity index 100% rename from vs2015/sdl2/src/thread/psp/SDL_sysmutex.c rename to vs/sdl2/src/thread/psp/SDL_sysmutex.c diff --git a/vs2015/sdl2/src/thread/psp/SDL_sysmutex_c.h b/vs/sdl2/src/thread/psp/SDL_sysmutex_c.h similarity index 100% rename from vs2015/sdl2/src/thread/psp/SDL_sysmutex_c.h rename to vs/sdl2/src/thread/psp/SDL_sysmutex_c.h diff --git a/vs2015/sdl2/src/thread/psp/SDL_syssem.c b/vs/sdl2/src/thread/psp/SDL_syssem.c similarity index 100% rename from vs2015/sdl2/src/thread/psp/SDL_syssem.c rename to vs/sdl2/src/thread/psp/SDL_syssem.c diff --git a/vs2015/sdl2/src/thread/psp/SDL_systhread.c b/vs/sdl2/src/thread/psp/SDL_systhread.c similarity index 100% rename from vs2015/sdl2/src/thread/psp/SDL_systhread.c rename to vs/sdl2/src/thread/psp/SDL_systhread.c diff --git a/vs2015/sdl2/src/thread/psp/SDL_systhread_c.h b/vs/sdl2/src/thread/psp/SDL_systhread_c.h similarity index 100% rename from vs2015/sdl2/src/thread/psp/SDL_systhread_c.h rename to vs/sdl2/src/thread/psp/SDL_systhread_c.h diff --git a/vs2015/sdl2/src/thread/pthread/SDL_syscond.c b/vs/sdl2/src/thread/pthread/SDL_syscond.c similarity index 100% rename from vs2015/sdl2/src/thread/pthread/SDL_syscond.c rename to vs/sdl2/src/thread/pthread/SDL_syscond.c diff --git a/vs2015/sdl2/src/thread/pthread/SDL_sysmutex.c b/vs/sdl2/src/thread/pthread/SDL_sysmutex.c similarity index 100% rename from vs2015/sdl2/src/thread/pthread/SDL_sysmutex.c rename to vs/sdl2/src/thread/pthread/SDL_sysmutex.c diff --git a/vs2015/sdl2/src/thread/pthread/SDL_sysmutex_c.h b/vs/sdl2/src/thread/pthread/SDL_sysmutex_c.h similarity index 100% rename from vs2015/sdl2/src/thread/pthread/SDL_sysmutex_c.h rename to vs/sdl2/src/thread/pthread/SDL_sysmutex_c.h diff --git a/vs2015/sdl2/src/thread/pthread/SDL_syssem.c b/vs/sdl2/src/thread/pthread/SDL_syssem.c similarity index 100% rename from vs2015/sdl2/src/thread/pthread/SDL_syssem.c rename to vs/sdl2/src/thread/pthread/SDL_syssem.c diff --git a/vs2015/sdl2/src/thread/pthread/SDL_systhread.c b/vs/sdl2/src/thread/pthread/SDL_systhread.c similarity index 100% rename from vs2015/sdl2/src/thread/pthread/SDL_systhread.c rename to vs/sdl2/src/thread/pthread/SDL_systhread.c diff --git a/vs2015/sdl2/src/thread/pthread/SDL_systhread_c.h b/vs/sdl2/src/thread/pthread/SDL_systhread_c.h similarity index 100% rename from vs2015/sdl2/src/thread/pthread/SDL_systhread_c.h rename to vs/sdl2/src/thread/pthread/SDL_systhread_c.h diff --git a/vs2015/sdl2/src/thread/pthread/SDL_systls.c b/vs/sdl2/src/thread/pthread/SDL_systls.c similarity index 100% rename from vs2015/sdl2/src/thread/pthread/SDL_systls.c rename to vs/sdl2/src/thread/pthread/SDL_systls.c diff --git a/vs2015/sdl2/src/thread/stdcpp/SDL_syscond.cpp b/vs/sdl2/src/thread/stdcpp/SDL_syscond.cpp similarity index 100% rename from vs2015/sdl2/src/thread/stdcpp/SDL_syscond.cpp rename to vs/sdl2/src/thread/stdcpp/SDL_syscond.cpp diff --git a/vs2015/sdl2/src/thread/stdcpp/SDL_sysmutex.cpp b/vs/sdl2/src/thread/stdcpp/SDL_sysmutex.cpp similarity index 100% rename from vs2015/sdl2/src/thread/stdcpp/SDL_sysmutex.cpp rename to vs/sdl2/src/thread/stdcpp/SDL_sysmutex.cpp diff --git a/vs2015/sdl2/src/thread/stdcpp/SDL_sysmutex_c.h b/vs/sdl2/src/thread/stdcpp/SDL_sysmutex_c.h similarity index 100% rename from vs2015/sdl2/src/thread/stdcpp/SDL_sysmutex_c.h rename to vs/sdl2/src/thread/stdcpp/SDL_sysmutex_c.h diff --git a/vs2015/sdl2/src/thread/stdcpp/SDL_systhread.cpp b/vs/sdl2/src/thread/stdcpp/SDL_systhread.cpp similarity index 100% rename from vs2015/sdl2/src/thread/stdcpp/SDL_systhread.cpp rename to vs/sdl2/src/thread/stdcpp/SDL_systhread.cpp diff --git a/vs2015/sdl2/src/thread/stdcpp/SDL_systhread_c.h b/vs/sdl2/src/thread/stdcpp/SDL_systhread_c.h similarity index 100% rename from vs2015/sdl2/src/thread/stdcpp/SDL_systhread_c.h rename to vs/sdl2/src/thread/stdcpp/SDL_systhread_c.h diff --git a/vs2015/sdl2/src/thread/windows/SDL_sysmutex.c b/vs/sdl2/src/thread/windows/SDL_sysmutex.c similarity index 100% rename from vs2015/sdl2/src/thread/windows/SDL_sysmutex.c rename to vs/sdl2/src/thread/windows/SDL_sysmutex.c diff --git a/vs2015/sdl2/src/thread/windows/SDL_syssem.c b/vs/sdl2/src/thread/windows/SDL_syssem.c similarity index 100% rename from vs2015/sdl2/src/thread/windows/SDL_syssem.c rename to vs/sdl2/src/thread/windows/SDL_syssem.c diff --git a/vs2015/sdl2/src/thread/windows/SDL_systhread.c b/vs/sdl2/src/thread/windows/SDL_systhread.c similarity index 100% rename from vs2015/sdl2/src/thread/windows/SDL_systhread.c rename to vs/sdl2/src/thread/windows/SDL_systhread.c diff --git a/vs2015/sdl2/src/thread/windows/SDL_systhread_c.h b/vs/sdl2/src/thread/windows/SDL_systhread_c.h similarity index 100% rename from vs2015/sdl2/src/thread/windows/SDL_systhread_c.h rename to vs/sdl2/src/thread/windows/SDL_systhread_c.h diff --git a/vs2015/sdl2/src/thread/windows/SDL_systls.c b/vs/sdl2/src/thread/windows/SDL_systls.c similarity index 100% rename from vs2015/sdl2/src/thread/windows/SDL_systls.c rename to vs/sdl2/src/thread/windows/SDL_systls.c diff --git a/vs2015/sdl2/src/timer/SDL_timer.c b/vs/sdl2/src/timer/SDL_timer.c similarity index 100% rename from vs2015/sdl2/src/timer/SDL_timer.c rename to vs/sdl2/src/timer/SDL_timer.c diff --git a/vs2015/sdl2/src/timer/SDL_timer_c.h b/vs/sdl2/src/timer/SDL_timer_c.h similarity index 100% rename from vs2015/sdl2/src/timer/SDL_timer_c.h rename to vs/sdl2/src/timer/SDL_timer_c.h diff --git a/vs2015/sdl2/src/timer/dummy/SDL_systimer.c b/vs/sdl2/src/timer/dummy/SDL_systimer.c similarity index 100% rename from vs2015/sdl2/src/timer/dummy/SDL_systimer.c rename to vs/sdl2/src/timer/dummy/SDL_systimer.c diff --git a/vs2015/sdl2/src/timer/haiku/SDL_systimer.c b/vs/sdl2/src/timer/haiku/SDL_systimer.c similarity index 100% rename from vs2015/sdl2/src/timer/haiku/SDL_systimer.c rename to vs/sdl2/src/timer/haiku/SDL_systimer.c diff --git a/vs2015/sdl2/src/timer/psp/SDL_systimer.c b/vs/sdl2/src/timer/psp/SDL_systimer.c similarity index 100% rename from vs2015/sdl2/src/timer/psp/SDL_systimer.c rename to vs/sdl2/src/timer/psp/SDL_systimer.c diff --git a/vs2015/sdl2/src/timer/unix/SDL_systimer.c b/vs/sdl2/src/timer/unix/SDL_systimer.c similarity index 100% rename from vs2015/sdl2/src/timer/unix/SDL_systimer.c rename to vs/sdl2/src/timer/unix/SDL_systimer.c diff --git a/vs2015/sdl2/src/timer/windows/SDL_systimer.c b/vs/sdl2/src/timer/windows/SDL_systimer.c similarity index 100% rename from vs2015/sdl2/src/timer/windows/SDL_systimer.c rename to vs/sdl2/src/timer/windows/SDL_systimer.c diff --git a/vs2015/sdl2/src/video/SDL_RLEaccel.c b/vs/sdl2/src/video/SDL_RLEaccel.c similarity index 100% rename from vs2015/sdl2/src/video/SDL_RLEaccel.c rename to vs/sdl2/src/video/SDL_RLEaccel.c diff --git a/vs2015/sdl2/src/video/SDL_RLEaccel_c.h b/vs/sdl2/src/video/SDL_RLEaccel_c.h similarity index 100% rename from vs2015/sdl2/src/video/SDL_RLEaccel_c.h rename to vs/sdl2/src/video/SDL_RLEaccel_c.h diff --git a/vs2015/sdl2/src/video/SDL_blit.c b/vs/sdl2/src/video/SDL_blit.c similarity index 100% rename from vs2015/sdl2/src/video/SDL_blit.c rename to vs/sdl2/src/video/SDL_blit.c diff --git a/vs2015/sdl2/src/video/SDL_blit.h b/vs/sdl2/src/video/SDL_blit.h similarity index 100% rename from vs2015/sdl2/src/video/SDL_blit.h rename to vs/sdl2/src/video/SDL_blit.h diff --git a/vs2015/sdl2/src/video/SDL_blit_0.c b/vs/sdl2/src/video/SDL_blit_0.c similarity index 100% rename from vs2015/sdl2/src/video/SDL_blit_0.c rename to vs/sdl2/src/video/SDL_blit_0.c diff --git a/vs2015/sdl2/src/video/SDL_blit_1.c b/vs/sdl2/src/video/SDL_blit_1.c similarity index 100% rename from vs2015/sdl2/src/video/SDL_blit_1.c rename to vs/sdl2/src/video/SDL_blit_1.c diff --git a/vs2015/sdl2/src/video/SDL_blit_A.c b/vs/sdl2/src/video/SDL_blit_A.c similarity index 100% rename from vs2015/sdl2/src/video/SDL_blit_A.c rename to vs/sdl2/src/video/SDL_blit_A.c diff --git a/vs2015/sdl2/src/video/SDL_blit_N.c b/vs/sdl2/src/video/SDL_blit_N.c similarity index 100% rename from vs2015/sdl2/src/video/SDL_blit_N.c rename to vs/sdl2/src/video/SDL_blit_N.c diff --git a/vs2015/sdl2/src/video/SDL_blit_auto.c b/vs/sdl2/src/video/SDL_blit_auto.c similarity index 100% rename from vs2015/sdl2/src/video/SDL_blit_auto.c rename to vs/sdl2/src/video/SDL_blit_auto.c diff --git a/vs2015/sdl2/src/video/SDL_blit_auto.h b/vs/sdl2/src/video/SDL_blit_auto.h similarity index 100% rename from vs2015/sdl2/src/video/SDL_blit_auto.h rename to vs/sdl2/src/video/SDL_blit_auto.h diff --git a/vs2015/sdl2/src/video/SDL_blit_copy.c b/vs/sdl2/src/video/SDL_blit_copy.c similarity index 100% rename from vs2015/sdl2/src/video/SDL_blit_copy.c rename to vs/sdl2/src/video/SDL_blit_copy.c diff --git a/vs2015/sdl2/src/video/SDL_blit_copy.h b/vs/sdl2/src/video/SDL_blit_copy.h similarity index 100% rename from vs2015/sdl2/src/video/SDL_blit_copy.h rename to vs/sdl2/src/video/SDL_blit_copy.h diff --git a/vs2015/sdl2/src/video/SDL_blit_slow.c b/vs/sdl2/src/video/SDL_blit_slow.c similarity index 100% rename from vs2015/sdl2/src/video/SDL_blit_slow.c rename to vs/sdl2/src/video/SDL_blit_slow.c diff --git a/vs2015/sdl2/src/video/SDL_blit_slow.h b/vs/sdl2/src/video/SDL_blit_slow.h similarity index 100% rename from vs2015/sdl2/src/video/SDL_blit_slow.h rename to vs/sdl2/src/video/SDL_blit_slow.h diff --git a/vs2015/sdl2/src/video/SDL_bmp.c b/vs/sdl2/src/video/SDL_bmp.c similarity index 100% rename from vs2015/sdl2/src/video/SDL_bmp.c rename to vs/sdl2/src/video/SDL_bmp.c diff --git a/vs2015/sdl2/src/video/SDL_clipboard.c b/vs/sdl2/src/video/SDL_clipboard.c similarity index 100% rename from vs2015/sdl2/src/video/SDL_clipboard.c rename to vs/sdl2/src/video/SDL_clipboard.c diff --git a/vs2015/sdl2/src/video/SDL_egl.c b/vs/sdl2/src/video/SDL_egl.c similarity index 100% rename from vs2015/sdl2/src/video/SDL_egl.c rename to vs/sdl2/src/video/SDL_egl.c diff --git a/vs2015/sdl2/src/video/SDL_egl_c.h b/vs/sdl2/src/video/SDL_egl_c.h similarity index 100% rename from vs2015/sdl2/src/video/SDL_egl_c.h rename to vs/sdl2/src/video/SDL_egl_c.h diff --git a/vs2015/sdl2/src/video/SDL_fillrect.c b/vs/sdl2/src/video/SDL_fillrect.c similarity index 100% rename from vs2015/sdl2/src/video/SDL_fillrect.c rename to vs/sdl2/src/video/SDL_fillrect.c diff --git a/vs2015/sdl2/src/video/SDL_pixels.c b/vs/sdl2/src/video/SDL_pixels.c similarity index 100% rename from vs2015/sdl2/src/video/SDL_pixels.c rename to vs/sdl2/src/video/SDL_pixels.c diff --git a/vs2015/sdl2/src/video/SDL_pixels_c.h b/vs/sdl2/src/video/SDL_pixels_c.h similarity index 100% rename from vs2015/sdl2/src/video/SDL_pixels_c.h rename to vs/sdl2/src/video/SDL_pixels_c.h diff --git a/vs2015/sdl2/src/video/SDL_rect.c b/vs/sdl2/src/video/SDL_rect.c similarity index 100% rename from vs2015/sdl2/src/video/SDL_rect.c rename to vs/sdl2/src/video/SDL_rect.c diff --git a/vs2015/sdl2/src/video/SDL_rect_c.h b/vs/sdl2/src/video/SDL_rect_c.h similarity index 100% rename from vs2015/sdl2/src/video/SDL_rect_c.h rename to vs/sdl2/src/video/SDL_rect_c.h diff --git a/vs2015/sdl2/src/video/SDL_shape.c b/vs/sdl2/src/video/SDL_shape.c similarity index 100% rename from vs2015/sdl2/src/video/SDL_shape.c rename to vs/sdl2/src/video/SDL_shape.c diff --git a/vs2015/sdl2/src/video/SDL_shape_internals.h b/vs/sdl2/src/video/SDL_shape_internals.h similarity index 100% rename from vs2015/sdl2/src/video/SDL_shape_internals.h rename to vs/sdl2/src/video/SDL_shape_internals.h diff --git a/vs2015/sdl2/src/video/SDL_stretch.c b/vs/sdl2/src/video/SDL_stretch.c similarity index 100% rename from vs2015/sdl2/src/video/SDL_stretch.c rename to vs/sdl2/src/video/SDL_stretch.c diff --git a/vs2015/sdl2/src/video/SDL_surface.c b/vs/sdl2/src/video/SDL_surface.c similarity index 100% rename from vs2015/sdl2/src/video/SDL_surface.c rename to vs/sdl2/src/video/SDL_surface.c diff --git a/vs2015/sdl2/src/video/SDL_sysvideo.h b/vs/sdl2/src/video/SDL_sysvideo.h similarity index 100% rename from vs2015/sdl2/src/video/SDL_sysvideo.h rename to vs/sdl2/src/video/SDL_sysvideo.h diff --git a/vs2015/sdl2/src/video/SDL_video.c b/vs/sdl2/src/video/SDL_video.c similarity index 100% rename from vs2015/sdl2/src/video/SDL_video.c rename to vs/sdl2/src/video/SDL_video.c diff --git a/vs2015/sdl2/src/video/SDL_vulkan_internal.h b/vs/sdl2/src/video/SDL_vulkan_internal.h similarity index 100% rename from vs2015/sdl2/src/video/SDL_vulkan_internal.h rename to vs/sdl2/src/video/SDL_vulkan_internal.h diff --git a/vs2015/sdl2/src/video/SDL_vulkan_utils.c b/vs/sdl2/src/video/SDL_vulkan_utils.c similarity index 100% rename from vs2015/sdl2/src/video/SDL_vulkan_utils.c rename to vs/sdl2/src/video/SDL_vulkan_utils.c diff --git a/vs2015/sdl2/src/video/SDL_yuv.c b/vs/sdl2/src/video/SDL_yuv.c similarity index 100% rename from vs2015/sdl2/src/video/SDL_yuv.c rename to vs/sdl2/src/video/SDL_yuv.c diff --git a/vs2015/sdl2/src/video/SDL_yuv_c.h b/vs/sdl2/src/video/SDL_yuv_c.h similarity index 100% rename from vs2015/sdl2/src/video/SDL_yuv_c.h rename to vs/sdl2/src/video/SDL_yuv_c.h diff --git a/vs2015/sdl2/src/video/android/SDL_androidclipboard.c b/vs/sdl2/src/video/android/SDL_androidclipboard.c similarity index 100% rename from vs2015/sdl2/src/video/android/SDL_androidclipboard.c rename to vs/sdl2/src/video/android/SDL_androidclipboard.c diff --git a/vs2015/sdl2/src/video/android/SDL_androidclipboard.h b/vs/sdl2/src/video/android/SDL_androidclipboard.h similarity index 100% rename from vs2015/sdl2/src/video/android/SDL_androidclipboard.h rename to vs/sdl2/src/video/android/SDL_androidclipboard.h diff --git a/vs2015/sdl2/src/video/android/SDL_androidevents.c b/vs/sdl2/src/video/android/SDL_androidevents.c similarity index 100% rename from vs2015/sdl2/src/video/android/SDL_androidevents.c rename to vs/sdl2/src/video/android/SDL_androidevents.c diff --git a/vs2015/sdl2/src/video/android/SDL_androidevents.h b/vs/sdl2/src/video/android/SDL_androidevents.h similarity index 100% rename from vs2015/sdl2/src/video/android/SDL_androidevents.h rename to vs/sdl2/src/video/android/SDL_androidevents.h diff --git a/vs2015/sdl2/src/video/android/SDL_androidgl.c b/vs/sdl2/src/video/android/SDL_androidgl.c similarity index 100% rename from vs2015/sdl2/src/video/android/SDL_androidgl.c rename to vs/sdl2/src/video/android/SDL_androidgl.c diff --git a/vs2015/sdl2/src/video/android/SDL_androidgl.h b/vs/sdl2/src/video/android/SDL_androidgl.h similarity index 100% rename from vs2015/sdl2/src/video/android/SDL_androidgl.h rename to vs/sdl2/src/video/android/SDL_androidgl.h diff --git a/vs2015/sdl2/src/video/android/SDL_androidkeyboard.c b/vs/sdl2/src/video/android/SDL_androidkeyboard.c similarity index 100% rename from vs2015/sdl2/src/video/android/SDL_androidkeyboard.c rename to vs/sdl2/src/video/android/SDL_androidkeyboard.c diff --git a/vs2015/sdl2/src/video/android/SDL_androidkeyboard.h b/vs/sdl2/src/video/android/SDL_androidkeyboard.h similarity index 100% rename from vs2015/sdl2/src/video/android/SDL_androidkeyboard.h rename to vs/sdl2/src/video/android/SDL_androidkeyboard.h diff --git a/vs2015/sdl2/src/video/android/SDL_androidmessagebox.c b/vs/sdl2/src/video/android/SDL_androidmessagebox.c similarity index 100% rename from vs2015/sdl2/src/video/android/SDL_androidmessagebox.c rename to vs/sdl2/src/video/android/SDL_androidmessagebox.c diff --git a/vs2015/sdl2/src/video/android/SDL_androidmessagebox.h b/vs/sdl2/src/video/android/SDL_androidmessagebox.h similarity index 100% rename from vs2015/sdl2/src/video/android/SDL_androidmessagebox.h rename to vs/sdl2/src/video/android/SDL_androidmessagebox.h diff --git a/vs2015/sdl2/src/video/android/SDL_androidmouse.c b/vs/sdl2/src/video/android/SDL_androidmouse.c similarity index 100% rename from vs2015/sdl2/src/video/android/SDL_androidmouse.c rename to vs/sdl2/src/video/android/SDL_androidmouse.c diff --git a/vs2015/sdl2/src/video/android/SDL_androidmouse.h b/vs/sdl2/src/video/android/SDL_androidmouse.h similarity index 100% rename from vs2015/sdl2/src/video/android/SDL_androidmouse.h rename to vs/sdl2/src/video/android/SDL_androidmouse.h diff --git a/vs2015/sdl2/src/video/android/SDL_androidtouch.c b/vs/sdl2/src/video/android/SDL_androidtouch.c similarity index 100% rename from vs2015/sdl2/src/video/android/SDL_androidtouch.c rename to vs/sdl2/src/video/android/SDL_androidtouch.c diff --git a/vs2015/sdl2/src/video/android/SDL_androidtouch.h b/vs/sdl2/src/video/android/SDL_androidtouch.h similarity index 100% rename from vs2015/sdl2/src/video/android/SDL_androidtouch.h rename to vs/sdl2/src/video/android/SDL_androidtouch.h diff --git a/vs2015/sdl2/src/video/android/SDL_androidvideo.c b/vs/sdl2/src/video/android/SDL_androidvideo.c similarity index 100% rename from vs2015/sdl2/src/video/android/SDL_androidvideo.c rename to vs/sdl2/src/video/android/SDL_androidvideo.c diff --git a/vs2015/sdl2/src/video/android/SDL_androidvideo.h b/vs/sdl2/src/video/android/SDL_androidvideo.h similarity index 100% rename from vs2015/sdl2/src/video/android/SDL_androidvideo.h rename to vs/sdl2/src/video/android/SDL_androidvideo.h diff --git a/vs2015/sdl2/src/video/android/SDL_androidvulkan.c b/vs/sdl2/src/video/android/SDL_androidvulkan.c similarity index 100% rename from vs2015/sdl2/src/video/android/SDL_androidvulkan.c rename to vs/sdl2/src/video/android/SDL_androidvulkan.c diff --git a/vs2015/sdl2/src/video/android/SDL_androidvulkan.h b/vs/sdl2/src/video/android/SDL_androidvulkan.h similarity index 100% rename from vs2015/sdl2/src/video/android/SDL_androidvulkan.h rename to vs/sdl2/src/video/android/SDL_androidvulkan.h diff --git a/vs2015/sdl2/src/video/android/SDL_androidwindow.c b/vs/sdl2/src/video/android/SDL_androidwindow.c similarity index 100% rename from vs2015/sdl2/src/video/android/SDL_androidwindow.c rename to vs/sdl2/src/video/android/SDL_androidwindow.c diff --git a/vs2015/sdl2/src/video/android/SDL_androidwindow.h b/vs/sdl2/src/video/android/SDL_androidwindow.h similarity index 100% rename from vs2015/sdl2/src/video/android/SDL_androidwindow.h rename to vs/sdl2/src/video/android/SDL_androidwindow.h diff --git a/vs2015/sdl2/src/video/cocoa/SDL_cocoaclipboard.h b/vs/sdl2/src/video/cocoa/SDL_cocoaclipboard.h similarity index 100% rename from vs2015/sdl2/src/video/cocoa/SDL_cocoaclipboard.h rename to vs/sdl2/src/video/cocoa/SDL_cocoaclipboard.h diff --git a/vs2015/sdl2/src/video/cocoa/SDL_cocoaclipboard.m b/vs/sdl2/src/video/cocoa/SDL_cocoaclipboard.m similarity index 100% rename from vs2015/sdl2/src/video/cocoa/SDL_cocoaclipboard.m rename to vs/sdl2/src/video/cocoa/SDL_cocoaclipboard.m diff --git a/vs2015/sdl2/src/video/cocoa/SDL_cocoaevents.h b/vs/sdl2/src/video/cocoa/SDL_cocoaevents.h similarity index 100% rename from vs2015/sdl2/src/video/cocoa/SDL_cocoaevents.h rename to vs/sdl2/src/video/cocoa/SDL_cocoaevents.h diff --git a/vs2015/sdl2/src/video/cocoa/SDL_cocoaevents.m b/vs/sdl2/src/video/cocoa/SDL_cocoaevents.m similarity index 100% rename from vs2015/sdl2/src/video/cocoa/SDL_cocoaevents.m rename to vs/sdl2/src/video/cocoa/SDL_cocoaevents.m diff --git a/vs2015/sdl2/src/video/cocoa/SDL_cocoakeyboard.h b/vs/sdl2/src/video/cocoa/SDL_cocoakeyboard.h similarity index 100% rename from vs2015/sdl2/src/video/cocoa/SDL_cocoakeyboard.h rename to vs/sdl2/src/video/cocoa/SDL_cocoakeyboard.h diff --git a/vs2015/sdl2/src/video/cocoa/SDL_cocoakeyboard.m b/vs/sdl2/src/video/cocoa/SDL_cocoakeyboard.m similarity index 100% rename from vs2015/sdl2/src/video/cocoa/SDL_cocoakeyboard.m rename to vs/sdl2/src/video/cocoa/SDL_cocoakeyboard.m diff --git a/vs2015/sdl2/src/video/cocoa/SDL_cocoamessagebox.h b/vs/sdl2/src/video/cocoa/SDL_cocoamessagebox.h similarity index 100% rename from vs2015/sdl2/src/video/cocoa/SDL_cocoamessagebox.h rename to vs/sdl2/src/video/cocoa/SDL_cocoamessagebox.h diff --git a/vs2015/sdl2/src/video/cocoa/SDL_cocoamessagebox.m b/vs/sdl2/src/video/cocoa/SDL_cocoamessagebox.m similarity index 100% rename from vs2015/sdl2/src/video/cocoa/SDL_cocoamessagebox.m rename to vs/sdl2/src/video/cocoa/SDL_cocoamessagebox.m diff --git a/vs2015/sdl2/src/video/cocoa/SDL_cocoametalview.h b/vs/sdl2/src/video/cocoa/SDL_cocoametalview.h similarity index 100% rename from vs2015/sdl2/src/video/cocoa/SDL_cocoametalview.h rename to vs/sdl2/src/video/cocoa/SDL_cocoametalview.h diff --git a/vs2015/sdl2/src/video/cocoa/SDL_cocoametalview.m b/vs/sdl2/src/video/cocoa/SDL_cocoametalview.m similarity index 100% rename from vs2015/sdl2/src/video/cocoa/SDL_cocoametalview.m rename to vs/sdl2/src/video/cocoa/SDL_cocoametalview.m diff --git a/vs2015/sdl2/src/video/cocoa/SDL_cocoamodes.h b/vs/sdl2/src/video/cocoa/SDL_cocoamodes.h similarity index 100% rename from vs2015/sdl2/src/video/cocoa/SDL_cocoamodes.h rename to vs/sdl2/src/video/cocoa/SDL_cocoamodes.h diff --git a/vs2015/sdl2/src/video/cocoa/SDL_cocoamodes.m b/vs/sdl2/src/video/cocoa/SDL_cocoamodes.m similarity index 100% rename from vs2015/sdl2/src/video/cocoa/SDL_cocoamodes.m rename to vs/sdl2/src/video/cocoa/SDL_cocoamodes.m diff --git a/vs2015/sdl2/src/video/cocoa/SDL_cocoamouse.h b/vs/sdl2/src/video/cocoa/SDL_cocoamouse.h similarity index 100% rename from vs2015/sdl2/src/video/cocoa/SDL_cocoamouse.h rename to vs/sdl2/src/video/cocoa/SDL_cocoamouse.h diff --git a/vs2015/sdl2/src/video/cocoa/SDL_cocoamouse.m b/vs/sdl2/src/video/cocoa/SDL_cocoamouse.m similarity index 100% rename from vs2015/sdl2/src/video/cocoa/SDL_cocoamouse.m rename to vs/sdl2/src/video/cocoa/SDL_cocoamouse.m diff --git a/vs2015/sdl2/src/video/cocoa/SDL_cocoamousetap.h b/vs/sdl2/src/video/cocoa/SDL_cocoamousetap.h similarity index 100% rename from vs2015/sdl2/src/video/cocoa/SDL_cocoamousetap.h rename to vs/sdl2/src/video/cocoa/SDL_cocoamousetap.h diff --git a/vs2015/sdl2/src/video/cocoa/SDL_cocoamousetap.m b/vs/sdl2/src/video/cocoa/SDL_cocoamousetap.m similarity index 100% rename from vs2015/sdl2/src/video/cocoa/SDL_cocoamousetap.m rename to vs/sdl2/src/video/cocoa/SDL_cocoamousetap.m diff --git a/vs2015/sdl2/src/video/cocoa/SDL_cocoaopengl.h b/vs/sdl2/src/video/cocoa/SDL_cocoaopengl.h similarity index 100% rename from vs2015/sdl2/src/video/cocoa/SDL_cocoaopengl.h rename to vs/sdl2/src/video/cocoa/SDL_cocoaopengl.h diff --git a/vs2015/sdl2/src/video/cocoa/SDL_cocoaopengl.m b/vs/sdl2/src/video/cocoa/SDL_cocoaopengl.m similarity index 100% rename from vs2015/sdl2/src/video/cocoa/SDL_cocoaopengl.m rename to vs/sdl2/src/video/cocoa/SDL_cocoaopengl.m diff --git a/vs2015/sdl2/src/video/cocoa/SDL_cocoaopengles.h b/vs/sdl2/src/video/cocoa/SDL_cocoaopengles.h similarity index 100% rename from vs2015/sdl2/src/video/cocoa/SDL_cocoaopengles.h rename to vs/sdl2/src/video/cocoa/SDL_cocoaopengles.h diff --git a/vs2015/sdl2/src/video/cocoa/SDL_cocoaopengles.m b/vs/sdl2/src/video/cocoa/SDL_cocoaopengles.m similarity index 100% rename from vs2015/sdl2/src/video/cocoa/SDL_cocoaopengles.m rename to vs/sdl2/src/video/cocoa/SDL_cocoaopengles.m diff --git a/vs2015/sdl2/src/video/cocoa/SDL_cocoashape.h b/vs/sdl2/src/video/cocoa/SDL_cocoashape.h similarity index 100% rename from vs2015/sdl2/src/video/cocoa/SDL_cocoashape.h rename to vs/sdl2/src/video/cocoa/SDL_cocoashape.h diff --git a/vs2015/sdl2/src/video/cocoa/SDL_cocoashape.m b/vs/sdl2/src/video/cocoa/SDL_cocoashape.m similarity index 100% rename from vs2015/sdl2/src/video/cocoa/SDL_cocoashape.m rename to vs/sdl2/src/video/cocoa/SDL_cocoashape.m diff --git a/vs2015/sdl2/src/video/cocoa/SDL_cocoavideo.h b/vs/sdl2/src/video/cocoa/SDL_cocoavideo.h similarity index 100% rename from vs2015/sdl2/src/video/cocoa/SDL_cocoavideo.h rename to vs/sdl2/src/video/cocoa/SDL_cocoavideo.h diff --git a/vs2015/sdl2/src/video/cocoa/SDL_cocoavideo.m b/vs/sdl2/src/video/cocoa/SDL_cocoavideo.m similarity index 100% rename from vs2015/sdl2/src/video/cocoa/SDL_cocoavideo.m rename to vs/sdl2/src/video/cocoa/SDL_cocoavideo.m diff --git a/vs2015/sdl2/src/video/cocoa/SDL_cocoavulkan.h b/vs/sdl2/src/video/cocoa/SDL_cocoavulkan.h similarity index 100% rename from vs2015/sdl2/src/video/cocoa/SDL_cocoavulkan.h rename to vs/sdl2/src/video/cocoa/SDL_cocoavulkan.h diff --git a/vs2015/sdl2/src/video/cocoa/SDL_cocoavulkan.m b/vs/sdl2/src/video/cocoa/SDL_cocoavulkan.m similarity index 100% rename from vs2015/sdl2/src/video/cocoa/SDL_cocoavulkan.m rename to vs/sdl2/src/video/cocoa/SDL_cocoavulkan.m diff --git a/vs2015/sdl2/src/video/cocoa/SDL_cocoawindow.h b/vs/sdl2/src/video/cocoa/SDL_cocoawindow.h similarity index 100% rename from vs2015/sdl2/src/video/cocoa/SDL_cocoawindow.h rename to vs/sdl2/src/video/cocoa/SDL_cocoawindow.h diff --git a/vs2015/sdl2/src/video/cocoa/SDL_cocoawindow.m b/vs/sdl2/src/video/cocoa/SDL_cocoawindow.m similarity index 100% rename from vs2015/sdl2/src/video/cocoa/SDL_cocoawindow.m rename to vs/sdl2/src/video/cocoa/SDL_cocoawindow.m diff --git a/vs2015/sdl2/src/video/directfb/SDL_DirectFB_WM.c b/vs/sdl2/src/video/directfb/SDL_DirectFB_WM.c similarity index 100% rename from vs2015/sdl2/src/video/directfb/SDL_DirectFB_WM.c rename to vs/sdl2/src/video/directfb/SDL_DirectFB_WM.c diff --git a/vs2015/sdl2/src/video/directfb/SDL_DirectFB_WM.h b/vs/sdl2/src/video/directfb/SDL_DirectFB_WM.h similarity index 100% rename from vs2015/sdl2/src/video/directfb/SDL_DirectFB_WM.h rename to vs/sdl2/src/video/directfb/SDL_DirectFB_WM.h diff --git a/vs2015/sdl2/src/video/directfb/SDL_DirectFB_dyn.c b/vs/sdl2/src/video/directfb/SDL_DirectFB_dyn.c similarity index 100% rename from vs2015/sdl2/src/video/directfb/SDL_DirectFB_dyn.c rename to vs/sdl2/src/video/directfb/SDL_DirectFB_dyn.c diff --git a/vs2015/sdl2/src/video/directfb/SDL_DirectFB_dyn.h b/vs/sdl2/src/video/directfb/SDL_DirectFB_dyn.h similarity index 100% rename from vs2015/sdl2/src/video/directfb/SDL_DirectFB_dyn.h rename to vs/sdl2/src/video/directfb/SDL_DirectFB_dyn.h diff --git a/vs2015/sdl2/src/video/directfb/SDL_DirectFB_events.c b/vs/sdl2/src/video/directfb/SDL_DirectFB_events.c similarity index 100% rename from vs2015/sdl2/src/video/directfb/SDL_DirectFB_events.c rename to vs/sdl2/src/video/directfb/SDL_DirectFB_events.c diff --git a/vs2015/sdl2/src/video/directfb/SDL_DirectFB_events.h b/vs/sdl2/src/video/directfb/SDL_DirectFB_events.h similarity index 100% rename from vs2015/sdl2/src/video/directfb/SDL_DirectFB_events.h rename to vs/sdl2/src/video/directfb/SDL_DirectFB_events.h diff --git a/vs2015/sdl2/src/video/directfb/SDL_DirectFB_modes.c b/vs/sdl2/src/video/directfb/SDL_DirectFB_modes.c similarity index 100% rename from vs2015/sdl2/src/video/directfb/SDL_DirectFB_modes.c rename to vs/sdl2/src/video/directfb/SDL_DirectFB_modes.c diff --git a/vs2015/sdl2/src/video/directfb/SDL_DirectFB_modes.h b/vs/sdl2/src/video/directfb/SDL_DirectFB_modes.h similarity index 100% rename from vs2015/sdl2/src/video/directfb/SDL_DirectFB_modes.h rename to vs/sdl2/src/video/directfb/SDL_DirectFB_modes.h diff --git a/vs2015/sdl2/src/video/directfb/SDL_DirectFB_mouse.c b/vs/sdl2/src/video/directfb/SDL_DirectFB_mouse.c similarity index 100% rename from vs2015/sdl2/src/video/directfb/SDL_DirectFB_mouse.c rename to vs/sdl2/src/video/directfb/SDL_DirectFB_mouse.c diff --git a/vs2015/sdl2/src/video/directfb/SDL_DirectFB_mouse.h b/vs/sdl2/src/video/directfb/SDL_DirectFB_mouse.h similarity index 100% rename from vs2015/sdl2/src/video/directfb/SDL_DirectFB_mouse.h rename to vs/sdl2/src/video/directfb/SDL_DirectFB_mouse.h diff --git a/vs2015/sdl2/src/video/directfb/SDL_DirectFB_opengl.c b/vs/sdl2/src/video/directfb/SDL_DirectFB_opengl.c similarity index 100% rename from vs2015/sdl2/src/video/directfb/SDL_DirectFB_opengl.c rename to vs/sdl2/src/video/directfb/SDL_DirectFB_opengl.c diff --git a/vs2015/sdl2/src/video/directfb/SDL_DirectFB_opengl.h b/vs/sdl2/src/video/directfb/SDL_DirectFB_opengl.h similarity index 100% rename from vs2015/sdl2/src/video/directfb/SDL_DirectFB_opengl.h rename to vs/sdl2/src/video/directfb/SDL_DirectFB_opengl.h diff --git a/vs2015/sdl2/src/video/directfb/SDL_DirectFB_render.c b/vs/sdl2/src/video/directfb/SDL_DirectFB_render.c similarity index 100% rename from vs2015/sdl2/src/video/directfb/SDL_DirectFB_render.c rename to vs/sdl2/src/video/directfb/SDL_DirectFB_render.c diff --git a/vs2015/sdl2/src/video/directfb/SDL_DirectFB_render.h b/vs/sdl2/src/video/directfb/SDL_DirectFB_render.h similarity index 100% rename from vs2015/sdl2/src/video/directfb/SDL_DirectFB_render.h rename to vs/sdl2/src/video/directfb/SDL_DirectFB_render.h diff --git a/vs2015/sdl2/src/video/directfb/SDL_DirectFB_shape.c b/vs/sdl2/src/video/directfb/SDL_DirectFB_shape.c similarity index 100% rename from vs2015/sdl2/src/video/directfb/SDL_DirectFB_shape.c rename to vs/sdl2/src/video/directfb/SDL_DirectFB_shape.c diff --git a/vs2015/sdl2/src/video/directfb/SDL_DirectFB_shape.h b/vs/sdl2/src/video/directfb/SDL_DirectFB_shape.h similarity index 100% rename from vs2015/sdl2/src/video/directfb/SDL_DirectFB_shape.h rename to vs/sdl2/src/video/directfb/SDL_DirectFB_shape.h diff --git a/vs2015/sdl2/src/video/directfb/SDL_DirectFB_video.c b/vs/sdl2/src/video/directfb/SDL_DirectFB_video.c similarity index 100% rename from vs2015/sdl2/src/video/directfb/SDL_DirectFB_video.c rename to vs/sdl2/src/video/directfb/SDL_DirectFB_video.c diff --git a/vs2015/sdl2/src/video/directfb/SDL_DirectFB_video.h b/vs/sdl2/src/video/directfb/SDL_DirectFB_video.h similarity index 100% rename from vs2015/sdl2/src/video/directfb/SDL_DirectFB_video.h rename to vs/sdl2/src/video/directfb/SDL_DirectFB_video.h diff --git a/vs2015/sdl2/src/video/directfb/SDL_DirectFB_window.c b/vs/sdl2/src/video/directfb/SDL_DirectFB_window.c similarity index 100% rename from vs2015/sdl2/src/video/directfb/SDL_DirectFB_window.c rename to vs/sdl2/src/video/directfb/SDL_DirectFB_window.c diff --git a/vs2015/sdl2/src/video/directfb/SDL_DirectFB_window.h b/vs/sdl2/src/video/directfb/SDL_DirectFB_window.h similarity index 100% rename from vs2015/sdl2/src/video/directfb/SDL_DirectFB_window.h rename to vs/sdl2/src/video/directfb/SDL_DirectFB_window.h diff --git a/vs2015/sdl2/src/video/dummy/SDL_nullevents.c b/vs/sdl2/src/video/dummy/SDL_nullevents.c similarity index 100% rename from vs2015/sdl2/src/video/dummy/SDL_nullevents.c rename to vs/sdl2/src/video/dummy/SDL_nullevents.c diff --git a/vs2015/sdl2/src/video/dummy/SDL_nullevents_c.h b/vs/sdl2/src/video/dummy/SDL_nullevents_c.h similarity index 100% rename from vs2015/sdl2/src/video/dummy/SDL_nullevents_c.h rename to vs/sdl2/src/video/dummy/SDL_nullevents_c.h diff --git a/vs2015/sdl2/src/video/dummy/SDL_nullframebuffer.c b/vs/sdl2/src/video/dummy/SDL_nullframebuffer.c similarity index 100% rename from vs2015/sdl2/src/video/dummy/SDL_nullframebuffer.c rename to vs/sdl2/src/video/dummy/SDL_nullframebuffer.c diff --git a/vs2015/sdl2/src/video/dummy/SDL_nullframebuffer_c.h b/vs/sdl2/src/video/dummy/SDL_nullframebuffer_c.h similarity index 100% rename from vs2015/sdl2/src/video/dummy/SDL_nullframebuffer_c.h rename to vs/sdl2/src/video/dummy/SDL_nullframebuffer_c.h diff --git a/vs2015/sdl2/src/video/dummy/SDL_nullvideo.c b/vs/sdl2/src/video/dummy/SDL_nullvideo.c similarity index 100% rename from vs2015/sdl2/src/video/dummy/SDL_nullvideo.c rename to vs/sdl2/src/video/dummy/SDL_nullvideo.c diff --git a/vs2015/sdl2/src/video/dummy/SDL_nullvideo.h b/vs/sdl2/src/video/dummy/SDL_nullvideo.h similarity index 100% rename from vs2015/sdl2/src/video/dummy/SDL_nullvideo.h rename to vs/sdl2/src/video/dummy/SDL_nullvideo.h diff --git a/vs2015/sdl2/src/video/emscripten/SDL_emscriptenevents.c b/vs/sdl2/src/video/emscripten/SDL_emscriptenevents.c similarity index 100% rename from vs2015/sdl2/src/video/emscripten/SDL_emscriptenevents.c rename to vs/sdl2/src/video/emscripten/SDL_emscriptenevents.c diff --git a/vs2015/sdl2/src/video/emscripten/SDL_emscriptenevents.h b/vs/sdl2/src/video/emscripten/SDL_emscriptenevents.h similarity index 100% rename from vs2015/sdl2/src/video/emscripten/SDL_emscriptenevents.h rename to vs/sdl2/src/video/emscripten/SDL_emscriptenevents.h diff --git a/vs2015/sdl2/src/video/emscripten/SDL_emscriptenframebuffer.c b/vs/sdl2/src/video/emscripten/SDL_emscriptenframebuffer.c similarity index 100% rename from vs2015/sdl2/src/video/emscripten/SDL_emscriptenframebuffer.c rename to vs/sdl2/src/video/emscripten/SDL_emscriptenframebuffer.c diff --git a/vs2015/sdl2/src/video/emscripten/SDL_emscriptenframebuffer.h b/vs/sdl2/src/video/emscripten/SDL_emscriptenframebuffer.h similarity index 100% rename from vs2015/sdl2/src/video/emscripten/SDL_emscriptenframebuffer.h rename to vs/sdl2/src/video/emscripten/SDL_emscriptenframebuffer.h diff --git a/vs2015/sdl2/src/video/emscripten/SDL_emscriptenmouse.c b/vs/sdl2/src/video/emscripten/SDL_emscriptenmouse.c similarity index 100% rename from vs2015/sdl2/src/video/emscripten/SDL_emscriptenmouse.c rename to vs/sdl2/src/video/emscripten/SDL_emscriptenmouse.c diff --git a/vs2015/sdl2/src/video/emscripten/SDL_emscriptenmouse.h b/vs/sdl2/src/video/emscripten/SDL_emscriptenmouse.h similarity index 100% rename from vs2015/sdl2/src/video/emscripten/SDL_emscriptenmouse.h rename to vs/sdl2/src/video/emscripten/SDL_emscriptenmouse.h diff --git a/vs2015/sdl2/src/video/emscripten/SDL_emscriptenopengles.c b/vs/sdl2/src/video/emscripten/SDL_emscriptenopengles.c similarity index 100% rename from vs2015/sdl2/src/video/emscripten/SDL_emscriptenopengles.c rename to vs/sdl2/src/video/emscripten/SDL_emscriptenopengles.c diff --git a/vs2015/sdl2/src/video/emscripten/SDL_emscriptenopengles.h b/vs/sdl2/src/video/emscripten/SDL_emscriptenopengles.h similarity index 100% rename from vs2015/sdl2/src/video/emscripten/SDL_emscriptenopengles.h rename to vs/sdl2/src/video/emscripten/SDL_emscriptenopengles.h diff --git a/vs2015/sdl2/src/video/emscripten/SDL_emscriptenvideo.c b/vs/sdl2/src/video/emscripten/SDL_emscriptenvideo.c similarity index 100% rename from vs2015/sdl2/src/video/emscripten/SDL_emscriptenvideo.c rename to vs/sdl2/src/video/emscripten/SDL_emscriptenvideo.c diff --git a/vs2015/sdl2/src/video/emscripten/SDL_emscriptenvideo.h b/vs/sdl2/src/video/emscripten/SDL_emscriptenvideo.h similarity index 100% rename from vs2015/sdl2/src/video/emscripten/SDL_emscriptenvideo.h rename to vs/sdl2/src/video/emscripten/SDL_emscriptenvideo.h diff --git a/vs2015/sdl2/src/video/haiku/SDL_BWin.h b/vs/sdl2/src/video/haiku/SDL_BWin.h similarity index 100% rename from vs2015/sdl2/src/video/haiku/SDL_BWin.h rename to vs/sdl2/src/video/haiku/SDL_BWin.h diff --git a/vs2015/sdl2/src/video/haiku/SDL_bclipboard.cc b/vs/sdl2/src/video/haiku/SDL_bclipboard.cc similarity index 100% rename from vs2015/sdl2/src/video/haiku/SDL_bclipboard.cc rename to vs/sdl2/src/video/haiku/SDL_bclipboard.cc diff --git a/vs2015/sdl2/src/video/haiku/SDL_bclipboard.h b/vs/sdl2/src/video/haiku/SDL_bclipboard.h similarity index 100% rename from vs2015/sdl2/src/video/haiku/SDL_bclipboard.h rename to vs/sdl2/src/video/haiku/SDL_bclipboard.h diff --git a/vs2015/sdl2/src/video/haiku/SDL_bevents.cc b/vs/sdl2/src/video/haiku/SDL_bevents.cc similarity index 100% rename from vs2015/sdl2/src/video/haiku/SDL_bevents.cc rename to vs/sdl2/src/video/haiku/SDL_bevents.cc diff --git a/vs2015/sdl2/src/video/haiku/SDL_bevents.h b/vs/sdl2/src/video/haiku/SDL_bevents.h similarity index 100% rename from vs2015/sdl2/src/video/haiku/SDL_bevents.h rename to vs/sdl2/src/video/haiku/SDL_bevents.h diff --git a/vs2015/sdl2/src/video/haiku/SDL_bframebuffer.cc b/vs/sdl2/src/video/haiku/SDL_bframebuffer.cc similarity index 100% rename from vs2015/sdl2/src/video/haiku/SDL_bframebuffer.cc rename to vs/sdl2/src/video/haiku/SDL_bframebuffer.cc diff --git a/vs2015/sdl2/src/video/haiku/SDL_bframebuffer.h b/vs/sdl2/src/video/haiku/SDL_bframebuffer.h similarity index 100% rename from vs2015/sdl2/src/video/haiku/SDL_bframebuffer.h rename to vs/sdl2/src/video/haiku/SDL_bframebuffer.h diff --git a/vs2015/sdl2/src/video/haiku/SDL_bkeyboard.cc b/vs/sdl2/src/video/haiku/SDL_bkeyboard.cc similarity index 100% rename from vs2015/sdl2/src/video/haiku/SDL_bkeyboard.cc rename to vs/sdl2/src/video/haiku/SDL_bkeyboard.cc diff --git a/vs2015/sdl2/src/video/haiku/SDL_bkeyboard.h b/vs/sdl2/src/video/haiku/SDL_bkeyboard.h similarity index 100% rename from vs2015/sdl2/src/video/haiku/SDL_bkeyboard.h rename to vs/sdl2/src/video/haiku/SDL_bkeyboard.h diff --git a/vs2015/sdl2/src/video/haiku/SDL_bmodes.cc b/vs/sdl2/src/video/haiku/SDL_bmodes.cc similarity index 100% rename from vs2015/sdl2/src/video/haiku/SDL_bmodes.cc rename to vs/sdl2/src/video/haiku/SDL_bmodes.cc diff --git a/vs2015/sdl2/src/video/haiku/SDL_bmodes.h b/vs/sdl2/src/video/haiku/SDL_bmodes.h similarity index 100% rename from vs2015/sdl2/src/video/haiku/SDL_bmodes.h rename to vs/sdl2/src/video/haiku/SDL_bmodes.h diff --git a/vs2015/sdl2/src/video/haiku/SDL_bopengl.cc b/vs/sdl2/src/video/haiku/SDL_bopengl.cc similarity index 100% rename from vs2015/sdl2/src/video/haiku/SDL_bopengl.cc rename to vs/sdl2/src/video/haiku/SDL_bopengl.cc diff --git a/vs2015/sdl2/src/video/haiku/SDL_bopengl.h b/vs/sdl2/src/video/haiku/SDL_bopengl.h similarity index 100% rename from vs2015/sdl2/src/video/haiku/SDL_bopengl.h rename to vs/sdl2/src/video/haiku/SDL_bopengl.h diff --git a/vs2015/sdl2/src/video/haiku/SDL_bvideo.cc b/vs/sdl2/src/video/haiku/SDL_bvideo.cc similarity index 100% rename from vs2015/sdl2/src/video/haiku/SDL_bvideo.cc rename to vs/sdl2/src/video/haiku/SDL_bvideo.cc diff --git a/vs2015/sdl2/src/video/haiku/SDL_bvideo.h b/vs/sdl2/src/video/haiku/SDL_bvideo.h similarity index 100% rename from vs2015/sdl2/src/video/haiku/SDL_bvideo.h rename to vs/sdl2/src/video/haiku/SDL_bvideo.h diff --git a/vs2015/sdl2/src/video/haiku/SDL_bwindow.cc b/vs/sdl2/src/video/haiku/SDL_bwindow.cc similarity index 100% rename from vs2015/sdl2/src/video/haiku/SDL_bwindow.cc rename to vs/sdl2/src/video/haiku/SDL_bwindow.cc diff --git a/vs2015/sdl2/src/video/haiku/SDL_bwindow.h b/vs/sdl2/src/video/haiku/SDL_bwindow.h similarity index 100% rename from vs2015/sdl2/src/video/haiku/SDL_bwindow.h rename to vs/sdl2/src/video/haiku/SDL_bwindow.h diff --git a/vs2015/sdl2/src/video/khronos/EGL/egl.h b/vs/sdl2/src/video/khronos/EGL/egl.h similarity index 100% rename from vs2015/sdl2/src/video/khronos/EGL/egl.h rename to vs/sdl2/src/video/khronos/EGL/egl.h diff --git a/vs2015/sdl2/src/video/khronos/EGL/eglext.h b/vs/sdl2/src/video/khronos/EGL/eglext.h similarity index 100% rename from vs2015/sdl2/src/video/khronos/EGL/eglext.h rename to vs/sdl2/src/video/khronos/EGL/eglext.h diff --git a/vs2015/sdl2/src/video/khronos/EGL/eglplatform.h b/vs/sdl2/src/video/khronos/EGL/eglplatform.h similarity index 100% rename from vs2015/sdl2/src/video/khronos/EGL/eglplatform.h rename to vs/sdl2/src/video/khronos/EGL/eglplatform.h diff --git a/vs2015/sdl2/src/video/khronos/GLES2/gl2.h b/vs/sdl2/src/video/khronos/GLES2/gl2.h similarity index 100% rename from vs2015/sdl2/src/video/khronos/GLES2/gl2.h rename to vs/sdl2/src/video/khronos/GLES2/gl2.h diff --git a/vs2015/sdl2/src/video/khronos/GLES2/gl2ext.h b/vs/sdl2/src/video/khronos/GLES2/gl2ext.h similarity index 100% rename from vs2015/sdl2/src/video/khronos/GLES2/gl2ext.h rename to vs/sdl2/src/video/khronos/GLES2/gl2ext.h diff --git a/vs2015/sdl2/src/video/khronos/GLES2/gl2platform.h b/vs/sdl2/src/video/khronos/GLES2/gl2platform.h similarity index 100% rename from vs2015/sdl2/src/video/khronos/GLES2/gl2platform.h rename to vs/sdl2/src/video/khronos/GLES2/gl2platform.h diff --git a/vs2015/sdl2/src/video/khronos/KHR/khrplatform.h b/vs/sdl2/src/video/khronos/KHR/khrplatform.h similarity index 100% rename from vs2015/sdl2/src/video/khronos/KHR/khrplatform.h rename to vs/sdl2/src/video/khronos/KHR/khrplatform.h diff --git a/vs2015/sdl2/src/video/khronos/vulkan/vk_platform.h b/vs/sdl2/src/video/khronos/vulkan/vk_platform.h similarity index 100% rename from vs2015/sdl2/src/video/khronos/vulkan/vk_platform.h rename to vs/sdl2/src/video/khronos/vulkan/vk_platform.h diff --git a/vs2015/sdl2/src/video/khronos/vulkan/vulkan.h b/vs/sdl2/src/video/khronos/vulkan/vulkan.h similarity index 100% rename from vs2015/sdl2/src/video/khronos/vulkan/vulkan.h rename to vs/sdl2/src/video/khronos/vulkan/vulkan.h diff --git a/vs2015/sdl2/src/video/kmsdrm/SDL_kmsdrmdyn.c b/vs/sdl2/src/video/kmsdrm/SDL_kmsdrmdyn.c similarity index 100% rename from vs2015/sdl2/src/video/kmsdrm/SDL_kmsdrmdyn.c rename to vs/sdl2/src/video/kmsdrm/SDL_kmsdrmdyn.c diff --git a/vs2015/sdl2/src/video/kmsdrm/SDL_kmsdrmdyn.h b/vs/sdl2/src/video/kmsdrm/SDL_kmsdrmdyn.h similarity index 100% rename from vs2015/sdl2/src/video/kmsdrm/SDL_kmsdrmdyn.h rename to vs/sdl2/src/video/kmsdrm/SDL_kmsdrmdyn.h diff --git a/vs2015/sdl2/src/video/kmsdrm/SDL_kmsdrmevents.c b/vs/sdl2/src/video/kmsdrm/SDL_kmsdrmevents.c similarity index 100% rename from vs2015/sdl2/src/video/kmsdrm/SDL_kmsdrmevents.c rename to vs/sdl2/src/video/kmsdrm/SDL_kmsdrmevents.c diff --git a/vs2015/sdl2/src/video/kmsdrm/SDL_kmsdrmevents.h b/vs/sdl2/src/video/kmsdrm/SDL_kmsdrmevents.h similarity index 100% rename from vs2015/sdl2/src/video/kmsdrm/SDL_kmsdrmevents.h rename to vs/sdl2/src/video/kmsdrm/SDL_kmsdrmevents.h diff --git a/vs2015/sdl2/src/video/kmsdrm/SDL_kmsdrmmouse.c b/vs/sdl2/src/video/kmsdrm/SDL_kmsdrmmouse.c similarity index 100% rename from vs2015/sdl2/src/video/kmsdrm/SDL_kmsdrmmouse.c rename to vs/sdl2/src/video/kmsdrm/SDL_kmsdrmmouse.c diff --git a/vs2015/sdl2/src/video/kmsdrm/SDL_kmsdrmmouse.h b/vs/sdl2/src/video/kmsdrm/SDL_kmsdrmmouse.h similarity index 100% rename from vs2015/sdl2/src/video/kmsdrm/SDL_kmsdrmmouse.h rename to vs/sdl2/src/video/kmsdrm/SDL_kmsdrmmouse.h diff --git a/vs2015/sdl2/src/video/kmsdrm/SDL_kmsdrmopengles.c b/vs/sdl2/src/video/kmsdrm/SDL_kmsdrmopengles.c similarity index 100% rename from vs2015/sdl2/src/video/kmsdrm/SDL_kmsdrmopengles.c rename to vs/sdl2/src/video/kmsdrm/SDL_kmsdrmopengles.c diff --git a/vs2015/sdl2/src/video/kmsdrm/SDL_kmsdrmopengles.h b/vs/sdl2/src/video/kmsdrm/SDL_kmsdrmopengles.h similarity index 100% rename from vs2015/sdl2/src/video/kmsdrm/SDL_kmsdrmopengles.h rename to vs/sdl2/src/video/kmsdrm/SDL_kmsdrmopengles.h diff --git a/vs2015/sdl2/src/video/kmsdrm/SDL_kmsdrmsym.h b/vs/sdl2/src/video/kmsdrm/SDL_kmsdrmsym.h similarity index 100% rename from vs2015/sdl2/src/video/kmsdrm/SDL_kmsdrmsym.h rename to vs/sdl2/src/video/kmsdrm/SDL_kmsdrmsym.h diff --git a/vs2015/sdl2/src/video/kmsdrm/SDL_kmsdrmvideo.c b/vs/sdl2/src/video/kmsdrm/SDL_kmsdrmvideo.c similarity index 100% rename from vs2015/sdl2/src/video/kmsdrm/SDL_kmsdrmvideo.c rename to vs/sdl2/src/video/kmsdrm/SDL_kmsdrmvideo.c diff --git a/vs2015/sdl2/src/video/kmsdrm/SDL_kmsdrmvideo.h b/vs/sdl2/src/video/kmsdrm/SDL_kmsdrmvideo.h similarity index 100% rename from vs2015/sdl2/src/video/kmsdrm/SDL_kmsdrmvideo.h rename to vs/sdl2/src/video/kmsdrm/SDL_kmsdrmvideo.h diff --git a/vs2015/sdl2/src/video/mir/SDL_mirdyn.c b/vs/sdl2/src/video/mir/SDL_mirdyn.c similarity index 100% rename from vs2015/sdl2/src/video/mir/SDL_mirdyn.c rename to vs/sdl2/src/video/mir/SDL_mirdyn.c diff --git a/vs2015/sdl2/src/video/mir/SDL_mirdyn.h b/vs/sdl2/src/video/mir/SDL_mirdyn.h similarity index 100% rename from vs2015/sdl2/src/video/mir/SDL_mirdyn.h rename to vs/sdl2/src/video/mir/SDL_mirdyn.h diff --git a/vs2015/sdl2/src/video/mir/SDL_mirevents.c b/vs/sdl2/src/video/mir/SDL_mirevents.c similarity index 100% rename from vs2015/sdl2/src/video/mir/SDL_mirevents.c rename to vs/sdl2/src/video/mir/SDL_mirevents.c diff --git a/vs2015/sdl2/src/video/mir/SDL_mirevents.h b/vs/sdl2/src/video/mir/SDL_mirevents.h similarity index 100% rename from vs2015/sdl2/src/video/mir/SDL_mirevents.h rename to vs/sdl2/src/video/mir/SDL_mirevents.h diff --git a/vs2015/sdl2/src/video/mir/SDL_mirframebuffer.c b/vs/sdl2/src/video/mir/SDL_mirframebuffer.c similarity index 100% rename from vs2015/sdl2/src/video/mir/SDL_mirframebuffer.c rename to vs/sdl2/src/video/mir/SDL_mirframebuffer.c diff --git a/vs2015/sdl2/src/video/mir/SDL_mirframebuffer.h b/vs/sdl2/src/video/mir/SDL_mirframebuffer.h similarity index 100% rename from vs2015/sdl2/src/video/mir/SDL_mirframebuffer.h rename to vs/sdl2/src/video/mir/SDL_mirframebuffer.h diff --git a/vs2015/sdl2/src/video/mir/SDL_mirmouse.c b/vs/sdl2/src/video/mir/SDL_mirmouse.c similarity index 100% rename from vs2015/sdl2/src/video/mir/SDL_mirmouse.c rename to vs/sdl2/src/video/mir/SDL_mirmouse.c diff --git a/vs2015/sdl2/src/video/mir/SDL_mirmouse.h b/vs/sdl2/src/video/mir/SDL_mirmouse.h similarity index 100% rename from vs2015/sdl2/src/video/mir/SDL_mirmouse.h rename to vs/sdl2/src/video/mir/SDL_mirmouse.h diff --git a/vs2015/sdl2/src/video/mir/SDL_miropengl.c b/vs/sdl2/src/video/mir/SDL_miropengl.c similarity index 100% rename from vs2015/sdl2/src/video/mir/SDL_miropengl.c rename to vs/sdl2/src/video/mir/SDL_miropengl.c diff --git a/vs2015/sdl2/src/video/mir/SDL_miropengl.h b/vs/sdl2/src/video/mir/SDL_miropengl.h similarity index 100% rename from vs2015/sdl2/src/video/mir/SDL_miropengl.h rename to vs/sdl2/src/video/mir/SDL_miropengl.h diff --git a/vs2015/sdl2/src/video/mir/SDL_mirsym.h b/vs/sdl2/src/video/mir/SDL_mirsym.h similarity index 100% rename from vs2015/sdl2/src/video/mir/SDL_mirsym.h rename to vs/sdl2/src/video/mir/SDL_mirsym.h diff --git a/vs2015/sdl2/src/video/mir/SDL_mirvideo.c b/vs/sdl2/src/video/mir/SDL_mirvideo.c similarity index 100% rename from vs2015/sdl2/src/video/mir/SDL_mirvideo.c rename to vs/sdl2/src/video/mir/SDL_mirvideo.c diff --git a/vs2015/sdl2/src/video/mir/SDL_mirvideo.h b/vs/sdl2/src/video/mir/SDL_mirvideo.h similarity index 100% rename from vs2015/sdl2/src/video/mir/SDL_mirvideo.h rename to vs/sdl2/src/video/mir/SDL_mirvideo.h diff --git a/vs2015/sdl2/src/video/mir/SDL_mirvulkan.c b/vs/sdl2/src/video/mir/SDL_mirvulkan.c similarity index 100% rename from vs2015/sdl2/src/video/mir/SDL_mirvulkan.c rename to vs/sdl2/src/video/mir/SDL_mirvulkan.c diff --git a/vs2015/sdl2/src/video/mir/SDL_mirvulkan.h b/vs/sdl2/src/video/mir/SDL_mirvulkan.h similarity index 100% rename from vs2015/sdl2/src/video/mir/SDL_mirvulkan.h rename to vs/sdl2/src/video/mir/SDL_mirvulkan.h diff --git a/vs2015/sdl2/src/video/mir/SDL_mirwindow.c b/vs/sdl2/src/video/mir/SDL_mirwindow.c similarity index 100% rename from vs2015/sdl2/src/video/mir/SDL_mirwindow.c rename to vs/sdl2/src/video/mir/SDL_mirwindow.c diff --git a/vs2015/sdl2/src/video/mir/SDL_mirwindow.h b/vs/sdl2/src/video/mir/SDL_mirwindow.h similarity index 100% rename from vs2015/sdl2/src/video/mir/SDL_mirwindow.h rename to vs/sdl2/src/video/mir/SDL_mirwindow.h diff --git a/vs2015/sdl2/src/video/nacl/SDL_naclevents.c b/vs/sdl2/src/video/nacl/SDL_naclevents.c similarity index 100% rename from vs2015/sdl2/src/video/nacl/SDL_naclevents.c rename to vs/sdl2/src/video/nacl/SDL_naclevents.c diff --git a/vs2015/sdl2/src/video/nacl/SDL_naclevents_c.h b/vs/sdl2/src/video/nacl/SDL_naclevents_c.h similarity index 100% rename from vs2015/sdl2/src/video/nacl/SDL_naclevents_c.h rename to vs/sdl2/src/video/nacl/SDL_naclevents_c.h diff --git a/vs2015/sdl2/src/video/nacl/SDL_naclglue.c b/vs/sdl2/src/video/nacl/SDL_naclglue.c similarity index 100% rename from vs2015/sdl2/src/video/nacl/SDL_naclglue.c rename to vs/sdl2/src/video/nacl/SDL_naclglue.c diff --git a/vs2015/sdl2/src/video/nacl/SDL_naclopengles.c b/vs/sdl2/src/video/nacl/SDL_naclopengles.c similarity index 100% rename from vs2015/sdl2/src/video/nacl/SDL_naclopengles.c rename to vs/sdl2/src/video/nacl/SDL_naclopengles.c diff --git a/vs2015/sdl2/src/video/nacl/SDL_naclopengles.h b/vs/sdl2/src/video/nacl/SDL_naclopengles.h similarity index 100% rename from vs2015/sdl2/src/video/nacl/SDL_naclopengles.h rename to vs/sdl2/src/video/nacl/SDL_naclopengles.h diff --git a/vs2015/sdl2/src/video/nacl/SDL_naclvideo.c b/vs/sdl2/src/video/nacl/SDL_naclvideo.c similarity index 100% rename from vs2015/sdl2/src/video/nacl/SDL_naclvideo.c rename to vs/sdl2/src/video/nacl/SDL_naclvideo.c diff --git a/vs2015/sdl2/src/video/nacl/SDL_naclvideo.h b/vs/sdl2/src/video/nacl/SDL_naclvideo.h similarity index 100% rename from vs2015/sdl2/src/video/nacl/SDL_naclvideo.h rename to vs/sdl2/src/video/nacl/SDL_naclvideo.h diff --git a/vs2015/sdl2/src/video/nacl/SDL_naclwindow.c b/vs/sdl2/src/video/nacl/SDL_naclwindow.c similarity index 100% rename from vs2015/sdl2/src/video/nacl/SDL_naclwindow.c rename to vs/sdl2/src/video/nacl/SDL_naclwindow.c diff --git a/vs2015/sdl2/src/video/nacl/SDL_naclwindow.h b/vs/sdl2/src/video/nacl/SDL_naclwindow.h similarity index 100% rename from vs2015/sdl2/src/video/nacl/SDL_naclwindow.h rename to vs/sdl2/src/video/nacl/SDL_naclwindow.h diff --git a/vs2015/sdl2/src/video/pandora/SDL_pandora.c b/vs/sdl2/src/video/pandora/SDL_pandora.c similarity index 100% rename from vs2015/sdl2/src/video/pandora/SDL_pandora.c rename to vs/sdl2/src/video/pandora/SDL_pandora.c diff --git a/vs2015/sdl2/src/video/pandora/SDL_pandora.h b/vs/sdl2/src/video/pandora/SDL_pandora.h similarity index 100% rename from vs2015/sdl2/src/video/pandora/SDL_pandora.h rename to vs/sdl2/src/video/pandora/SDL_pandora.h diff --git a/vs2015/sdl2/src/video/pandora/SDL_pandora_events.c b/vs/sdl2/src/video/pandora/SDL_pandora_events.c similarity index 100% rename from vs2015/sdl2/src/video/pandora/SDL_pandora_events.c rename to vs/sdl2/src/video/pandora/SDL_pandora_events.c diff --git a/vs2015/sdl2/src/video/pandora/SDL_pandora_events.h b/vs/sdl2/src/video/pandora/SDL_pandora_events.h similarity index 100% rename from vs2015/sdl2/src/video/pandora/SDL_pandora_events.h rename to vs/sdl2/src/video/pandora/SDL_pandora_events.h diff --git a/vs2015/sdl2/src/video/psp/SDL_pspevents.c b/vs/sdl2/src/video/psp/SDL_pspevents.c similarity index 100% rename from vs2015/sdl2/src/video/psp/SDL_pspevents.c rename to vs/sdl2/src/video/psp/SDL_pspevents.c diff --git a/vs2015/sdl2/src/video/psp/SDL_pspevents_c.h b/vs/sdl2/src/video/psp/SDL_pspevents_c.h similarity index 100% rename from vs2015/sdl2/src/video/psp/SDL_pspevents_c.h rename to vs/sdl2/src/video/psp/SDL_pspevents_c.h diff --git a/vs2015/sdl2/src/video/psp/SDL_pspgl.c b/vs/sdl2/src/video/psp/SDL_pspgl.c similarity index 100% rename from vs2015/sdl2/src/video/psp/SDL_pspgl.c rename to vs/sdl2/src/video/psp/SDL_pspgl.c diff --git a/vs2015/sdl2/src/video/psp/SDL_pspgl_c.h b/vs/sdl2/src/video/psp/SDL_pspgl_c.h similarity index 100% rename from vs2015/sdl2/src/video/psp/SDL_pspgl_c.h rename to vs/sdl2/src/video/psp/SDL_pspgl_c.h diff --git a/vs2015/sdl2/src/video/psp/SDL_pspmouse.c b/vs/sdl2/src/video/psp/SDL_pspmouse.c similarity index 100% rename from vs2015/sdl2/src/video/psp/SDL_pspmouse.c rename to vs/sdl2/src/video/psp/SDL_pspmouse.c diff --git a/vs2015/sdl2/src/video/psp/SDL_pspmouse_c.h b/vs/sdl2/src/video/psp/SDL_pspmouse_c.h similarity index 100% rename from vs2015/sdl2/src/video/psp/SDL_pspmouse_c.h rename to vs/sdl2/src/video/psp/SDL_pspmouse_c.h diff --git a/vs2015/sdl2/src/video/psp/SDL_pspvideo.c b/vs/sdl2/src/video/psp/SDL_pspvideo.c similarity index 100% rename from vs2015/sdl2/src/video/psp/SDL_pspvideo.c rename to vs/sdl2/src/video/psp/SDL_pspvideo.c diff --git a/vs2015/sdl2/src/video/psp/SDL_pspvideo.h b/vs/sdl2/src/video/psp/SDL_pspvideo.h similarity index 100% rename from vs2015/sdl2/src/video/psp/SDL_pspvideo.h rename to vs/sdl2/src/video/psp/SDL_pspvideo.h diff --git a/vs2015/sdl2/src/video/qnx/gl.c b/vs/sdl2/src/video/qnx/gl.c similarity index 100% rename from vs2015/sdl2/src/video/qnx/gl.c rename to vs/sdl2/src/video/qnx/gl.c diff --git a/vs2015/sdl2/src/video/qnx/keyboard.c b/vs/sdl2/src/video/qnx/keyboard.c similarity index 100% rename from vs2015/sdl2/src/video/qnx/keyboard.c rename to vs/sdl2/src/video/qnx/keyboard.c diff --git a/vs2015/sdl2/src/video/qnx/sdl_qnx.h b/vs/sdl2/src/video/qnx/sdl_qnx.h similarity index 100% rename from vs2015/sdl2/src/video/qnx/sdl_qnx.h rename to vs/sdl2/src/video/qnx/sdl_qnx.h diff --git a/vs2015/sdl2/src/video/qnx/video.c b/vs/sdl2/src/video/qnx/video.c similarity index 100% rename from vs2015/sdl2/src/video/qnx/video.c rename to vs/sdl2/src/video/qnx/video.c diff --git a/vs2015/sdl2/src/video/raspberry/SDL_rpievents.c b/vs/sdl2/src/video/raspberry/SDL_rpievents.c similarity index 100% rename from vs2015/sdl2/src/video/raspberry/SDL_rpievents.c rename to vs/sdl2/src/video/raspberry/SDL_rpievents.c diff --git a/vs2015/sdl2/src/video/raspberry/SDL_rpievents_c.h b/vs/sdl2/src/video/raspberry/SDL_rpievents_c.h similarity index 100% rename from vs2015/sdl2/src/video/raspberry/SDL_rpievents_c.h rename to vs/sdl2/src/video/raspberry/SDL_rpievents_c.h diff --git a/vs2015/sdl2/src/video/raspberry/SDL_rpimouse.c b/vs/sdl2/src/video/raspberry/SDL_rpimouse.c similarity index 100% rename from vs2015/sdl2/src/video/raspberry/SDL_rpimouse.c rename to vs/sdl2/src/video/raspberry/SDL_rpimouse.c diff --git a/vs2015/sdl2/src/video/raspberry/SDL_rpimouse.h b/vs/sdl2/src/video/raspberry/SDL_rpimouse.h similarity index 100% rename from vs2015/sdl2/src/video/raspberry/SDL_rpimouse.h rename to vs/sdl2/src/video/raspberry/SDL_rpimouse.h diff --git a/vs2015/sdl2/src/video/raspberry/SDL_rpiopengles.c b/vs/sdl2/src/video/raspberry/SDL_rpiopengles.c similarity index 100% rename from vs2015/sdl2/src/video/raspberry/SDL_rpiopengles.c rename to vs/sdl2/src/video/raspberry/SDL_rpiopengles.c diff --git a/vs2015/sdl2/src/video/raspberry/SDL_rpiopengles.h b/vs/sdl2/src/video/raspberry/SDL_rpiopengles.h similarity index 100% rename from vs2015/sdl2/src/video/raspberry/SDL_rpiopengles.h rename to vs/sdl2/src/video/raspberry/SDL_rpiopengles.h diff --git a/vs2015/sdl2/src/video/raspberry/SDL_rpivideo.c b/vs/sdl2/src/video/raspberry/SDL_rpivideo.c similarity index 100% rename from vs2015/sdl2/src/video/raspberry/SDL_rpivideo.c rename to vs/sdl2/src/video/raspberry/SDL_rpivideo.c diff --git a/vs2015/sdl2/src/video/raspberry/SDL_rpivideo.h b/vs/sdl2/src/video/raspberry/SDL_rpivideo.h similarity index 100% rename from vs2015/sdl2/src/video/raspberry/SDL_rpivideo.h rename to vs/sdl2/src/video/raspberry/SDL_rpivideo.h diff --git a/vs2015/sdl2/src/video/sdlgenblit.pl b/vs/sdl2/src/video/sdlgenblit.pl similarity index 100% rename from vs2015/sdl2/src/video/sdlgenblit.pl rename to vs/sdl2/src/video/sdlgenblit.pl diff --git a/vs2015/sdl2/src/video/uikit/SDL_uikitappdelegate.h b/vs/sdl2/src/video/uikit/SDL_uikitappdelegate.h similarity index 100% rename from vs2015/sdl2/src/video/uikit/SDL_uikitappdelegate.h rename to vs/sdl2/src/video/uikit/SDL_uikitappdelegate.h diff --git a/vs2015/sdl2/src/video/uikit/SDL_uikitappdelegate.m b/vs/sdl2/src/video/uikit/SDL_uikitappdelegate.m similarity index 100% rename from vs2015/sdl2/src/video/uikit/SDL_uikitappdelegate.m rename to vs/sdl2/src/video/uikit/SDL_uikitappdelegate.m diff --git a/vs2015/sdl2/src/video/uikit/SDL_uikitclipboard.h b/vs/sdl2/src/video/uikit/SDL_uikitclipboard.h similarity index 100% rename from vs2015/sdl2/src/video/uikit/SDL_uikitclipboard.h rename to vs/sdl2/src/video/uikit/SDL_uikitclipboard.h diff --git a/vs2015/sdl2/src/video/uikit/SDL_uikitclipboard.m b/vs/sdl2/src/video/uikit/SDL_uikitclipboard.m similarity index 100% rename from vs2015/sdl2/src/video/uikit/SDL_uikitclipboard.m rename to vs/sdl2/src/video/uikit/SDL_uikitclipboard.m diff --git a/vs2015/sdl2/src/video/uikit/SDL_uikitevents.h b/vs/sdl2/src/video/uikit/SDL_uikitevents.h similarity index 100% rename from vs2015/sdl2/src/video/uikit/SDL_uikitevents.h rename to vs/sdl2/src/video/uikit/SDL_uikitevents.h diff --git a/vs2015/sdl2/src/video/uikit/SDL_uikitevents.m b/vs/sdl2/src/video/uikit/SDL_uikitevents.m similarity index 100% rename from vs2015/sdl2/src/video/uikit/SDL_uikitevents.m rename to vs/sdl2/src/video/uikit/SDL_uikitevents.m diff --git a/vs2015/sdl2/src/video/uikit/SDL_uikitmessagebox.h b/vs/sdl2/src/video/uikit/SDL_uikitmessagebox.h similarity index 100% rename from vs2015/sdl2/src/video/uikit/SDL_uikitmessagebox.h rename to vs/sdl2/src/video/uikit/SDL_uikitmessagebox.h diff --git a/vs2015/sdl2/src/video/uikit/SDL_uikitmessagebox.m b/vs/sdl2/src/video/uikit/SDL_uikitmessagebox.m similarity index 100% rename from vs2015/sdl2/src/video/uikit/SDL_uikitmessagebox.m rename to vs/sdl2/src/video/uikit/SDL_uikitmessagebox.m diff --git a/vs2015/sdl2/src/video/uikit/SDL_uikitmetalview.h b/vs/sdl2/src/video/uikit/SDL_uikitmetalview.h similarity index 100% rename from vs2015/sdl2/src/video/uikit/SDL_uikitmetalview.h rename to vs/sdl2/src/video/uikit/SDL_uikitmetalview.h diff --git a/vs2015/sdl2/src/video/uikit/SDL_uikitmetalview.m b/vs/sdl2/src/video/uikit/SDL_uikitmetalview.m similarity index 100% rename from vs2015/sdl2/src/video/uikit/SDL_uikitmetalview.m rename to vs/sdl2/src/video/uikit/SDL_uikitmetalview.m diff --git a/vs2015/sdl2/src/video/uikit/SDL_uikitmodes.h b/vs/sdl2/src/video/uikit/SDL_uikitmodes.h similarity index 100% rename from vs2015/sdl2/src/video/uikit/SDL_uikitmodes.h rename to vs/sdl2/src/video/uikit/SDL_uikitmodes.h diff --git a/vs2015/sdl2/src/video/uikit/SDL_uikitmodes.m b/vs/sdl2/src/video/uikit/SDL_uikitmodes.m similarity index 100% rename from vs2015/sdl2/src/video/uikit/SDL_uikitmodes.m rename to vs/sdl2/src/video/uikit/SDL_uikitmodes.m diff --git a/vs2015/sdl2/src/video/uikit/SDL_uikitopengles.h b/vs/sdl2/src/video/uikit/SDL_uikitopengles.h similarity index 100% rename from vs2015/sdl2/src/video/uikit/SDL_uikitopengles.h rename to vs/sdl2/src/video/uikit/SDL_uikitopengles.h diff --git a/vs2015/sdl2/src/video/uikit/SDL_uikitopengles.m b/vs/sdl2/src/video/uikit/SDL_uikitopengles.m similarity index 100% rename from vs2015/sdl2/src/video/uikit/SDL_uikitopengles.m rename to vs/sdl2/src/video/uikit/SDL_uikitopengles.m diff --git a/vs2015/sdl2/src/video/uikit/SDL_uikitopenglview.h b/vs/sdl2/src/video/uikit/SDL_uikitopenglview.h similarity index 100% rename from vs2015/sdl2/src/video/uikit/SDL_uikitopenglview.h rename to vs/sdl2/src/video/uikit/SDL_uikitopenglview.h diff --git a/vs2015/sdl2/src/video/uikit/SDL_uikitopenglview.m b/vs/sdl2/src/video/uikit/SDL_uikitopenglview.m similarity index 100% rename from vs2015/sdl2/src/video/uikit/SDL_uikitopenglview.m rename to vs/sdl2/src/video/uikit/SDL_uikitopenglview.m diff --git a/vs2015/sdl2/src/video/uikit/SDL_uikitvideo.h b/vs/sdl2/src/video/uikit/SDL_uikitvideo.h similarity index 100% rename from vs2015/sdl2/src/video/uikit/SDL_uikitvideo.h rename to vs/sdl2/src/video/uikit/SDL_uikitvideo.h diff --git a/vs2015/sdl2/src/video/uikit/SDL_uikitvideo.m b/vs/sdl2/src/video/uikit/SDL_uikitvideo.m similarity index 100% rename from vs2015/sdl2/src/video/uikit/SDL_uikitvideo.m rename to vs/sdl2/src/video/uikit/SDL_uikitvideo.m diff --git a/vs2015/sdl2/src/video/uikit/SDL_uikitview.h b/vs/sdl2/src/video/uikit/SDL_uikitview.h similarity index 100% rename from vs2015/sdl2/src/video/uikit/SDL_uikitview.h rename to vs/sdl2/src/video/uikit/SDL_uikitview.h diff --git a/vs2015/sdl2/src/video/uikit/SDL_uikitview.m b/vs/sdl2/src/video/uikit/SDL_uikitview.m similarity index 100% rename from vs2015/sdl2/src/video/uikit/SDL_uikitview.m rename to vs/sdl2/src/video/uikit/SDL_uikitview.m diff --git a/vs2015/sdl2/src/video/uikit/SDL_uikitviewcontroller.h b/vs/sdl2/src/video/uikit/SDL_uikitviewcontroller.h similarity index 100% rename from vs2015/sdl2/src/video/uikit/SDL_uikitviewcontroller.h rename to vs/sdl2/src/video/uikit/SDL_uikitviewcontroller.h diff --git a/vs2015/sdl2/src/video/uikit/SDL_uikitviewcontroller.m b/vs/sdl2/src/video/uikit/SDL_uikitviewcontroller.m similarity index 100% rename from vs2015/sdl2/src/video/uikit/SDL_uikitviewcontroller.m rename to vs/sdl2/src/video/uikit/SDL_uikitviewcontroller.m diff --git a/vs2015/sdl2/src/video/uikit/SDL_uikitvulkan.h b/vs/sdl2/src/video/uikit/SDL_uikitvulkan.h similarity index 100% rename from vs2015/sdl2/src/video/uikit/SDL_uikitvulkan.h rename to vs/sdl2/src/video/uikit/SDL_uikitvulkan.h diff --git a/vs2015/sdl2/src/video/uikit/SDL_uikitvulkan.m b/vs/sdl2/src/video/uikit/SDL_uikitvulkan.m similarity index 100% rename from vs2015/sdl2/src/video/uikit/SDL_uikitvulkan.m rename to vs/sdl2/src/video/uikit/SDL_uikitvulkan.m diff --git a/vs2015/sdl2/src/video/uikit/SDL_uikitwindow.h b/vs/sdl2/src/video/uikit/SDL_uikitwindow.h similarity index 100% rename from vs2015/sdl2/src/video/uikit/SDL_uikitwindow.h rename to vs/sdl2/src/video/uikit/SDL_uikitwindow.h diff --git a/vs2015/sdl2/src/video/uikit/SDL_uikitwindow.m b/vs/sdl2/src/video/uikit/SDL_uikitwindow.m similarity index 100% rename from vs2015/sdl2/src/video/uikit/SDL_uikitwindow.m rename to vs/sdl2/src/video/uikit/SDL_uikitwindow.m diff --git a/vs2015/sdl2/src/video/uikit/keyinfotable.h b/vs/sdl2/src/video/uikit/keyinfotable.h similarity index 100% rename from vs2015/sdl2/src/video/uikit/keyinfotable.h rename to vs/sdl2/src/video/uikit/keyinfotable.h diff --git a/vs2015/sdl2/src/video/vivante/SDL_vivanteopengles.c b/vs/sdl2/src/video/vivante/SDL_vivanteopengles.c similarity index 100% rename from vs2015/sdl2/src/video/vivante/SDL_vivanteopengles.c rename to vs/sdl2/src/video/vivante/SDL_vivanteopengles.c diff --git a/vs2015/sdl2/src/video/vivante/SDL_vivanteopengles.h b/vs/sdl2/src/video/vivante/SDL_vivanteopengles.h similarity index 100% rename from vs2015/sdl2/src/video/vivante/SDL_vivanteopengles.h rename to vs/sdl2/src/video/vivante/SDL_vivanteopengles.h diff --git a/vs2015/sdl2/src/video/vivante/SDL_vivanteplatform.c b/vs/sdl2/src/video/vivante/SDL_vivanteplatform.c similarity index 100% rename from vs2015/sdl2/src/video/vivante/SDL_vivanteplatform.c rename to vs/sdl2/src/video/vivante/SDL_vivanteplatform.c diff --git a/vs2015/sdl2/src/video/vivante/SDL_vivanteplatform.h b/vs/sdl2/src/video/vivante/SDL_vivanteplatform.h similarity index 100% rename from vs2015/sdl2/src/video/vivante/SDL_vivanteplatform.h rename to vs/sdl2/src/video/vivante/SDL_vivanteplatform.h diff --git a/vs2015/sdl2/src/video/vivante/SDL_vivantevideo.c b/vs/sdl2/src/video/vivante/SDL_vivantevideo.c similarity index 100% rename from vs2015/sdl2/src/video/vivante/SDL_vivantevideo.c rename to vs/sdl2/src/video/vivante/SDL_vivantevideo.c diff --git a/vs2015/sdl2/src/video/vivante/SDL_vivantevideo.h b/vs/sdl2/src/video/vivante/SDL_vivantevideo.h similarity index 100% rename from vs2015/sdl2/src/video/vivante/SDL_vivantevideo.h rename to vs/sdl2/src/video/vivante/SDL_vivantevideo.h diff --git a/vs2015/sdl2/src/video/wayland/SDL_waylandclipboard.c b/vs/sdl2/src/video/wayland/SDL_waylandclipboard.c similarity index 100% rename from vs2015/sdl2/src/video/wayland/SDL_waylandclipboard.c rename to vs/sdl2/src/video/wayland/SDL_waylandclipboard.c diff --git a/vs2015/sdl2/src/video/wayland/SDL_waylandclipboard.h b/vs/sdl2/src/video/wayland/SDL_waylandclipboard.h similarity index 100% rename from vs2015/sdl2/src/video/wayland/SDL_waylandclipboard.h rename to vs/sdl2/src/video/wayland/SDL_waylandclipboard.h diff --git a/vs2015/sdl2/src/video/wayland/SDL_waylanddatamanager.c b/vs/sdl2/src/video/wayland/SDL_waylanddatamanager.c similarity index 100% rename from vs2015/sdl2/src/video/wayland/SDL_waylanddatamanager.c rename to vs/sdl2/src/video/wayland/SDL_waylanddatamanager.c diff --git a/vs2015/sdl2/src/video/wayland/SDL_waylanddatamanager.h b/vs/sdl2/src/video/wayland/SDL_waylanddatamanager.h similarity index 100% rename from vs2015/sdl2/src/video/wayland/SDL_waylanddatamanager.h rename to vs/sdl2/src/video/wayland/SDL_waylanddatamanager.h diff --git a/vs2015/sdl2/src/video/wayland/SDL_waylanddyn.c b/vs/sdl2/src/video/wayland/SDL_waylanddyn.c similarity index 100% rename from vs2015/sdl2/src/video/wayland/SDL_waylanddyn.c rename to vs/sdl2/src/video/wayland/SDL_waylanddyn.c diff --git a/vs2015/sdl2/src/video/wayland/SDL_waylanddyn.h b/vs/sdl2/src/video/wayland/SDL_waylanddyn.h similarity index 100% rename from vs2015/sdl2/src/video/wayland/SDL_waylanddyn.h rename to vs/sdl2/src/video/wayland/SDL_waylanddyn.h diff --git a/vs2015/sdl2/src/video/wayland/SDL_waylandevents.c b/vs/sdl2/src/video/wayland/SDL_waylandevents.c similarity index 100% rename from vs2015/sdl2/src/video/wayland/SDL_waylandevents.c rename to vs/sdl2/src/video/wayland/SDL_waylandevents.c diff --git a/vs2015/sdl2/src/video/wayland/SDL_waylandevents_c.h b/vs/sdl2/src/video/wayland/SDL_waylandevents_c.h similarity index 100% rename from vs2015/sdl2/src/video/wayland/SDL_waylandevents_c.h rename to vs/sdl2/src/video/wayland/SDL_waylandevents_c.h diff --git a/vs2015/sdl2/src/video/wayland/SDL_waylandmouse.c b/vs/sdl2/src/video/wayland/SDL_waylandmouse.c similarity index 100% rename from vs2015/sdl2/src/video/wayland/SDL_waylandmouse.c rename to vs/sdl2/src/video/wayland/SDL_waylandmouse.c diff --git a/vs2015/sdl2/src/video/wayland/SDL_waylandmouse.h b/vs/sdl2/src/video/wayland/SDL_waylandmouse.h similarity index 100% rename from vs2015/sdl2/src/video/wayland/SDL_waylandmouse.h rename to vs/sdl2/src/video/wayland/SDL_waylandmouse.h diff --git a/vs2015/sdl2/src/video/wayland/SDL_waylandopengles.c b/vs/sdl2/src/video/wayland/SDL_waylandopengles.c similarity index 100% rename from vs2015/sdl2/src/video/wayland/SDL_waylandopengles.c rename to vs/sdl2/src/video/wayland/SDL_waylandopengles.c diff --git a/vs2015/sdl2/src/video/wayland/SDL_waylandopengles.h b/vs/sdl2/src/video/wayland/SDL_waylandopengles.h similarity index 100% rename from vs2015/sdl2/src/video/wayland/SDL_waylandopengles.h rename to vs/sdl2/src/video/wayland/SDL_waylandopengles.h diff --git a/vs2015/sdl2/src/video/wayland/SDL_waylandsym.h b/vs/sdl2/src/video/wayland/SDL_waylandsym.h similarity index 100% rename from vs2015/sdl2/src/video/wayland/SDL_waylandsym.h rename to vs/sdl2/src/video/wayland/SDL_waylandsym.h diff --git a/vs2015/sdl2/src/video/wayland/SDL_waylandtouch.c b/vs/sdl2/src/video/wayland/SDL_waylandtouch.c similarity index 100% rename from vs2015/sdl2/src/video/wayland/SDL_waylandtouch.c rename to vs/sdl2/src/video/wayland/SDL_waylandtouch.c diff --git a/vs2015/sdl2/src/video/wayland/SDL_waylandtouch.h b/vs/sdl2/src/video/wayland/SDL_waylandtouch.h similarity index 100% rename from vs2015/sdl2/src/video/wayland/SDL_waylandtouch.h rename to vs/sdl2/src/video/wayland/SDL_waylandtouch.h diff --git a/vs2015/sdl2/src/video/wayland/SDL_waylandvideo.c b/vs/sdl2/src/video/wayland/SDL_waylandvideo.c similarity index 100% rename from vs2015/sdl2/src/video/wayland/SDL_waylandvideo.c rename to vs/sdl2/src/video/wayland/SDL_waylandvideo.c diff --git a/vs2015/sdl2/src/video/wayland/SDL_waylandvideo.h b/vs/sdl2/src/video/wayland/SDL_waylandvideo.h similarity index 100% rename from vs2015/sdl2/src/video/wayland/SDL_waylandvideo.h rename to vs/sdl2/src/video/wayland/SDL_waylandvideo.h diff --git a/vs2015/sdl2/src/video/wayland/SDL_waylandvulkan.c b/vs/sdl2/src/video/wayland/SDL_waylandvulkan.c similarity index 100% rename from vs2015/sdl2/src/video/wayland/SDL_waylandvulkan.c rename to vs/sdl2/src/video/wayland/SDL_waylandvulkan.c diff --git a/vs2015/sdl2/src/video/wayland/SDL_waylandvulkan.h b/vs/sdl2/src/video/wayland/SDL_waylandvulkan.h similarity index 100% rename from vs2015/sdl2/src/video/wayland/SDL_waylandvulkan.h rename to vs/sdl2/src/video/wayland/SDL_waylandvulkan.h diff --git a/vs2015/sdl2/src/video/wayland/SDL_waylandwindow.c b/vs/sdl2/src/video/wayland/SDL_waylandwindow.c similarity index 100% rename from vs2015/sdl2/src/video/wayland/SDL_waylandwindow.c rename to vs/sdl2/src/video/wayland/SDL_waylandwindow.c diff --git a/vs2015/sdl2/src/video/wayland/SDL_waylandwindow.h b/vs/sdl2/src/video/wayland/SDL_waylandwindow.h similarity index 100% rename from vs2015/sdl2/src/video/wayland/SDL_waylandwindow.h rename to vs/sdl2/src/video/wayland/SDL_waylandwindow.h diff --git a/vs2015/sdl2/src/video/windows/SDL_msctf.h b/vs/sdl2/src/video/windows/SDL_msctf.h similarity index 100% rename from vs2015/sdl2/src/video/windows/SDL_msctf.h rename to vs/sdl2/src/video/windows/SDL_msctf.h diff --git a/vs2015/sdl2/src/video/windows/SDL_vkeys.h b/vs/sdl2/src/video/windows/SDL_vkeys.h similarity index 100% rename from vs2015/sdl2/src/video/windows/SDL_vkeys.h rename to vs/sdl2/src/video/windows/SDL_vkeys.h diff --git a/vs2015/sdl2/src/video/windows/SDL_windowsclipboard.c b/vs/sdl2/src/video/windows/SDL_windowsclipboard.c similarity index 100% rename from vs2015/sdl2/src/video/windows/SDL_windowsclipboard.c rename to vs/sdl2/src/video/windows/SDL_windowsclipboard.c diff --git a/vs2015/sdl2/src/video/windows/SDL_windowsclipboard.h b/vs/sdl2/src/video/windows/SDL_windowsclipboard.h similarity index 100% rename from vs2015/sdl2/src/video/windows/SDL_windowsclipboard.h rename to vs/sdl2/src/video/windows/SDL_windowsclipboard.h diff --git a/vs2015/sdl2/src/video/windows/SDL_windowsevents.c b/vs/sdl2/src/video/windows/SDL_windowsevents.c similarity index 100% rename from vs2015/sdl2/src/video/windows/SDL_windowsevents.c rename to vs/sdl2/src/video/windows/SDL_windowsevents.c diff --git a/vs2015/sdl2/src/video/windows/SDL_windowsevents.h b/vs/sdl2/src/video/windows/SDL_windowsevents.h similarity index 100% rename from vs2015/sdl2/src/video/windows/SDL_windowsevents.h rename to vs/sdl2/src/video/windows/SDL_windowsevents.h diff --git a/vs2015/sdl2/src/video/windows/SDL_windowsframebuffer.c b/vs/sdl2/src/video/windows/SDL_windowsframebuffer.c similarity index 100% rename from vs2015/sdl2/src/video/windows/SDL_windowsframebuffer.c rename to vs/sdl2/src/video/windows/SDL_windowsframebuffer.c diff --git a/vs2015/sdl2/src/video/windows/SDL_windowsframebuffer.h b/vs/sdl2/src/video/windows/SDL_windowsframebuffer.h similarity index 100% rename from vs2015/sdl2/src/video/windows/SDL_windowsframebuffer.h rename to vs/sdl2/src/video/windows/SDL_windowsframebuffer.h diff --git a/vs2015/sdl2/src/video/windows/SDL_windowskeyboard.c b/vs/sdl2/src/video/windows/SDL_windowskeyboard.c similarity index 100% rename from vs2015/sdl2/src/video/windows/SDL_windowskeyboard.c rename to vs/sdl2/src/video/windows/SDL_windowskeyboard.c diff --git a/vs2015/sdl2/src/video/windows/SDL_windowskeyboard.h b/vs/sdl2/src/video/windows/SDL_windowskeyboard.h similarity index 100% rename from vs2015/sdl2/src/video/windows/SDL_windowskeyboard.h rename to vs/sdl2/src/video/windows/SDL_windowskeyboard.h diff --git a/vs2015/sdl2/src/video/windows/SDL_windowsmessagebox.c b/vs/sdl2/src/video/windows/SDL_windowsmessagebox.c similarity index 100% rename from vs2015/sdl2/src/video/windows/SDL_windowsmessagebox.c rename to vs/sdl2/src/video/windows/SDL_windowsmessagebox.c diff --git a/vs2015/sdl2/src/video/windows/SDL_windowsmessagebox.h b/vs/sdl2/src/video/windows/SDL_windowsmessagebox.h similarity index 100% rename from vs2015/sdl2/src/video/windows/SDL_windowsmessagebox.h rename to vs/sdl2/src/video/windows/SDL_windowsmessagebox.h diff --git a/vs2015/sdl2/src/video/windows/SDL_windowsmodes.c b/vs/sdl2/src/video/windows/SDL_windowsmodes.c similarity index 100% rename from vs2015/sdl2/src/video/windows/SDL_windowsmodes.c rename to vs/sdl2/src/video/windows/SDL_windowsmodes.c diff --git a/vs2015/sdl2/src/video/windows/SDL_windowsmodes.h b/vs/sdl2/src/video/windows/SDL_windowsmodes.h similarity index 100% rename from vs2015/sdl2/src/video/windows/SDL_windowsmodes.h rename to vs/sdl2/src/video/windows/SDL_windowsmodes.h diff --git a/vs2015/sdl2/src/video/windows/SDL_windowsmouse.c b/vs/sdl2/src/video/windows/SDL_windowsmouse.c similarity index 100% rename from vs2015/sdl2/src/video/windows/SDL_windowsmouse.c rename to vs/sdl2/src/video/windows/SDL_windowsmouse.c diff --git a/vs2015/sdl2/src/video/windows/SDL_windowsmouse.h b/vs/sdl2/src/video/windows/SDL_windowsmouse.h similarity index 100% rename from vs2015/sdl2/src/video/windows/SDL_windowsmouse.h rename to vs/sdl2/src/video/windows/SDL_windowsmouse.h diff --git a/vs2015/sdl2/src/video/windows/SDL_windowsopengl.c b/vs/sdl2/src/video/windows/SDL_windowsopengl.c similarity index 100% rename from vs2015/sdl2/src/video/windows/SDL_windowsopengl.c rename to vs/sdl2/src/video/windows/SDL_windowsopengl.c diff --git a/vs2015/sdl2/src/video/windows/SDL_windowsopengl.h b/vs/sdl2/src/video/windows/SDL_windowsopengl.h similarity index 100% rename from vs2015/sdl2/src/video/windows/SDL_windowsopengl.h rename to vs/sdl2/src/video/windows/SDL_windowsopengl.h diff --git a/vs2015/sdl2/src/video/windows/SDL_windowsopengles.c b/vs/sdl2/src/video/windows/SDL_windowsopengles.c similarity index 100% rename from vs2015/sdl2/src/video/windows/SDL_windowsopengles.c rename to vs/sdl2/src/video/windows/SDL_windowsopengles.c diff --git a/vs2015/sdl2/src/video/windows/SDL_windowsopengles.h b/vs/sdl2/src/video/windows/SDL_windowsopengles.h similarity index 100% rename from vs2015/sdl2/src/video/windows/SDL_windowsopengles.h rename to vs/sdl2/src/video/windows/SDL_windowsopengles.h diff --git a/vs2015/sdl2/src/video/windows/SDL_windowsshape.c b/vs/sdl2/src/video/windows/SDL_windowsshape.c similarity index 100% rename from vs2015/sdl2/src/video/windows/SDL_windowsshape.c rename to vs/sdl2/src/video/windows/SDL_windowsshape.c diff --git a/vs2015/sdl2/src/video/windows/SDL_windowsshape.h b/vs/sdl2/src/video/windows/SDL_windowsshape.h similarity index 100% rename from vs2015/sdl2/src/video/windows/SDL_windowsshape.h rename to vs/sdl2/src/video/windows/SDL_windowsshape.h diff --git a/vs2015/sdl2/src/video/windows/SDL_windowstaskdialog.h b/vs/sdl2/src/video/windows/SDL_windowstaskdialog.h similarity index 100% rename from vs2015/sdl2/src/video/windows/SDL_windowstaskdialog.h rename to vs/sdl2/src/video/windows/SDL_windowstaskdialog.h diff --git a/vs2015/sdl2/src/video/windows/SDL_windowsvideo.c b/vs/sdl2/src/video/windows/SDL_windowsvideo.c similarity index 100% rename from vs2015/sdl2/src/video/windows/SDL_windowsvideo.c rename to vs/sdl2/src/video/windows/SDL_windowsvideo.c diff --git a/vs2015/sdl2/src/video/windows/SDL_windowsvideo.h b/vs/sdl2/src/video/windows/SDL_windowsvideo.h similarity index 100% rename from vs2015/sdl2/src/video/windows/SDL_windowsvideo.h rename to vs/sdl2/src/video/windows/SDL_windowsvideo.h diff --git a/vs2015/sdl2/src/video/windows/SDL_windowsvulkan.c b/vs/sdl2/src/video/windows/SDL_windowsvulkan.c similarity index 100% rename from vs2015/sdl2/src/video/windows/SDL_windowsvulkan.c rename to vs/sdl2/src/video/windows/SDL_windowsvulkan.c diff --git a/vs2015/sdl2/src/video/windows/SDL_windowsvulkan.h b/vs/sdl2/src/video/windows/SDL_windowsvulkan.h similarity index 100% rename from vs2015/sdl2/src/video/windows/SDL_windowsvulkan.h rename to vs/sdl2/src/video/windows/SDL_windowsvulkan.h diff --git a/vs2015/sdl2/src/video/windows/SDL_windowswindow.c b/vs/sdl2/src/video/windows/SDL_windowswindow.c similarity index 100% rename from vs2015/sdl2/src/video/windows/SDL_windowswindow.c rename to vs/sdl2/src/video/windows/SDL_windowswindow.c diff --git a/vs2015/sdl2/src/video/windows/SDL_windowswindow.h b/vs/sdl2/src/video/windows/SDL_windowswindow.h similarity index 100% rename from vs2015/sdl2/src/video/windows/SDL_windowswindow.h rename to vs/sdl2/src/video/windows/SDL_windowswindow.h diff --git a/vs2015/sdl2/src/video/windows/wmmsg.h b/vs/sdl2/src/video/windows/wmmsg.h similarity index 100% rename from vs2015/sdl2/src/video/windows/wmmsg.h rename to vs/sdl2/src/video/windows/wmmsg.h diff --git a/vs2015/sdl2/src/video/winrt/SDL_winrtevents.cpp b/vs/sdl2/src/video/winrt/SDL_winrtevents.cpp similarity index 100% rename from vs2015/sdl2/src/video/winrt/SDL_winrtevents.cpp rename to vs/sdl2/src/video/winrt/SDL_winrtevents.cpp diff --git a/vs2015/sdl2/src/video/winrt/SDL_winrtevents_c.h b/vs/sdl2/src/video/winrt/SDL_winrtevents_c.h similarity index 100% rename from vs2015/sdl2/src/video/winrt/SDL_winrtevents_c.h rename to vs/sdl2/src/video/winrt/SDL_winrtevents_c.h diff --git a/vs2015/sdl2/src/video/winrt/SDL_winrtgamebar.cpp b/vs/sdl2/src/video/winrt/SDL_winrtgamebar.cpp similarity index 100% rename from vs2015/sdl2/src/video/winrt/SDL_winrtgamebar.cpp rename to vs/sdl2/src/video/winrt/SDL_winrtgamebar.cpp diff --git a/vs2015/sdl2/src/video/winrt/SDL_winrtgamebar_cpp.h b/vs/sdl2/src/video/winrt/SDL_winrtgamebar_cpp.h similarity index 100% rename from vs2015/sdl2/src/video/winrt/SDL_winrtgamebar_cpp.h rename to vs/sdl2/src/video/winrt/SDL_winrtgamebar_cpp.h diff --git a/vs2015/sdl2/src/video/winrt/SDL_winrtkeyboard.cpp b/vs/sdl2/src/video/winrt/SDL_winrtkeyboard.cpp similarity index 100% rename from vs2015/sdl2/src/video/winrt/SDL_winrtkeyboard.cpp rename to vs/sdl2/src/video/winrt/SDL_winrtkeyboard.cpp diff --git a/vs2015/sdl2/src/video/winrt/SDL_winrtmessagebox.cpp b/vs/sdl2/src/video/winrt/SDL_winrtmessagebox.cpp similarity index 100% rename from vs2015/sdl2/src/video/winrt/SDL_winrtmessagebox.cpp rename to vs/sdl2/src/video/winrt/SDL_winrtmessagebox.cpp diff --git a/vs2015/sdl2/src/video/winrt/SDL_winrtmessagebox.h b/vs/sdl2/src/video/winrt/SDL_winrtmessagebox.h similarity index 100% rename from vs2015/sdl2/src/video/winrt/SDL_winrtmessagebox.h rename to vs/sdl2/src/video/winrt/SDL_winrtmessagebox.h diff --git a/vs2015/sdl2/src/video/winrt/SDL_winrtmouse.cpp b/vs/sdl2/src/video/winrt/SDL_winrtmouse.cpp similarity index 100% rename from vs2015/sdl2/src/video/winrt/SDL_winrtmouse.cpp rename to vs/sdl2/src/video/winrt/SDL_winrtmouse.cpp diff --git a/vs2015/sdl2/src/video/winrt/SDL_winrtmouse_c.h b/vs/sdl2/src/video/winrt/SDL_winrtmouse_c.h similarity index 100% rename from vs2015/sdl2/src/video/winrt/SDL_winrtmouse_c.h rename to vs/sdl2/src/video/winrt/SDL_winrtmouse_c.h diff --git a/vs2015/sdl2/src/video/winrt/SDL_winrtopengles.cpp b/vs/sdl2/src/video/winrt/SDL_winrtopengles.cpp similarity index 100% rename from vs2015/sdl2/src/video/winrt/SDL_winrtopengles.cpp rename to vs/sdl2/src/video/winrt/SDL_winrtopengles.cpp diff --git a/vs2015/sdl2/src/video/winrt/SDL_winrtopengles.h b/vs/sdl2/src/video/winrt/SDL_winrtopengles.h similarity index 100% rename from vs2015/sdl2/src/video/winrt/SDL_winrtopengles.h rename to vs/sdl2/src/video/winrt/SDL_winrtopengles.h diff --git a/vs2015/sdl2/src/video/winrt/SDL_winrtpointerinput.cpp b/vs/sdl2/src/video/winrt/SDL_winrtpointerinput.cpp similarity index 100% rename from vs2015/sdl2/src/video/winrt/SDL_winrtpointerinput.cpp rename to vs/sdl2/src/video/winrt/SDL_winrtpointerinput.cpp diff --git a/vs2015/sdl2/src/video/winrt/SDL_winrtvideo.cpp b/vs/sdl2/src/video/winrt/SDL_winrtvideo.cpp similarity index 100% rename from vs2015/sdl2/src/video/winrt/SDL_winrtvideo.cpp rename to vs/sdl2/src/video/winrt/SDL_winrtvideo.cpp diff --git a/vs2015/sdl2/src/video/winrt/SDL_winrtvideo_cpp.h b/vs/sdl2/src/video/winrt/SDL_winrtvideo_cpp.h similarity index 100% rename from vs2015/sdl2/src/video/winrt/SDL_winrtvideo_cpp.h rename to vs/sdl2/src/video/winrt/SDL_winrtvideo_cpp.h diff --git a/vs2015/sdl2/src/video/x11/SDL_x11clipboard.c b/vs/sdl2/src/video/x11/SDL_x11clipboard.c similarity index 100% rename from vs2015/sdl2/src/video/x11/SDL_x11clipboard.c rename to vs/sdl2/src/video/x11/SDL_x11clipboard.c diff --git a/vs2015/sdl2/src/video/x11/SDL_x11clipboard.h b/vs/sdl2/src/video/x11/SDL_x11clipboard.h similarity index 100% rename from vs2015/sdl2/src/video/x11/SDL_x11clipboard.h rename to vs/sdl2/src/video/x11/SDL_x11clipboard.h diff --git a/vs2015/sdl2/src/video/x11/SDL_x11dyn.c b/vs/sdl2/src/video/x11/SDL_x11dyn.c similarity index 100% rename from vs2015/sdl2/src/video/x11/SDL_x11dyn.c rename to vs/sdl2/src/video/x11/SDL_x11dyn.c diff --git a/vs2015/sdl2/src/video/x11/SDL_x11dyn.h b/vs/sdl2/src/video/x11/SDL_x11dyn.h similarity index 100% rename from vs2015/sdl2/src/video/x11/SDL_x11dyn.h rename to vs/sdl2/src/video/x11/SDL_x11dyn.h diff --git a/vs2015/sdl2/src/video/x11/SDL_x11events.c b/vs/sdl2/src/video/x11/SDL_x11events.c similarity index 100% rename from vs2015/sdl2/src/video/x11/SDL_x11events.c rename to vs/sdl2/src/video/x11/SDL_x11events.c diff --git a/vs2015/sdl2/src/video/x11/SDL_x11events.h b/vs/sdl2/src/video/x11/SDL_x11events.h similarity index 100% rename from vs2015/sdl2/src/video/x11/SDL_x11events.h rename to vs/sdl2/src/video/x11/SDL_x11events.h diff --git a/vs2015/sdl2/src/video/x11/SDL_x11framebuffer.c b/vs/sdl2/src/video/x11/SDL_x11framebuffer.c similarity index 100% rename from vs2015/sdl2/src/video/x11/SDL_x11framebuffer.c rename to vs/sdl2/src/video/x11/SDL_x11framebuffer.c diff --git a/vs2015/sdl2/src/video/x11/SDL_x11framebuffer.h b/vs/sdl2/src/video/x11/SDL_x11framebuffer.h similarity index 100% rename from vs2015/sdl2/src/video/x11/SDL_x11framebuffer.h rename to vs/sdl2/src/video/x11/SDL_x11framebuffer.h diff --git a/vs2015/sdl2/src/video/x11/SDL_x11keyboard.c b/vs/sdl2/src/video/x11/SDL_x11keyboard.c similarity index 100% rename from vs2015/sdl2/src/video/x11/SDL_x11keyboard.c rename to vs/sdl2/src/video/x11/SDL_x11keyboard.c diff --git a/vs2015/sdl2/src/video/x11/SDL_x11keyboard.h b/vs/sdl2/src/video/x11/SDL_x11keyboard.h similarity index 100% rename from vs2015/sdl2/src/video/x11/SDL_x11keyboard.h rename to vs/sdl2/src/video/x11/SDL_x11keyboard.h diff --git a/vs2015/sdl2/src/video/x11/SDL_x11messagebox.c b/vs/sdl2/src/video/x11/SDL_x11messagebox.c similarity index 100% rename from vs2015/sdl2/src/video/x11/SDL_x11messagebox.c rename to vs/sdl2/src/video/x11/SDL_x11messagebox.c diff --git a/vs2015/sdl2/src/video/x11/SDL_x11messagebox.h b/vs/sdl2/src/video/x11/SDL_x11messagebox.h similarity index 100% rename from vs2015/sdl2/src/video/x11/SDL_x11messagebox.h rename to vs/sdl2/src/video/x11/SDL_x11messagebox.h diff --git a/vs2015/sdl2/src/video/x11/SDL_x11modes.c b/vs/sdl2/src/video/x11/SDL_x11modes.c similarity index 100% rename from vs2015/sdl2/src/video/x11/SDL_x11modes.c rename to vs/sdl2/src/video/x11/SDL_x11modes.c diff --git a/vs2015/sdl2/src/video/x11/SDL_x11modes.h b/vs/sdl2/src/video/x11/SDL_x11modes.h similarity index 100% rename from vs2015/sdl2/src/video/x11/SDL_x11modes.h rename to vs/sdl2/src/video/x11/SDL_x11modes.h diff --git a/vs2015/sdl2/src/video/x11/SDL_x11mouse.c b/vs/sdl2/src/video/x11/SDL_x11mouse.c similarity index 100% rename from vs2015/sdl2/src/video/x11/SDL_x11mouse.c rename to vs/sdl2/src/video/x11/SDL_x11mouse.c diff --git a/vs2015/sdl2/src/video/x11/SDL_x11mouse.h b/vs/sdl2/src/video/x11/SDL_x11mouse.h similarity index 100% rename from vs2015/sdl2/src/video/x11/SDL_x11mouse.h rename to vs/sdl2/src/video/x11/SDL_x11mouse.h diff --git a/vs2015/sdl2/src/video/x11/SDL_x11opengl.c b/vs/sdl2/src/video/x11/SDL_x11opengl.c similarity index 100% rename from vs2015/sdl2/src/video/x11/SDL_x11opengl.c rename to vs/sdl2/src/video/x11/SDL_x11opengl.c diff --git a/vs2015/sdl2/src/video/x11/SDL_x11opengl.h b/vs/sdl2/src/video/x11/SDL_x11opengl.h similarity index 100% rename from vs2015/sdl2/src/video/x11/SDL_x11opengl.h rename to vs/sdl2/src/video/x11/SDL_x11opengl.h diff --git a/vs2015/sdl2/src/video/x11/SDL_x11opengles.c b/vs/sdl2/src/video/x11/SDL_x11opengles.c similarity index 100% rename from vs2015/sdl2/src/video/x11/SDL_x11opengles.c rename to vs/sdl2/src/video/x11/SDL_x11opengles.c diff --git a/vs2015/sdl2/src/video/x11/SDL_x11opengles.h b/vs/sdl2/src/video/x11/SDL_x11opengles.h similarity index 100% rename from vs2015/sdl2/src/video/x11/SDL_x11opengles.h rename to vs/sdl2/src/video/x11/SDL_x11opengles.h diff --git a/vs2015/sdl2/src/video/x11/SDL_x11shape.c b/vs/sdl2/src/video/x11/SDL_x11shape.c similarity index 100% rename from vs2015/sdl2/src/video/x11/SDL_x11shape.c rename to vs/sdl2/src/video/x11/SDL_x11shape.c diff --git a/vs2015/sdl2/src/video/x11/SDL_x11shape.h b/vs/sdl2/src/video/x11/SDL_x11shape.h similarity index 100% rename from vs2015/sdl2/src/video/x11/SDL_x11shape.h rename to vs/sdl2/src/video/x11/SDL_x11shape.h diff --git a/vs2015/sdl2/src/video/x11/SDL_x11sym.h b/vs/sdl2/src/video/x11/SDL_x11sym.h similarity index 100% rename from vs2015/sdl2/src/video/x11/SDL_x11sym.h rename to vs/sdl2/src/video/x11/SDL_x11sym.h diff --git a/vs2015/sdl2/src/video/x11/SDL_x11touch.c b/vs/sdl2/src/video/x11/SDL_x11touch.c similarity index 100% rename from vs2015/sdl2/src/video/x11/SDL_x11touch.c rename to vs/sdl2/src/video/x11/SDL_x11touch.c diff --git a/vs2015/sdl2/src/video/x11/SDL_x11touch.h b/vs/sdl2/src/video/x11/SDL_x11touch.h similarity index 100% rename from vs2015/sdl2/src/video/x11/SDL_x11touch.h rename to vs/sdl2/src/video/x11/SDL_x11touch.h diff --git a/vs2015/sdl2/src/video/x11/SDL_x11video.c b/vs/sdl2/src/video/x11/SDL_x11video.c similarity index 100% rename from vs2015/sdl2/src/video/x11/SDL_x11video.c rename to vs/sdl2/src/video/x11/SDL_x11video.c diff --git a/vs2015/sdl2/src/video/x11/SDL_x11video.h b/vs/sdl2/src/video/x11/SDL_x11video.h similarity index 100% rename from vs2015/sdl2/src/video/x11/SDL_x11video.h rename to vs/sdl2/src/video/x11/SDL_x11video.h diff --git a/vs2015/sdl2/src/video/x11/SDL_x11vulkan.c b/vs/sdl2/src/video/x11/SDL_x11vulkan.c similarity index 100% rename from vs2015/sdl2/src/video/x11/SDL_x11vulkan.c rename to vs/sdl2/src/video/x11/SDL_x11vulkan.c diff --git a/vs2015/sdl2/src/video/x11/SDL_x11vulkan.h b/vs/sdl2/src/video/x11/SDL_x11vulkan.h similarity index 100% rename from vs2015/sdl2/src/video/x11/SDL_x11vulkan.h rename to vs/sdl2/src/video/x11/SDL_x11vulkan.h diff --git a/vs2015/sdl2/src/video/x11/SDL_x11window.c b/vs/sdl2/src/video/x11/SDL_x11window.c similarity index 100% rename from vs2015/sdl2/src/video/x11/SDL_x11window.c rename to vs/sdl2/src/video/x11/SDL_x11window.c diff --git a/vs2015/sdl2/src/video/x11/SDL_x11window.h b/vs/sdl2/src/video/x11/SDL_x11window.h similarity index 100% rename from vs2015/sdl2/src/video/x11/SDL_x11window.h rename to vs/sdl2/src/video/x11/SDL_x11window.h diff --git a/vs2015/sdl2/src/video/x11/SDL_x11xinput2.c b/vs/sdl2/src/video/x11/SDL_x11xinput2.c similarity index 100% rename from vs2015/sdl2/src/video/x11/SDL_x11xinput2.c rename to vs/sdl2/src/video/x11/SDL_x11xinput2.c diff --git a/vs2015/sdl2/src/video/x11/SDL_x11xinput2.h b/vs/sdl2/src/video/x11/SDL_x11xinput2.h similarity index 100% rename from vs2015/sdl2/src/video/x11/SDL_x11xinput2.h rename to vs/sdl2/src/video/x11/SDL_x11xinput2.h diff --git a/vs2015/sdl2/src/video/x11/edid-parse.c b/vs/sdl2/src/video/x11/edid-parse.c similarity index 100% rename from vs2015/sdl2/src/video/x11/edid-parse.c rename to vs/sdl2/src/video/x11/edid-parse.c diff --git a/vs2015/sdl2/src/video/x11/edid.h b/vs/sdl2/src/video/x11/edid.h similarity index 100% rename from vs2015/sdl2/src/video/x11/edid.h rename to vs/sdl2/src/video/x11/edid.h diff --git a/vs2015/sdl2/src/video/x11/imKStoUCS.c b/vs/sdl2/src/video/x11/imKStoUCS.c similarity index 100% rename from vs2015/sdl2/src/video/x11/imKStoUCS.c rename to vs/sdl2/src/video/x11/imKStoUCS.c diff --git a/vs2015/sdl2/src/video/x11/imKStoUCS.h b/vs/sdl2/src/video/x11/imKStoUCS.h similarity index 100% rename from vs2015/sdl2/src/video/x11/imKStoUCS.h rename to vs/sdl2/src/video/x11/imKStoUCS.h diff --git a/vs2015/sdl2/src/video/yuv2rgb/LICENSE b/vs/sdl2/src/video/yuv2rgb/LICENSE similarity index 100% rename from vs2015/sdl2/src/video/yuv2rgb/LICENSE rename to vs/sdl2/src/video/yuv2rgb/LICENSE diff --git a/vs2015/sdl2/src/video/yuv2rgb/README.md b/vs/sdl2/src/video/yuv2rgb/README.md similarity index 100% rename from vs2015/sdl2/src/video/yuv2rgb/README.md rename to vs/sdl2/src/video/yuv2rgb/README.md diff --git a/vs2015/sdl2/src/video/yuv2rgb/yuv_rgb.c b/vs/sdl2/src/video/yuv2rgb/yuv_rgb.c similarity index 100% rename from vs2015/sdl2/src/video/yuv2rgb/yuv_rgb.c rename to vs/sdl2/src/video/yuv2rgb/yuv_rgb.c diff --git a/vs2015/sdl2/src/video/yuv2rgb/yuv_rgb.h b/vs/sdl2/src/video/yuv2rgb/yuv_rgb.h similarity index 100% rename from vs2015/sdl2/src/video/yuv2rgb/yuv_rgb.h rename to vs/sdl2/src/video/yuv2rgb/yuv_rgb.h diff --git a/vs2015/sdl2/src/video/yuv2rgb/yuv_rgb_sse_func.h b/vs/sdl2/src/video/yuv2rgb/yuv_rgb_sse_func.h similarity index 100% rename from vs2015/sdl2/src/video/yuv2rgb/yuv_rgb_sse_func.h rename to vs/sdl2/src/video/yuv2rgb/yuv_rgb_sse_func.h diff --git a/vs2015/sdl2/src/video/yuv2rgb/yuv_rgb_std_func.h b/vs/sdl2/src/video/yuv2rgb/yuv_rgb_std_func.h similarity index 100% rename from vs2015/sdl2/src/video/yuv2rgb/yuv_rgb_std_func.h rename to vs/sdl2/src/video/yuv2rgb/yuv_rgb_std_func.h diff --git a/vs2015/sdl2/test/CMakeLists.txt b/vs/sdl2/test/CMakeLists.txt similarity index 100% rename from vs2015/sdl2/test/CMakeLists.txt rename to vs/sdl2/test/CMakeLists.txt diff --git a/vs2015/sdl2/test/COPYING b/vs/sdl2/test/COPYING similarity index 100% rename from vs2015/sdl2/test/COPYING rename to vs/sdl2/test/COPYING diff --git a/vs2015/sdl2/test/Makefile.in b/vs/sdl2/test/Makefile.in similarity index 100% rename from vs2015/sdl2/test/Makefile.in rename to vs/sdl2/test/Makefile.in diff --git a/vs2015/sdl2/test/README b/vs/sdl2/test/README similarity index 100% rename from vs2015/sdl2/test/README rename to vs/sdl2/test/README diff --git a/vs2015/sdl2/test/acinclude.m4 b/vs/sdl2/test/acinclude.m4 similarity index 100% rename from vs2015/sdl2/test/acinclude.m4 rename to vs/sdl2/test/acinclude.m4 diff --git a/vs2015/sdl2/test/aclocal.m4 b/vs/sdl2/test/aclocal.m4 similarity index 100% rename from vs2015/sdl2/test/aclocal.m4 rename to vs/sdl2/test/aclocal.m4 diff --git a/vs2015/sdl2/test/autogen.sh b/vs/sdl2/test/autogen.sh similarity index 100% rename from vs2015/sdl2/test/autogen.sh rename to vs/sdl2/test/autogen.sh diff --git a/vs2015/sdl2/test/axis.bmp b/vs/sdl2/test/axis.bmp similarity index 100% rename from vs2015/sdl2/test/axis.bmp rename to vs/sdl2/test/axis.bmp diff --git a/vs2015/sdl2/test/button.bmp b/vs/sdl2/test/button.bmp similarity index 100% rename from vs2015/sdl2/test/button.bmp rename to vs/sdl2/test/button.bmp diff --git a/vs2015/sdl2/test/checkkeys.c b/vs/sdl2/test/checkkeys.c similarity index 100% rename from vs2015/sdl2/test/checkkeys.c rename to vs/sdl2/test/checkkeys.c diff --git a/vs2015/sdl2/test/configure b/vs/sdl2/test/configure similarity index 100% rename from vs2015/sdl2/test/configure rename to vs/sdl2/test/configure diff --git a/vs2015/sdl2/test/configure.ac b/vs/sdl2/test/configure.ac similarity index 100% rename from vs2015/sdl2/test/configure.ac rename to vs/sdl2/test/configure.ac diff --git a/vs2015/sdl2/test/controllermap.bmp b/vs/sdl2/test/controllermap.bmp similarity index 100% rename from vs2015/sdl2/test/controllermap.bmp rename to vs/sdl2/test/controllermap.bmp diff --git a/vs2015/sdl2/test/controllermap.c b/vs/sdl2/test/controllermap.c similarity index 100% rename from vs2015/sdl2/test/controllermap.c rename to vs/sdl2/test/controllermap.c diff --git a/vs2015/sdl2/test/emscripten/joystick-pre.js b/vs/sdl2/test/emscripten/joystick-pre.js similarity index 100% rename from vs2015/sdl2/test/emscripten/joystick-pre.js rename to vs/sdl2/test/emscripten/joystick-pre.js diff --git a/vs2015/sdl2/test/gcc-fat.sh b/vs/sdl2/test/gcc-fat.sh similarity index 100% rename from vs2015/sdl2/test/gcc-fat.sh rename to vs/sdl2/test/gcc-fat.sh diff --git a/vs2015/sdl2/test/icon.bmp b/vs/sdl2/test/icon.bmp similarity index 100% rename from vs2015/sdl2/test/icon.bmp rename to vs/sdl2/test/icon.bmp diff --git a/vs2015/sdl2/test/loopwave.c b/vs/sdl2/test/loopwave.c similarity index 100% rename from vs2015/sdl2/test/loopwave.c rename to vs/sdl2/test/loopwave.c diff --git a/vs2015/sdl2/test/loopwavequeue.c b/vs/sdl2/test/loopwavequeue.c similarity index 100% rename from vs2015/sdl2/test/loopwavequeue.c rename to vs/sdl2/test/loopwavequeue.c diff --git a/vs2015/sdl2/test/moose.dat b/vs/sdl2/test/moose.dat similarity index 100% rename from vs2015/sdl2/test/moose.dat rename to vs/sdl2/test/moose.dat diff --git a/vs2015/sdl2/test/nacl/background.js b/vs/sdl2/test/nacl/background.js similarity index 100% rename from vs2015/sdl2/test/nacl/background.js rename to vs/sdl2/test/nacl/background.js diff --git a/vs2015/sdl2/test/nacl/common.js b/vs/sdl2/test/nacl/common.js similarity index 100% rename from vs2015/sdl2/test/nacl/common.js rename to vs/sdl2/test/nacl/common.js diff --git a/vs2015/sdl2/test/nacl/index.html b/vs/sdl2/test/nacl/index.html similarity index 100% rename from vs2015/sdl2/test/nacl/index.html rename to vs/sdl2/test/nacl/index.html diff --git a/vs2015/sdl2/test/nacl/manifest.json b/vs/sdl2/test/nacl/manifest.json similarity index 100% rename from vs2015/sdl2/test/nacl/manifest.json rename to vs/sdl2/test/nacl/manifest.json diff --git a/vs2015/sdl2/test/picture.xbm b/vs/sdl2/test/picture.xbm similarity index 100% rename from vs2015/sdl2/test/picture.xbm rename to vs/sdl2/test/picture.xbm diff --git a/vs2015/sdl2/test/relative_mode.markdown b/vs/sdl2/test/relative_mode.markdown similarity index 100% rename from vs2015/sdl2/test/relative_mode.markdown rename to vs/sdl2/test/relative_mode.markdown diff --git a/vs2015/sdl2/test/sample.bmp b/vs/sdl2/test/sample.bmp similarity index 100% rename from vs2015/sdl2/test/sample.bmp rename to vs/sdl2/test/sample.bmp diff --git a/vs2015/sdl2/test/sample.wav b/vs/sdl2/test/sample.wav similarity index 100% rename from vs2015/sdl2/test/sample.wav rename to vs/sdl2/test/sample.wav diff --git a/vs2015/sdl2/test/shapes/p01_shape24.bmp b/vs/sdl2/test/shapes/p01_shape24.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p01_shape24.bmp rename to vs/sdl2/test/shapes/p01_shape24.bmp diff --git a/vs2015/sdl2/test/shapes/p01_shape32alpha.bmp b/vs/sdl2/test/shapes/p01_shape32alpha.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p01_shape32alpha.bmp rename to vs/sdl2/test/shapes/p01_shape32alpha.bmp diff --git a/vs2015/sdl2/test/shapes/p01_shape8.bmp b/vs/sdl2/test/shapes/p01_shape8.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p01_shape8.bmp rename to vs/sdl2/test/shapes/p01_shape8.bmp diff --git a/vs2015/sdl2/test/shapes/p02_shape24.bmp b/vs/sdl2/test/shapes/p02_shape24.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p02_shape24.bmp rename to vs/sdl2/test/shapes/p02_shape24.bmp diff --git a/vs2015/sdl2/test/shapes/p02_shape32alpha.bmp b/vs/sdl2/test/shapes/p02_shape32alpha.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p02_shape32alpha.bmp rename to vs/sdl2/test/shapes/p02_shape32alpha.bmp diff --git a/vs2015/sdl2/test/shapes/p02_shape8.bmp b/vs/sdl2/test/shapes/p02_shape8.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p02_shape8.bmp rename to vs/sdl2/test/shapes/p02_shape8.bmp diff --git a/vs2015/sdl2/test/shapes/p03_shape24.bmp b/vs/sdl2/test/shapes/p03_shape24.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p03_shape24.bmp rename to vs/sdl2/test/shapes/p03_shape24.bmp diff --git a/vs2015/sdl2/test/shapes/p03_shape8.bmp b/vs/sdl2/test/shapes/p03_shape8.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p03_shape8.bmp rename to vs/sdl2/test/shapes/p03_shape8.bmp diff --git a/vs2015/sdl2/test/shapes/p04_shape1.bmp b/vs/sdl2/test/shapes/p04_shape1.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p04_shape1.bmp rename to vs/sdl2/test/shapes/p04_shape1.bmp diff --git a/vs2015/sdl2/test/shapes/p04_shape24.bmp b/vs/sdl2/test/shapes/p04_shape24.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p04_shape24.bmp rename to vs/sdl2/test/shapes/p04_shape24.bmp diff --git a/vs2015/sdl2/test/shapes/p04_shape32alpha.bmp b/vs/sdl2/test/shapes/p04_shape32alpha.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p04_shape32alpha.bmp rename to vs/sdl2/test/shapes/p04_shape32alpha.bmp diff --git a/vs2015/sdl2/test/shapes/p04_shape8.bmp b/vs/sdl2/test/shapes/p04_shape8.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p04_shape8.bmp rename to vs/sdl2/test/shapes/p04_shape8.bmp diff --git a/vs2015/sdl2/test/shapes/p05_shape8.bmp b/vs/sdl2/test/shapes/p05_shape8.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p05_shape8.bmp rename to vs/sdl2/test/shapes/p05_shape8.bmp diff --git a/vs2015/sdl2/test/shapes/p06_shape1alpha.bmp b/vs/sdl2/test/shapes/p06_shape1alpha.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p06_shape1alpha.bmp rename to vs/sdl2/test/shapes/p06_shape1alpha.bmp diff --git a/vs2015/sdl2/test/shapes/p06_shape24.bmp b/vs/sdl2/test/shapes/p06_shape24.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p06_shape24.bmp rename to vs/sdl2/test/shapes/p06_shape24.bmp diff --git a/vs2015/sdl2/test/shapes/p06_shape32alpha.bmp b/vs/sdl2/test/shapes/p06_shape32alpha.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p06_shape32alpha.bmp rename to vs/sdl2/test/shapes/p06_shape32alpha.bmp diff --git a/vs2015/sdl2/test/shapes/p06_shape8.bmp b/vs/sdl2/test/shapes/p06_shape8.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p06_shape8.bmp rename to vs/sdl2/test/shapes/p06_shape8.bmp diff --git a/vs2015/sdl2/test/shapes/p07_shape24.bmp b/vs/sdl2/test/shapes/p07_shape24.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p07_shape24.bmp rename to vs/sdl2/test/shapes/p07_shape24.bmp diff --git a/vs2015/sdl2/test/shapes/p07_shape32alpha.bmp b/vs/sdl2/test/shapes/p07_shape32alpha.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p07_shape32alpha.bmp rename to vs/sdl2/test/shapes/p07_shape32alpha.bmp diff --git a/vs2015/sdl2/test/shapes/p07_shape8.bmp b/vs/sdl2/test/shapes/p07_shape8.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p07_shape8.bmp rename to vs/sdl2/test/shapes/p07_shape8.bmp diff --git a/vs2015/sdl2/test/shapes/p08_shape24.bmp b/vs/sdl2/test/shapes/p08_shape24.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p08_shape24.bmp rename to vs/sdl2/test/shapes/p08_shape24.bmp diff --git a/vs2015/sdl2/test/shapes/p08_shape32alpha.bmp b/vs/sdl2/test/shapes/p08_shape32alpha.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p08_shape32alpha.bmp rename to vs/sdl2/test/shapes/p08_shape32alpha.bmp diff --git a/vs2015/sdl2/test/shapes/p08_shape8.bmp b/vs/sdl2/test/shapes/p08_shape8.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p08_shape8.bmp rename to vs/sdl2/test/shapes/p08_shape8.bmp diff --git a/vs2015/sdl2/test/shapes/p09_shape24.bmp b/vs/sdl2/test/shapes/p09_shape24.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p09_shape24.bmp rename to vs/sdl2/test/shapes/p09_shape24.bmp diff --git a/vs2015/sdl2/test/shapes/p09_shape32alpha.bmp b/vs/sdl2/test/shapes/p09_shape32alpha.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p09_shape32alpha.bmp rename to vs/sdl2/test/shapes/p09_shape32alpha.bmp diff --git a/vs2015/sdl2/test/shapes/p09_shape8.bmp b/vs/sdl2/test/shapes/p09_shape8.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p09_shape8.bmp rename to vs/sdl2/test/shapes/p09_shape8.bmp diff --git a/vs2015/sdl2/test/shapes/p10_shape1.bmp b/vs/sdl2/test/shapes/p10_shape1.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p10_shape1.bmp rename to vs/sdl2/test/shapes/p10_shape1.bmp diff --git a/vs2015/sdl2/test/shapes/p10_shape24.bmp b/vs/sdl2/test/shapes/p10_shape24.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p10_shape24.bmp rename to vs/sdl2/test/shapes/p10_shape24.bmp diff --git a/vs2015/sdl2/test/shapes/p10_shape32alpha.bmp b/vs/sdl2/test/shapes/p10_shape32alpha.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p10_shape32alpha.bmp rename to vs/sdl2/test/shapes/p10_shape32alpha.bmp diff --git a/vs2015/sdl2/test/shapes/p10_shape8.bmp b/vs/sdl2/test/shapes/p10_shape8.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p10_shape8.bmp rename to vs/sdl2/test/shapes/p10_shape8.bmp diff --git a/vs2015/sdl2/test/shapes/p11_shape24.bmp b/vs/sdl2/test/shapes/p11_shape24.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p11_shape24.bmp rename to vs/sdl2/test/shapes/p11_shape24.bmp diff --git a/vs2015/sdl2/test/shapes/p11_shape32alpha.bmp b/vs/sdl2/test/shapes/p11_shape32alpha.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p11_shape32alpha.bmp rename to vs/sdl2/test/shapes/p11_shape32alpha.bmp diff --git a/vs2015/sdl2/test/shapes/p11_shape8.bmp b/vs/sdl2/test/shapes/p11_shape8.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p11_shape8.bmp rename to vs/sdl2/test/shapes/p11_shape8.bmp diff --git a/vs2015/sdl2/test/shapes/p12_shape24.bmp b/vs/sdl2/test/shapes/p12_shape24.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p12_shape24.bmp rename to vs/sdl2/test/shapes/p12_shape24.bmp diff --git a/vs2015/sdl2/test/shapes/p12_shape8.bmp b/vs/sdl2/test/shapes/p12_shape8.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p12_shape8.bmp rename to vs/sdl2/test/shapes/p12_shape8.bmp diff --git a/vs2015/sdl2/test/shapes/p13_shape24.bmp b/vs/sdl2/test/shapes/p13_shape24.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p13_shape24.bmp rename to vs/sdl2/test/shapes/p13_shape24.bmp diff --git a/vs2015/sdl2/test/shapes/p13_shape32alpha.bmp b/vs/sdl2/test/shapes/p13_shape32alpha.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p13_shape32alpha.bmp rename to vs/sdl2/test/shapes/p13_shape32alpha.bmp diff --git a/vs2015/sdl2/test/shapes/p13_shape8.bmp b/vs/sdl2/test/shapes/p13_shape8.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p13_shape8.bmp rename to vs/sdl2/test/shapes/p13_shape8.bmp diff --git a/vs2015/sdl2/test/shapes/p14_shape24.bmp b/vs/sdl2/test/shapes/p14_shape24.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p14_shape24.bmp rename to vs/sdl2/test/shapes/p14_shape24.bmp diff --git a/vs2015/sdl2/test/shapes/p14_shape8.bmp b/vs/sdl2/test/shapes/p14_shape8.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p14_shape8.bmp rename to vs/sdl2/test/shapes/p14_shape8.bmp diff --git a/vs2015/sdl2/test/shapes/p15_shape24.bmp b/vs/sdl2/test/shapes/p15_shape24.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p15_shape24.bmp rename to vs/sdl2/test/shapes/p15_shape24.bmp diff --git a/vs2015/sdl2/test/shapes/p15_shape32alpha.bmp b/vs/sdl2/test/shapes/p15_shape32alpha.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p15_shape32alpha.bmp rename to vs/sdl2/test/shapes/p15_shape32alpha.bmp diff --git a/vs2015/sdl2/test/shapes/p15_shape8.bmp b/vs/sdl2/test/shapes/p15_shape8.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p15_shape8.bmp rename to vs/sdl2/test/shapes/p15_shape8.bmp diff --git a/vs2015/sdl2/test/shapes/p16_shape1.bmp b/vs/sdl2/test/shapes/p16_shape1.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p16_shape1.bmp rename to vs/sdl2/test/shapes/p16_shape1.bmp diff --git a/vs2015/sdl2/test/shapes/p16_shape24.bmp b/vs/sdl2/test/shapes/p16_shape24.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p16_shape24.bmp rename to vs/sdl2/test/shapes/p16_shape24.bmp diff --git a/vs2015/sdl2/test/shapes/p16_shape8.bmp b/vs/sdl2/test/shapes/p16_shape8.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/p16_shape8.bmp rename to vs/sdl2/test/shapes/p16_shape8.bmp diff --git a/vs2015/sdl2/test/shapes/trollface_24.bmp b/vs/sdl2/test/shapes/trollface_24.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/trollface_24.bmp rename to vs/sdl2/test/shapes/trollface_24.bmp diff --git a/vs2015/sdl2/test/shapes/trollface_32alpha.bmp b/vs/sdl2/test/shapes/trollface_32alpha.bmp similarity index 100% rename from vs2015/sdl2/test/shapes/trollface_32alpha.bmp rename to vs/sdl2/test/shapes/trollface_32alpha.bmp diff --git a/vs2015/sdl2/test/testatomic.c b/vs/sdl2/test/testatomic.c similarity index 100% rename from vs2015/sdl2/test/testatomic.c rename to vs/sdl2/test/testatomic.c diff --git a/vs2015/sdl2/test/testaudiocapture.c b/vs/sdl2/test/testaudiocapture.c similarity index 100% rename from vs2015/sdl2/test/testaudiocapture.c rename to vs/sdl2/test/testaudiocapture.c diff --git a/vs2015/sdl2/test/testaudiohotplug.c b/vs/sdl2/test/testaudiohotplug.c similarity index 100% rename from vs2015/sdl2/test/testaudiohotplug.c rename to vs/sdl2/test/testaudiohotplug.c diff --git a/vs2015/sdl2/test/testaudioinfo.c b/vs/sdl2/test/testaudioinfo.c similarity index 100% rename from vs2015/sdl2/test/testaudioinfo.c rename to vs/sdl2/test/testaudioinfo.c diff --git a/vs2015/sdl2/test/testautomation.c b/vs/sdl2/test/testautomation.c similarity index 100% rename from vs2015/sdl2/test/testautomation.c rename to vs/sdl2/test/testautomation.c diff --git a/vs2015/sdl2/test/testautomation_audio.c b/vs/sdl2/test/testautomation_audio.c similarity index 100% rename from vs2015/sdl2/test/testautomation_audio.c rename to vs/sdl2/test/testautomation_audio.c diff --git a/vs2015/sdl2/test/testautomation_clipboard.c b/vs/sdl2/test/testautomation_clipboard.c similarity index 100% rename from vs2015/sdl2/test/testautomation_clipboard.c rename to vs/sdl2/test/testautomation_clipboard.c diff --git a/vs2015/sdl2/test/testautomation_events.c b/vs/sdl2/test/testautomation_events.c similarity index 100% rename from vs2015/sdl2/test/testautomation_events.c rename to vs/sdl2/test/testautomation_events.c diff --git a/vs2015/sdl2/test/testautomation_hints.c b/vs/sdl2/test/testautomation_hints.c similarity index 100% rename from vs2015/sdl2/test/testautomation_hints.c rename to vs/sdl2/test/testautomation_hints.c diff --git a/vs2015/sdl2/test/testautomation_keyboard.c b/vs/sdl2/test/testautomation_keyboard.c similarity index 100% rename from vs2015/sdl2/test/testautomation_keyboard.c rename to vs/sdl2/test/testautomation_keyboard.c diff --git a/vs2015/sdl2/test/testautomation_main.c b/vs/sdl2/test/testautomation_main.c similarity index 100% rename from vs2015/sdl2/test/testautomation_main.c rename to vs/sdl2/test/testautomation_main.c diff --git a/vs2015/sdl2/test/testautomation_mouse.c b/vs/sdl2/test/testautomation_mouse.c similarity index 100% rename from vs2015/sdl2/test/testautomation_mouse.c rename to vs/sdl2/test/testautomation_mouse.c diff --git a/vs2015/sdl2/test/testautomation_pixels.c b/vs/sdl2/test/testautomation_pixels.c similarity index 100% rename from vs2015/sdl2/test/testautomation_pixels.c rename to vs/sdl2/test/testautomation_pixels.c diff --git a/vs2015/sdl2/test/testautomation_platform.c b/vs/sdl2/test/testautomation_platform.c similarity index 100% rename from vs2015/sdl2/test/testautomation_platform.c rename to vs/sdl2/test/testautomation_platform.c diff --git a/vs2015/sdl2/test/testautomation_rect.c b/vs/sdl2/test/testautomation_rect.c similarity index 100% rename from vs2015/sdl2/test/testautomation_rect.c rename to vs/sdl2/test/testautomation_rect.c diff --git a/vs2015/sdl2/test/testautomation_render.c b/vs/sdl2/test/testautomation_render.c similarity index 100% rename from vs2015/sdl2/test/testautomation_render.c rename to vs/sdl2/test/testautomation_render.c diff --git a/vs2015/sdl2/test/testautomation_rwops.c b/vs/sdl2/test/testautomation_rwops.c similarity index 100% rename from vs2015/sdl2/test/testautomation_rwops.c rename to vs/sdl2/test/testautomation_rwops.c diff --git a/vs2015/sdl2/test/testautomation_sdltest.c b/vs/sdl2/test/testautomation_sdltest.c similarity index 100% rename from vs2015/sdl2/test/testautomation_sdltest.c rename to vs/sdl2/test/testautomation_sdltest.c diff --git a/vs2015/sdl2/test/testautomation_stdlib.c b/vs/sdl2/test/testautomation_stdlib.c similarity index 100% rename from vs2015/sdl2/test/testautomation_stdlib.c rename to vs/sdl2/test/testautomation_stdlib.c diff --git a/vs2015/sdl2/test/testautomation_suites.h b/vs/sdl2/test/testautomation_suites.h similarity index 100% rename from vs2015/sdl2/test/testautomation_suites.h rename to vs/sdl2/test/testautomation_suites.h diff --git a/vs2015/sdl2/test/testautomation_surface.c b/vs/sdl2/test/testautomation_surface.c similarity index 100% rename from vs2015/sdl2/test/testautomation_surface.c rename to vs/sdl2/test/testautomation_surface.c diff --git a/vs2015/sdl2/test/testautomation_syswm.c b/vs/sdl2/test/testautomation_syswm.c similarity index 100% rename from vs2015/sdl2/test/testautomation_syswm.c rename to vs/sdl2/test/testautomation_syswm.c diff --git a/vs2015/sdl2/test/testautomation_timer.c b/vs/sdl2/test/testautomation_timer.c similarity index 100% rename from vs2015/sdl2/test/testautomation_timer.c rename to vs/sdl2/test/testautomation_timer.c diff --git a/vs2015/sdl2/test/testautomation_video.c b/vs/sdl2/test/testautomation_video.c similarity index 100% rename from vs2015/sdl2/test/testautomation_video.c rename to vs/sdl2/test/testautomation_video.c diff --git a/vs2015/sdl2/test/testbounds.c b/vs/sdl2/test/testbounds.c similarity index 100% rename from vs2015/sdl2/test/testbounds.c rename to vs/sdl2/test/testbounds.c diff --git a/vs2015/sdl2/test/testcustomcursor.c b/vs/sdl2/test/testcustomcursor.c similarity index 100% rename from vs2015/sdl2/test/testcustomcursor.c rename to vs/sdl2/test/testcustomcursor.c diff --git a/vs2015/sdl2/test/testdisplayinfo.c b/vs/sdl2/test/testdisplayinfo.c similarity index 100% rename from vs2015/sdl2/test/testdisplayinfo.c rename to vs/sdl2/test/testdisplayinfo.c diff --git a/vs2015/sdl2/test/testdraw2.c b/vs/sdl2/test/testdraw2.c similarity index 100% rename from vs2015/sdl2/test/testdraw2.c rename to vs/sdl2/test/testdraw2.c diff --git a/vs2015/sdl2/test/testdrawchessboard.c b/vs/sdl2/test/testdrawchessboard.c similarity index 100% rename from vs2015/sdl2/test/testdrawchessboard.c rename to vs/sdl2/test/testdrawchessboard.c diff --git a/vs2015/sdl2/test/testdropfile.c b/vs/sdl2/test/testdropfile.c similarity index 100% rename from vs2015/sdl2/test/testdropfile.c rename to vs/sdl2/test/testdropfile.c diff --git a/vs2015/sdl2/test/testerror.c b/vs/sdl2/test/testerror.c similarity index 100% rename from vs2015/sdl2/test/testerror.c rename to vs/sdl2/test/testerror.c diff --git a/vs2015/sdl2/test/testfile.c b/vs/sdl2/test/testfile.c similarity index 100% rename from vs2015/sdl2/test/testfile.c rename to vs/sdl2/test/testfile.c diff --git a/vs2015/sdl2/test/testfilesystem.c b/vs/sdl2/test/testfilesystem.c similarity index 100% rename from vs2015/sdl2/test/testfilesystem.c rename to vs/sdl2/test/testfilesystem.c diff --git a/vs2015/sdl2/test/testgamecontroller.c b/vs/sdl2/test/testgamecontroller.c similarity index 100% rename from vs2015/sdl2/test/testgamecontroller.c rename to vs/sdl2/test/testgamecontroller.c diff --git a/vs2015/sdl2/test/testgesture.c b/vs/sdl2/test/testgesture.c similarity index 100% rename from vs2015/sdl2/test/testgesture.c rename to vs/sdl2/test/testgesture.c diff --git a/vs2015/sdl2/test/testgl2.c b/vs/sdl2/test/testgl2.c similarity index 100% rename from vs2015/sdl2/test/testgl2.c rename to vs/sdl2/test/testgl2.c diff --git a/vs2015/sdl2/test/testgles.c b/vs/sdl2/test/testgles.c similarity index 100% rename from vs2015/sdl2/test/testgles.c rename to vs/sdl2/test/testgles.c diff --git a/vs2015/sdl2/test/testgles2.c b/vs/sdl2/test/testgles2.c similarity index 100% rename from vs2015/sdl2/test/testgles2.c rename to vs/sdl2/test/testgles2.c diff --git a/vs2015/sdl2/test/testhaptic.c b/vs/sdl2/test/testhaptic.c similarity index 100% rename from vs2015/sdl2/test/testhaptic.c rename to vs/sdl2/test/testhaptic.c diff --git a/vs2015/sdl2/test/testhittesting.c b/vs/sdl2/test/testhittesting.c similarity index 100% rename from vs2015/sdl2/test/testhittesting.c rename to vs/sdl2/test/testhittesting.c diff --git a/vs2015/sdl2/test/testhotplug.c b/vs/sdl2/test/testhotplug.c similarity index 100% rename from vs2015/sdl2/test/testhotplug.c rename to vs/sdl2/test/testhotplug.c diff --git a/vs2015/sdl2/test/testiconv.c b/vs/sdl2/test/testiconv.c similarity index 100% rename from vs2015/sdl2/test/testiconv.c rename to vs/sdl2/test/testiconv.c diff --git a/vs2015/sdl2/test/testime.c b/vs/sdl2/test/testime.c similarity index 100% rename from vs2015/sdl2/test/testime.c rename to vs/sdl2/test/testime.c diff --git a/vs2015/sdl2/test/testintersections.c b/vs/sdl2/test/testintersections.c similarity index 100% rename from vs2015/sdl2/test/testintersections.c rename to vs/sdl2/test/testintersections.c diff --git a/vs2015/sdl2/test/testjoystick.c b/vs/sdl2/test/testjoystick.c similarity index 100% rename from vs2015/sdl2/test/testjoystick.c rename to vs/sdl2/test/testjoystick.c diff --git a/vs2015/sdl2/test/testkeys.c b/vs/sdl2/test/testkeys.c similarity index 100% rename from vs2015/sdl2/test/testkeys.c rename to vs/sdl2/test/testkeys.c diff --git a/vs2015/sdl2/test/testloadso.c b/vs/sdl2/test/testloadso.c similarity index 100% rename from vs2015/sdl2/test/testloadso.c rename to vs/sdl2/test/testloadso.c diff --git a/vs2015/sdl2/test/testlock.c b/vs/sdl2/test/testlock.c similarity index 100% rename from vs2015/sdl2/test/testlock.c rename to vs/sdl2/test/testlock.c diff --git a/vs2015/sdl2/test/testmessage.c b/vs/sdl2/test/testmessage.c similarity index 100% rename from vs2015/sdl2/test/testmessage.c rename to vs/sdl2/test/testmessage.c diff --git a/vs2015/sdl2/test/testmultiaudio.c b/vs/sdl2/test/testmultiaudio.c similarity index 100% rename from vs2015/sdl2/test/testmultiaudio.c rename to vs/sdl2/test/testmultiaudio.c diff --git a/vs2015/sdl2/test/testnative.c b/vs/sdl2/test/testnative.c similarity index 100% rename from vs2015/sdl2/test/testnative.c rename to vs/sdl2/test/testnative.c diff --git a/vs2015/sdl2/test/testnative.h b/vs/sdl2/test/testnative.h similarity index 100% rename from vs2015/sdl2/test/testnative.h rename to vs/sdl2/test/testnative.h diff --git a/vs2015/sdl2/test/testnativecocoa.m b/vs/sdl2/test/testnativecocoa.m similarity index 100% rename from vs2015/sdl2/test/testnativecocoa.m rename to vs/sdl2/test/testnativecocoa.m diff --git a/vs2015/sdl2/test/testnativew32.c b/vs/sdl2/test/testnativew32.c similarity index 100% rename from vs2015/sdl2/test/testnativew32.c rename to vs/sdl2/test/testnativew32.c diff --git a/vs2015/sdl2/test/testnativex11.c b/vs/sdl2/test/testnativex11.c similarity index 100% rename from vs2015/sdl2/test/testnativex11.c rename to vs/sdl2/test/testnativex11.c diff --git a/vs2015/sdl2/test/testoverlay2.c b/vs/sdl2/test/testoverlay2.c similarity index 100% rename from vs2015/sdl2/test/testoverlay2.c rename to vs/sdl2/test/testoverlay2.c diff --git a/vs2015/sdl2/test/testplatform.c b/vs/sdl2/test/testplatform.c similarity index 100% rename from vs2015/sdl2/test/testplatform.c rename to vs/sdl2/test/testplatform.c diff --git a/vs2015/sdl2/test/testpower.c b/vs/sdl2/test/testpower.c similarity index 100% rename from vs2015/sdl2/test/testpower.c rename to vs/sdl2/test/testpower.c diff --git a/vs2015/sdl2/test/testqsort.c b/vs/sdl2/test/testqsort.c similarity index 100% rename from vs2015/sdl2/test/testqsort.c rename to vs/sdl2/test/testqsort.c diff --git a/vs2015/sdl2/test/testrelative.c b/vs/sdl2/test/testrelative.c similarity index 100% rename from vs2015/sdl2/test/testrelative.c rename to vs/sdl2/test/testrelative.c diff --git a/vs2015/sdl2/test/testrendercopyex.c b/vs/sdl2/test/testrendercopyex.c similarity index 100% rename from vs2015/sdl2/test/testrendercopyex.c rename to vs/sdl2/test/testrendercopyex.c diff --git a/vs2015/sdl2/test/testrendertarget.c b/vs/sdl2/test/testrendertarget.c similarity index 100% rename from vs2015/sdl2/test/testrendertarget.c rename to vs/sdl2/test/testrendertarget.c diff --git a/vs2015/sdl2/test/testresample.c b/vs/sdl2/test/testresample.c similarity index 100% rename from vs2015/sdl2/test/testresample.c rename to vs/sdl2/test/testresample.c diff --git a/vs2015/sdl2/test/testrumble.c b/vs/sdl2/test/testrumble.c similarity index 100% rename from vs2015/sdl2/test/testrumble.c rename to vs/sdl2/test/testrumble.c diff --git a/vs2015/sdl2/test/testscale.c b/vs/sdl2/test/testscale.c similarity index 100% rename from vs2015/sdl2/test/testscale.c rename to vs/sdl2/test/testscale.c diff --git a/vs2015/sdl2/test/testsem.c b/vs/sdl2/test/testsem.c similarity index 100% rename from vs2015/sdl2/test/testsem.c rename to vs/sdl2/test/testsem.c diff --git a/vs2015/sdl2/test/testsensor.c b/vs/sdl2/test/testsensor.c similarity index 100% rename from vs2015/sdl2/test/testsensor.c rename to vs/sdl2/test/testsensor.c diff --git a/vs2015/sdl2/test/testshader.c b/vs/sdl2/test/testshader.c similarity index 100% rename from vs2015/sdl2/test/testshader.c rename to vs/sdl2/test/testshader.c diff --git a/vs2015/sdl2/test/testshape.c b/vs/sdl2/test/testshape.c similarity index 100% rename from vs2015/sdl2/test/testshape.c rename to vs/sdl2/test/testshape.c diff --git a/vs2015/sdl2/test/testsprite2.c b/vs/sdl2/test/testsprite2.c similarity index 100% rename from vs2015/sdl2/test/testsprite2.c rename to vs/sdl2/test/testsprite2.c diff --git a/vs2015/sdl2/test/testspriteminimal.c b/vs/sdl2/test/testspriteminimal.c similarity index 100% rename from vs2015/sdl2/test/testspriteminimal.c rename to vs/sdl2/test/testspriteminimal.c diff --git a/vs2015/sdl2/test/teststreaming.c b/vs/sdl2/test/teststreaming.c similarity index 100% rename from vs2015/sdl2/test/teststreaming.c rename to vs/sdl2/test/teststreaming.c diff --git a/vs2015/sdl2/test/testthread.c b/vs/sdl2/test/testthread.c similarity index 100% rename from vs2015/sdl2/test/testthread.c rename to vs/sdl2/test/testthread.c diff --git a/vs2015/sdl2/test/testtimer.c b/vs/sdl2/test/testtimer.c similarity index 100% rename from vs2015/sdl2/test/testtimer.c rename to vs/sdl2/test/testtimer.c diff --git a/vs2015/sdl2/test/testver.c b/vs/sdl2/test/testver.c similarity index 100% rename from vs2015/sdl2/test/testver.c rename to vs/sdl2/test/testver.c diff --git a/vs2015/sdl2/test/testviewport.c b/vs/sdl2/test/testviewport.c similarity index 100% rename from vs2015/sdl2/test/testviewport.c rename to vs/sdl2/test/testviewport.c diff --git a/vs2015/sdl2/test/testvulkan.c b/vs/sdl2/test/testvulkan.c similarity index 100% rename from vs2015/sdl2/test/testvulkan.c rename to vs/sdl2/test/testvulkan.c diff --git a/vs2015/sdl2/test/testwm2.c b/vs/sdl2/test/testwm2.c similarity index 100% rename from vs2015/sdl2/test/testwm2.c rename to vs/sdl2/test/testwm2.c diff --git a/vs2015/sdl2/test/testyuv.bmp b/vs/sdl2/test/testyuv.bmp similarity index 100% rename from vs2015/sdl2/test/testyuv.bmp rename to vs/sdl2/test/testyuv.bmp diff --git a/vs2015/sdl2/test/testyuv.c b/vs/sdl2/test/testyuv.c similarity index 100% rename from vs2015/sdl2/test/testyuv.c rename to vs/sdl2/test/testyuv.c diff --git a/vs2015/sdl2/test/testyuv_cvt.c b/vs/sdl2/test/testyuv_cvt.c similarity index 100% rename from vs2015/sdl2/test/testyuv_cvt.c rename to vs/sdl2/test/testyuv_cvt.c diff --git a/vs2015/sdl2/test/testyuv_cvt.h b/vs/sdl2/test/testyuv_cvt.h similarity index 100% rename from vs2015/sdl2/test/testyuv_cvt.h rename to vs/sdl2/test/testyuv_cvt.h diff --git a/vs2015/sdl2/test/torturethread.c b/vs/sdl2/test/torturethread.c similarity index 100% rename from vs2015/sdl2/test/torturethread.c rename to vs/sdl2/test/torturethread.c diff --git a/vs2015/sdl2/test/utf8.txt b/vs/sdl2/test/utf8.txt similarity index 100% rename from vs2015/sdl2/test/utf8.txt rename to vs/sdl2/test/utf8.txt diff --git a/vs2015/sdl2/wayland-protocols/pointer-constraints-unstable-v1.xml b/vs/sdl2/wayland-protocols/pointer-constraints-unstable-v1.xml similarity index 100% rename from vs2015/sdl2/wayland-protocols/pointer-constraints-unstable-v1.xml rename to vs/sdl2/wayland-protocols/pointer-constraints-unstable-v1.xml diff --git a/vs2015/sdl2/wayland-protocols/relative-pointer-unstable-v1.xml b/vs/sdl2/wayland-protocols/relative-pointer-unstable-v1.xml similarity index 100% rename from vs2015/sdl2/wayland-protocols/relative-pointer-unstable-v1.xml rename to vs/sdl2/wayland-protocols/relative-pointer-unstable-v1.xml diff --git a/vs2015/sdl2/wayland-protocols/wayland.xml b/vs/sdl2/wayland-protocols/wayland.xml similarity index 100% rename from vs2015/sdl2/wayland-protocols/wayland.xml rename to vs/sdl2/wayland-protocols/wayland.xml diff --git a/vs2015/sdl2/wayland-protocols/xdg-shell-unstable-v6.xml b/vs/sdl2/wayland-protocols/xdg-shell-unstable-v6.xml similarity index 100% rename from vs2015/sdl2/wayland-protocols/xdg-shell-unstable-v6.xml rename to vs/sdl2/wayland-protocols/xdg-shell-unstable-v6.xml diff --git a/vs2015/sdl2/wayland-protocols/xdg-shell.xml b/vs/sdl2/wayland-protocols/xdg-shell.xml similarity index 100% rename from vs2015/sdl2/wayland-protocols/xdg-shell.xml rename to vs/sdl2/wayland-protocols/xdg-shell.xml diff --git a/vs2015/sdlnet/CHANGES b/vs/sdlnet/CHANGES similarity index 100% rename from vs2015/sdlnet/CHANGES rename to vs/sdlnet/CHANGES diff --git a/vs2015/sdlnet/COPYING b/vs/sdlnet/COPYING similarity index 100% rename from vs2015/sdlnet/COPYING rename to vs/sdlnet/COPYING diff --git a/vs2015/sdlnet/MPWmake.sea.bin b/vs/sdlnet/MPWmake.sea.bin similarity index 100% rename from vs2015/sdlnet/MPWmake.sea.bin rename to vs/sdlnet/MPWmake.sea.bin diff --git a/vs2015/sdlnet/Makefile.am b/vs/sdlnet/Makefile.am similarity index 100% rename from vs2015/sdlnet/Makefile.am rename to vs/sdlnet/Makefile.am diff --git a/vs2015/sdlnet/Makefile.in b/vs/sdlnet/Makefile.in similarity index 100% rename from vs2015/sdlnet/Makefile.in rename to vs/sdlnet/Makefile.in diff --git a/vs2015/sdlnet/README b/vs/sdlnet/README similarity index 100% rename from vs2015/sdlnet/README rename to vs/sdlnet/README diff --git a/vs2015/sdlnet/SDL_net.h b/vs/sdlnet/SDL_net.h similarity index 100% rename from vs2015/sdlnet/SDL_net.h rename to vs/sdlnet/SDL_net.h diff --git a/vs2015/sdlnet/SDL_net.pc.in b/vs/sdlnet/SDL_net.pc.in similarity index 100% rename from vs2015/sdlnet/SDL_net.pc.in rename to vs/sdlnet/SDL_net.pc.in diff --git a/vs2015/sdlnet/SDL_net.qpg.in b/vs/sdlnet/SDL_net.qpg.in similarity index 100% rename from vs2015/sdlnet/SDL_net.qpg.in rename to vs/sdlnet/SDL_net.qpg.in diff --git a/vs2015/sdlnet/SDL_net.spec b/vs/sdlnet/SDL_net.spec similarity index 100% rename from vs2015/sdlnet/SDL_net.spec rename to vs/sdlnet/SDL_net.spec diff --git a/vs2015/sdlnet/SDL_net.spec.in b/vs/sdlnet/SDL_net.spec.in similarity index 100% rename from vs2015/sdlnet/SDL_net.spec.in rename to vs/sdlnet/SDL_net.spec.in diff --git a/vs2015/sdlnet/SDLnet.c b/vs/sdlnet/SDLnet.c similarity index 100% rename from vs2015/sdlnet/SDLnet.c rename to vs/sdlnet/SDLnet.c diff --git a/vs2015/sdlnet/SDLnetTCP.c b/vs/sdlnet/SDLnetTCP.c similarity index 100% rename from vs2015/sdlnet/SDLnetTCP.c rename to vs/sdlnet/SDLnetTCP.c diff --git a/vs2015/sdlnet/SDLnetUDP.c b/vs/sdlnet/SDLnetUDP.c similarity index 100% rename from vs2015/sdlnet/SDLnetUDP.c rename to vs/sdlnet/SDLnetUDP.c diff --git a/vs2015/sdlnet/SDLnetselect.c b/vs/sdlnet/SDLnetselect.c similarity index 100% rename from vs2015/sdlnet/SDLnetselect.c rename to vs/sdlnet/SDLnetselect.c diff --git a/vs2015/sdlnet/SDLnetsys.h b/vs/sdlnet/SDLnetsys.h similarity index 100% rename from vs2015/sdlnet/SDLnetsys.h rename to vs/sdlnet/SDLnetsys.h diff --git a/vs2015/sdlnet/VisualC/SDL_net_VS2008.sln b/vs/sdlnet/VisualC/SDL_net_VS2008.sln similarity index 100% rename from vs2015/sdlnet/VisualC/SDL_net_VS2008.sln rename to vs/sdlnet/VisualC/SDL_net_VS2008.sln diff --git a/vs2015/sdlnet/VisualC/SDL_net_VS2008.suo b/vs/sdlnet/VisualC/SDL_net_VS2008.suo similarity index 100% rename from vs2015/sdlnet/VisualC/SDL_net_VS2008.suo rename to vs/sdlnet/VisualC/SDL_net_VS2008.suo diff --git a/vs2015/sdlnet/VisualC/SDL_net_VS2008.vcproj b/vs/sdlnet/VisualC/SDL_net_VS2008.vcproj similarity index 100% rename from vs2015/sdlnet/VisualC/SDL_net_VS2008.vcproj rename to vs/sdlnet/VisualC/SDL_net_VS2008.vcproj diff --git a/vs2015/sdlnet/VisualC/SDL_net_VS2008.vcxproj b/vs/sdlnet/VisualC/SDL_net_VS2008.vcxproj similarity index 100% rename from vs2015/sdlnet/VisualC/SDL_net_VS2008.vcxproj rename to vs/sdlnet/VisualC/SDL_net_VS2008.vcxproj diff --git a/vs2015/sdlnet/VisualC/Version.rc b/vs/sdlnet/VisualC/Version.rc similarity index 100% rename from vs2015/sdlnet/VisualC/Version.rc rename to vs/sdlnet/VisualC/Version.rc diff --git a/vs2015/sdlnet/VisualC/resource.h b/vs/sdlnet/VisualC/resource.h similarity index 100% rename from vs2015/sdlnet/VisualC/resource.h rename to vs/sdlnet/VisualC/resource.h diff --git a/vs2015/sdlnet/VisualC/showinterfaces/showinterfaces.vcproj b/vs/sdlnet/VisualC/showinterfaces/showinterfaces.vcproj similarity index 100% rename from vs2015/sdlnet/VisualC/showinterfaces/showinterfaces.vcproj rename to vs/sdlnet/VisualC/showinterfaces/showinterfaces.vcproj diff --git a/vs2015/sdlnet/Watcom-OS2.zip b/vs/sdlnet/Watcom-OS2.zip similarity index 100% rename from vs2015/sdlnet/Watcom-OS2.zip rename to vs/sdlnet/Watcom-OS2.zip diff --git a/vs2015/sdlnet/Xcode-iOS/SDL_net.xcodeproj/project.pbxproj b/vs/sdlnet/Xcode-iOS/SDL_net.xcodeproj/project.pbxproj similarity index 100% rename from vs2015/sdlnet/Xcode-iOS/SDL_net.xcodeproj/project.pbxproj rename to vs/sdlnet/Xcode-iOS/SDL_net.xcodeproj/project.pbxproj diff --git a/vs2015/sdlnet/Xcode/Info-Framework__Upgraded_.plist b/vs/sdlnet/Xcode/Info-Framework__Upgraded_.plist similarity index 100% rename from vs2015/sdlnet/Xcode/Info-Framework__Upgraded_.plist rename to vs/sdlnet/Xcode/Info-Framework__Upgraded_.plist diff --git a/vs2015/sdlnet/Xcode/SDL_net.xcodeproj/project.pbxproj b/vs/sdlnet/Xcode/SDL_net.xcodeproj/project.pbxproj similarity index 100% rename from vs2015/sdlnet/Xcode/SDL_net.xcodeproj/project.pbxproj rename to vs/sdlnet/Xcode/SDL_net.xcodeproj/project.pbxproj diff --git a/vs2015/sdlnet/Xcode/package b/vs/sdlnet/Xcode/package similarity index 100% rename from vs2015/sdlnet/Xcode/package rename to vs/sdlnet/Xcode/package diff --git a/vs2015/sdlnet/Xcode/pkg-support/SDL_net.info b/vs/sdlnet/Xcode/pkg-support/SDL_net.info similarity index 100% rename from vs2015/sdlnet/Xcode/pkg-support/SDL_net.info rename to vs/sdlnet/Xcode/pkg-support/SDL_net.info diff --git a/vs2015/sdlnet/Xcode/pkg-support/mkpackage.sh b/vs/sdlnet/Xcode/pkg-support/mkpackage.sh similarity index 100% rename from vs2015/sdlnet/Xcode/pkg-support/mkpackage.sh rename to vs/sdlnet/Xcode/pkg-support/mkpackage.sh diff --git a/vs2015/sdlnet/Xcode/pkg-support/resources/ReadMe.txt b/vs/sdlnet/Xcode/pkg-support/resources/ReadMe.txt similarity index 100% rename from vs2015/sdlnet/Xcode/pkg-support/resources/ReadMe.txt rename to vs/sdlnet/Xcode/pkg-support/resources/ReadMe.txt diff --git a/vs2015/sdlnet/Xcode/pkg-support/resources/Welcome.txt b/vs/sdlnet/Xcode/pkg-support/resources/Welcome.txt similarity index 100% rename from vs2015/sdlnet/Xcode/pkg-support/resources/Welcome.txt rename to vs/sdlnet/Xcode/pkg-support/resources/Welcome.txt diff --git a/vs2015/sdlnet/acinclude/libtool.m4 b/vs/sdlnet/acinclude/libtool.m4 similarity index 100% rename from vs2015/sdlnet/acinclude/libtool.m4 rename to vs/sdlnet/acinclude/libtool.m4 diff --git a/vs2015/sdlnet/acinclude/ltoptions.m4 b/vs/sdlnet/acinclude/ltoptions.m4 similarity index 100% rename from vs2015/sdlnet/acinclude/ltoptions.m4 rename to vs/sdlnet/acinclude/ltoptions.m4 diff --git a/vs2015/sdlnet/acinclude/ltsugar.m4 b/vs/sdlnet/acinclude/ltsugar.m4 similarity index 100% rename from vs2015/sdlnet/acinclude/ltsugar.m4 rename to vs/sdlnet/acinclude/ltsugar.m4 diff --git a/vs2015/sdlnet/acinclude/ltversion.m4 b/vs/sdlnet/acinclude/ltversion.m4 similarity index 100% rename from vs2015/sdlnet/acinclude/ltversion.m4 rename to vs/sdlnet/acinclude/ltversion.m4 diff --git a/vs2015/sdlnet/acinclude/lt~obsolete.m4 b/vs/sdlnet/acinclude/lt~obsolete.m4 similarity index 100% rename from vs2015/sdlnet/acinclude/lt~obsolete.m4 rename to vs/sdlnet/acinclude/lt~obsolete.m4 diff --git a/vs2015/sdlnet/acinclude/pkg.m4 b/vs/sdlnet/acinclude/pkg.m4 similarity index 100% rename from vs2015/sdlnet/acinclude/pkg.m4 rename to vs/sdlnet/acinclude/pkg.m4 diff --git a/vs2015/sdlnet/acinclude/sdl.m4 b/vs/sdlnet/acinclude/sdl.m4 similarity index 100% rename from vs2015/sdlnet/acinclude/sdl.m4 rename to vs/sdlnet/acinclude/sdl.m4 diff --git a/vs2015/sdlnet/acinclude/sdl2.m4 b/vs/sdlnet/acinclude/sdl2.m4 similarity index 100% rename from vs2015/sdlnet/acinclude/sdl2.m4 rename to vs/sdlnet/acinclude/sdl2.m4 diff --git a/vs2015/sdlnet/aclocal.m4 b/vs/sdlnet/aclocal.m4 similarity index 100% rename from vs2015/sdlnet/aclocal.m4 rename to vs/sdlnet/aclocal.m4 diff --git a/vs2015/sdlnet/autogen.sh b/vs/sdlnet/autogen.sh similarity index 100% rename from vs2015/sdlnet/autogen.sh rename to vs/sdlnet/autogen.sh diff --git a/vs2015/sdlnet/build-dosbox.sh b/vs/sdlnet/build-dosbox.sh similarity index 100% rename from vs2015/sdlnet/build-dosbox.sh rename to vs/sdlnet/build-dosbox.sh diff --git a/vs2015/sdlnet/chat.cpp b/vs/sdlnet/chat.cpp similarity index 100% rename from vs2015/sdlnet/chat.cpp rename to vs/sdlnet/chat.cpp diff --git a/vs2015/sdlnet/chat.h b/vs/sdlnet/chat.h similarity index 100% rename from vs2015/sdlnet/chat.h rename to vs/sdlnet/chat.h diff --git a/vs2015/sdlnet/chatd.c b/vs/sdlnet/chatd.c similarity index 100% rename from vs2015/sdlnet/chatd.c rename to vs/sdlnet/chatd.c diff --git a/vs2015/sdlnet/config.guess b/vs/sdlnet/config.guess similarity index 100% rename from vs2015/sdlnet/config.guess rename to vs/sdlnet/config.guess diff --git a/vs2015/sdlnet/config.sub b/vs/sdlnet/config.sub similarity index 100% rename from vs2015/sdlnet/config.sub rename to vs/sdlnet/config.sub diff --git a/vs2015/sdlnet/configure b/vs/sdlnet/configure similarity index 100% rename from vs2015/sdlnet/configure rename to vs/sdlnet/configure diff --git a/vs2015/sdlnet/configure.ac b/vs/sdlnet/configure.ac similarity index 100% rename from vs2015/sdlnet/configure.ac rename to vs/sdlnet/configure.ac diff --git a/vs2015/sdlnet/depcomp b/vs/sdlnet/depcomp similarity index 100% rename from vs2015/sdlnet/depcomp rename to vs/sdlnet/depcomp diff --git a/vs2015/sdlnet/gcc-fat.sh b/vs/sdlnet/gcc-fat.sh similarity index 100% rename from vs2015/sdlnet/gcc-fat.sh rename to vs/sdlnet/gcc-fat.sh diff --git a/vs2015/sdlnet/install-sh b/vs/sdlnet/install-sh similarity index 100% rename from vs2015/sdlnet/install-sh rename to vs/sdlnet/install-sh diff --git a/vs2015/sdlnet/ltmain.sh b/vs/sdlnet/ltmain.sh similarity index 100% rename from vs2015/sdlnet/ltmain.sh rename to vs/sdlnet/ltmain.sh diff --git a/vs2015/sdlnet/missing b/vs/sdlnet/missing similarity index 100% rename from vs2015/sdlnet/missing rename to vs/sdlnet/missing diff --git a/vs2015/sdlnet/quit.bmp b/vs/sdlnet/quit.bmp similarity index 100% rename from vs2015/sdlnet/quit.bmp rename to vs/sdlnet/quit.bmp diff --git a/vs2015/sdlnet/scroll_dn.bmp b/vs/sdlnet/scroll_dn.bmp similarity index 100% rename from vs2015/sdlnet/scroll_dn.bmp rename to vs/sdlnet/scroll_dn.bmp diff --git a/vs2015/sdlnet/scroll_up.bmp b/vs/sdlnet/scroll_up.bmp similarity index 100% rename from vs2015/sdlnet/scroll_up.bmp rename to vs/sdlnet/scroll_up.bmp diff --git a/vs2015/sdlnet/showinterfaces.c b/vs/sdlnet/showinterfaces.c similarity index 100% rename from vs2015/sdlnet/showinterfaces.c rename to vs/sdlnet/showinterfaces.c diff --git a/vs2015/sdlnet/version.rc b/vs/sdlnet/version.rc similarity index 100% rename from vs2015/sdlnet/version.rc rename to vs/sdlnet/version.rc diff --git a/vs2015/tool/zip.exe b/vs/tool/zip.exe similarity index 100% rename from vs2015/tool/zip.exe rename to vs/tool/zip.exe diff --git a/vs2015/unistd.h b/vs/unistd.h similarity index 100% rename from vs2015/unistd.h rename to vs/unistd.h diff --git a/vs2015/zlib/CMakeLists.txt b/vs/zlib/CMakeLists.txt similarity index 100% rename from vs2015/zlib/CMakeLists.txt rename to vs/zlib/CMakeLists.txt diff --git a/vs2015/zlib/ChangeLog b/vs/zlib/ChangeLog similarity index 100% rename from vs2015/zlib/ChangeLog rename to vs/zlib/ChangeLog diff --git a/vs2015/zlib/FAQ b/vs/zlib/FAQ similarity index 100% rename from vs2015/zlib/FAQ rename to vs/zlib/FAQ diff --git a/vs2015/zlib/INDEX b/vs/zlib/INDEX similarity index 100% rename from vs2015/zlib/INDEX rename to vs/zlib/INDEX diff --git a/vs2015/zlib/Makefile b/vs/zlib/Makefile similarity index 100% rename from vs2015/zlib/Makefile rename to vs/zlib/Makefile diff --git a/vs2015/zlib/Makefile.in b/vs/zlib/Makefile.in similarity index 100% rename from vs2015/zlib/Makefile.in rename to vs/zlib/Makefile.in diff --git a/vs2015/zlib/README b/vs/zlib/README similarity index 100% rename from vs2015/zlib/README rename to vs/zlib/README diff --git a/vs2015/zlib/adler32.c b/vs/zlib/adler32.c similarity index 100% rename from vs2015/zlib/adler32.c rename to vs/zlib/adler32.c diff --git a/vs2015/zlib/amiga/Makefile.pup b/vs/zlib/amiga/Makefile.pup similarity index 100% rename from vs2015/zlib/amiga/Makefile.pup rename to vs/zlib/amiga/Makefile.pup diff --git a/vs2015/zlib/amiga/Makefile.sas b/vs/zlib/amiga/Makefile.sas similarity index 100% rename from vs2015/zlib/amiga/Makefile.sas rename to vs/zlib/amiga/Makefile.sas diff --git a/vs2015/zlib/build-dosbox.sh b/vs/zlib/build-dosbox.sh similarity index 100% rename from vs2015/zlib/build-dosbox.sh rename to vs/zlib/build-dosbox.sh diff --git a/vs2015/zlib/compress.c b/vs/zlib/compress.c similarity index 100% rename from vs2015/zlib/compress.c rename to vs/zlib/compress.c diff --git a/vs2015/zlib/configure b/vs/zlib/configure similarity index 100% rename from vs2015/zlib/configure rename to vs/zlib/configure diff --git a/vs2015/zlib/contrib/README.contrib b/vs/zlib/contrib/README.contrib similarity index 100% rename from vs2015/zlib/contrib/README.contrib rename to vs/zlib/contrib/README.contrib diff --git a/vs2015/zlib/contrib/ada/buffer_demo.adb b/vs/zlib/contrib/ada/buffer_demo.adb similarity index 100% rename from vs2015/zlib/contrib/ada/buffer_demo.adb rename to vs/zlib/contrib/ada/buffer_demo.adb diff --git a/vs2015/zlib/contrib/ada/mtest.adb b/vs/zlib/contrib/ada/mtest.adb similarity index 100% rename from vs2015/zlib/contrib/ada/mtest.adb rename to vs/zlib/contrib/ada/mtest.adb diff --git a/vs2015/zlib/contrib/ada/read.adb b/vs/zlib/contrib/ada/read.adb similarity index 100% rename from vs2015/zlib/contrib/ada/read.adb rename to vs/zlib/contrib/ada/read.adb diff --git a/vs2015/zlib/contrib/ada/readme.txt b/vs/zlib/contrib/ada/readme.txt similarity index 100% rename from vs2015/zlib/contrib/ada/readme.txt rename to vs/zlib/contrib/ada/readme.txt diff --git a/vs2015/zlib/contrib/ada/test.adb b/vs/zlib/contrib/ada/test.adb similarity index 100% rename from vs2015/zlib/contrib/ada/test.adb rename to vs/zlib/contrib/ada/test.adb diff --git a/vs2015/zlib/contrib/ada/zlib-streams.adb b/vs/zlib/contrib/ada/zlib-streams.adb similarity index 100% rename from vs2015/zlib/contrib/ada/zlib-streams.adb rename to vs/zlib/contrib/ada/zlib-streams.adb diff --git a/vs2015/zlib/contrib/ada/zlib-streams.ads b/vs/zlib/contrib/ada/zlib-streams.ads similarity index 100% rename from vs2015/zlib/contrib/ada/zlib-streams.ads rename to vs/zlib/contrib/ada/zlib-streams.ads diff --git a/vs2015/zlib/contrib/ada/zlib-thin.adb b/vs/zlib/contrib/ada/zlib-thin.adb similarity index 100% rename from vs2015/zlib/contrib/ada/zlib-thin.adb rename to vs/zlib/contrib/ada/zlib-thin.adb diff --git a/vs2015/zlib/contrib/ada/zlib-thin.ads b/vs/zlib/contrib/ada/zlib-thin.ads similarity index 100% rename from vs2015/zlib/contrib/ada/zlib-thin.ads rename to vs/zlib/contrib/ada/zlib-thin.ads diff --git a/vs2015/zlib/contrib/ada/zlib.adb b/vs/zlib/contrib/ada/zlib.adb similarity index 100% rename from vs2015/zlib/contrib/ada/zlib.adb rename to vs/zlib/contrib/ada/zlib.adb diff --git a/vs2015/zlib/contrib/ada/zlib.ads b/vs/zlib/contrib/ada/zlib.ads similarity index 100% rename from vs2015/zlib/contrib/ada/zlib.ads rename to vs/zlib/contrib/ada/zlib.ads diff --git a/vs2015/zlib/contrib/ada/zlib.gpr b/vs/zlib/contrib/ada/zlib.gpr similarity index 100% rename from vs2015/zlib/contrib/ada/zlib.gpr rename to vs/zlib/contrib/ada/zlib.gpr diff --git a/vs2015/zlib/contrib/amd64/amd64-match.S b/vs/zlib/contrib/amd64/amd64-match.S similarity index 100% rename from vs2015/zlib/contrib/amd64/amd64-match.S rename to vs/zlib/contrib/amd64/amd64-match.S diff --git a/vs2015/zlib/contrib/asm686/README.686 b/vs/zlib/contrib/asm686/README.686 similarity index 100% rename from vs2015/zlib/contrib/asm686/README.686 rename to vs/zlib/contrib/asm686/README.686 diff --git a/vs2015/zlib/contrib/asm686/match.S b/vs/zlib/contrib/asm686/match.S similarity index 100% rename from vs2015/zlib/contrib/asm686/match.S rename to vs/zlib/contrib/asm686/match.S diff --git a/vs2015/zlib/contrib/blast/README b/vs/zlib/contrib/blast/README similarity index 100% rename from vs2015/zlib/contrib/blast/README rename to vs/zlib/contrib/blast/README diff --git a/vs2015/zlib/contrib/blast/blast.c b/vs/zlib/contrib/blast/blast.c similarity index 100% rename from vs2015/zlib/contrib/blast/blast.c rename to vs/zlib/contrib/blast/blast.c diff --git a/vs2015/zlib/contrib/blast/blast.h b/vs/zlib/contrib/blast/blast.h similarity index 100% rename from vs2015/zlib/contrib/blast/blast.h rename to vs/zlib/contrib/blast/blast.h diff --git a/vs2015/zlib/contrib/blast/test.pk b/vs/zlib/contrib/blast/test.pk similarity index 100% rename from vs2015/zlib/contrib/blast/test.pk rename to vs/zlib/contrib/blast/test.pk diff --git a/vs2015/zlib/contrib/blast/test.txt b/vs/zlib/contrib/blast/test.txt similarity index 100% rename from vs2015/zlib/contrib/blast/test.txt rename to vs/zlib/contrib/blast/test.txt diff --git a/vs2015/zlib/contrib/delphi/ZLib.pas b/vs/zlib/contrib/delphi/ZLib.pas similarity index 100% rename from vs2015/zlib/contrib/delphi/ZLib.pas rename to vs/zlib/contrib/delphi/ZLib.pas diff --git a/vs2015/zlib/contrib/delphi/ZLibConst.pas b/vs/zlib/contrib/delphi/ZLibConst.pas similarity index 100% rename from vs2015/zlib/contrib/delphi/ZLibConst.pas rename to vs/zlib/contrib/delphi/ZLibConst.pas diff --git a/vs2015/zlib/contrib/delphi/readme.txt b/vs/zlib/contrib/delphi/readme.txt similarity index 100% rename from vs2015/zlib/contrib/delphi/readme.txt rename to vs/zlib/contrib/delphi/readme.txt diff --git a/vs2015/zlib/contrib/delphi/zlibd32.mak b/vs/zlib/contrib/delphi/zlibd32.mak similarity index 100% rename from vs2015/zlib/contrib/delphi/zlibd32.mak rename to vs/zlib/contrib/delphi/zlibd32.mak diff --git a/vs2015/zlib/contrib/dotzlib/DotZLib.build b/vs/zlib/contrib/dotzlib/DotZLib.build similarity index 100% rename from vs2015/zlib/contrib/dotzlib/DotZLib.build rename to vs/zlib/contrib/dotzlib/DotZLib.build diff --git a/vs2015/zlib/contrib/dotzlib/DotZLib.chm b/vs/zlib/contrib/dotzlib/DotZLib.chm similarity index 100% rename from vs2015/zlib/contrib/dotzlib/DotZLib.chm rename to vs/zlib/contrib/dotzlib/DotZLib.chm diff --git a/vs2015/zlib/contrib/dotzlib/DotZLib.sln b/vs/zlib/contrib/dotzlib/DotZLib.sln similarity index 100% rename from vs2015/zlib/contrib/dotzlib/DotZLib.sln rename to vs/zlib/contrib/dotzlib/DotZLib.sln diff --git a/vs2015/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs b/vs/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs similarity index 100% rename from vs2015/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs rename to vs/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs diff --git a/vs2015/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs b/vs/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs similarity index 100% rename from vs2015/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs rename to vs/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs diff --git a/vs2015/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs b/vs/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs similarity index 100% rename from vs2015/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs rename to vs/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs diff --git a/vs2015/zlib/contrib/dotzlib/DotZLib/CodecBase.cs b/vs/zlib/contrib/dotzlib/DotZLib/CodecBase.cs similarity index 100% rename from vs2015/zlib/contrib/dotzlib/DotZLib/CodecBase.cs rename to vs/zlib/contrib/dotzlib/DotZLib/CodecBase.cs diff --git a/vs2015/zlib/contrib/dotzlib/DotZLib/Deflater.cs b/vs/zlib/contrib/dotzlib/DotZLib/Deflater.cs similarity index 100% rename from vs2015/zlib/contrib/dotzlib/DotZLib/Deflater.cs rename to vs/zlib/contrib/dotzlib/DotZLib/Deflater.cs diff --git a/vs2015/zlib/contrib/dotzlib/DotZLib/DotZLib.cs b/vs/zlib/contrib/dotzlib/DotZLib/DotZLib.cs similarity index 100% rename from vs2015/zlib/contrib/dotzlib/DotZLib/DotZLib.cs rename to vs/zlib/contrib/dotzlib/DotZLib/DotZLib.cs diff --git a/vs2015/zlib/contrib/dotzlib/DotZLib/DotZLib.csproj b/vs/zlib/contrib/dotzlib/DotZLib/DotZLib.csproj similarity index 100% rename from vs2015/zlib/contrib/dotzlib/DotZLib/DotZLib.csproj rename to vs/zlib/contrib/dotzlib/DotZLib/DotZLib.csproj diff --git a/vs2015/zlib/contrib/dotzlib/DotZLib/GZipStream.cs b/vs/zlib/contrib/dotzlib/DotZLib/GZipStream.cs similarity index 100% rename from vs2015/zlib/contrib/dotzlib/DotZLib/GZipStream.cs rename to vs/zlib/contrib/dotzlib/DotZLib/GZipStream.cs diff --git a/vs2015/zlib/contrib/dotzlib/DotZLib/Inflater.cs b/vs/zlib/contrib/dotzlib/DotZLib/Inflater.cs similarity index 100% rename from vs2015/zlib/contrib/dotzlib/DotZLib/Inflater.cs rename to vs/zlib/contrib/dotzlib/DotZLib/Inflater.cs diff --git a/vs2015/zlib/contrib/dotzlib/DotZLib/UnitTests.cs b/vs/zlib/contrib/dotzlib/DotZLib/UnitTests.cs similarity index 100% rename from vs2015/zlib/contrib/dotzlib/DotZLib/UnitTests.cs rename to vs/zlib/contrib/dotzlib/DotZLib/UnitTests.cs diff --git a/vs2015/zlib/contrib/dotzlib/LICENSE_1_0.txt b/vs/zlib/contrib/dotzlib/LICENSE_1_0.txt similarity index 100% rename from vs2015/zlib/contrib/dotzlib/LICENSE_1_0.txt rename to vs/zlib/contrib/dotzlib/LICENSE_1_0.txt diff --git a/vs2015/zlib/contrib/dotzlib/readme.txt b/vs/zlib/contrib/dotzlib/readme.txt similarity index 100% rename from vs2015/zlib/contrib/dotzlib/readme.txt rename to vs/zlib/contrib/dotzlib/readme.txt diff --git a/vs2015/zlib/contrib/gcc_gvmat64/gvmat64.S b/vs/zlib/contrib/gcc_gvmat64/gvmat64.S similarity index 100% rename from vs2015/zlib/contrib/gcc_gvmat64/gvmat64.S rename to vs/zlib/contrib/gcc_gvmat64/gvmat64.S diff --git a/vs2015/zlib/contrib/infback9/README b/vs/zlib/contrib/infback9/README similarity index 100% rename from vs2015/zlib/contrib/infback9/README rename to vs/zlib/contrib/infback9/README diff --git a/vs2015/zlib/contrib/infback9/infback9.c b/vs/zlib/contrib/infback9/infback9.c similarity index 100% rename from vs2015/zlib/contrib/infback9/infback9.c rename to vs/zlib/contrib/infback9/infback9.c diff --git a/vs2015/zlib/contrib/infback9/infback9.h b/vs/zlib/contrib/infback9/infback9.h similarity index 100% rename from vs2015/zlib/contrib/infback9/infback9.h rename to vs/zlib/contrib/infback9/infback9.h diff --git a/vs2015/zlib/contrib/infback9/inffix9.h b/vs/zlib/contrib/infback9/inffix9.h similarity index 100% rename from vs2015/zlib/contrib/infback9/inffix9.h rename to vs/zlib/contrib/infback9/inffix9.h diff --git a/vs2015/zlib/contrib/infback9/inflate9.h b/vs/zlib/contrib/infback9/inflate9.h similarity index 100% rename from vs2015/zlib/contrib/infback9/inflate9.h rename to vs/zlib/contrib/infback9/inflate9.h diff --git a/vs2015/zlib/contrib/infback9/inftree9.c b/vs/zlib/contrib/infback9/inftree9.c similarity index 100% rename from vs2015/zlib/contrib/infback9/inftree9.c rename to vs/zlib/contrib/infback9/inftree9.c diff --git a/vs2015/zlib/contrib/infback9/inftree9.h b/vs/zlib/contrib/infback9/inftree9.h similarity index 100% rename from vs2015/zlib/contrib/infback9/inftree9.h rename to vs/zlib/contrib/infback9/inftree9.h diff --git a/vs2015/zlib/contrib/inflate86/inffas86.c b/vs/zlib/contrib/inflate86/inffas86.c similarity index 100% rename from vs2015/zlib/contrib/inflate86/inffas86.c rename to vs/zlib/contrib/inflate86/inffas86.c diff --git a/vs2015/zlib/contrib/inflate86/inffast.S b/vs/zlib/contrib/inflate86/inffast.S similarity index 100% rename from vs2015/zlib/contrib/inflate86/inffast.S rename to vs/zlib/contrib/inflate86/inffast.S diff --git a/vs2015/zlib/contrib/iostream/test.cpp b/vs/zlib/contrib/iostream/test.cpp similarity index 100% rename from vs2015/zlib/contrib/iostream/test.cpp rename to vs/zlib/contrib/iostream/test.cpp diff --git a/vs2015/zlib/contrib/iostream/zfstream.cpp b/vs/zlib/contrib/iostream/zfstream.cpp similarity index 100% rename from vs2015/zlib/contrib/iostream/zfstream.cpp rename to vs/zlib/contrib/iostream/zfstream.cpp diff --git a/vs2015/zlib/contrib/iostream/zfstream.h b/vs/zlib/contrib/iostream/zfstream.h similarity index 100% rename from vs2015/zlib/contrib/iostream/zfstream.h rename to vs/zlib/contrib/iostream/zfstream.h diff --git a/vs2015/zlib/contrib/iostream2/zstream.h b/vs/zlib/contrib/iostream2/zstream.h similarity index 100% rename from vs2015/zlib/contrib/iostream2/zstream.h rename to vs/zlib/contrib/iostream2/zstream.h diff --git a/vs2015/zlib/contrib/iostream2/zstream_test.cpp b/vs/zlib/contrib/iostream2/zstream_test.cpp similarity index 100% rename from vs2015/zlib/contrib/iostream2/zstream_test.cpp rename to vs/zlib/contrib/iostream2/zstream_test.cpp diff --git a/vs2015/zlib/contrib/iostream3/README b/vs/zlib/contrib/iostream3/README similarity index 100% rename from vs2015/zlib/contrib/iostream3/README rename to vs/zlib/contrib/iostream3/README diff --git a/vs2015/zlib/contrib/iostream3/TODO b/vs/zlib/contrib/iostream3/TODO similarity index 100% rename from vs2015/zlib/contrib/iostream3/TODO rename to vs/zlib/contrib/iostream3/TODO diff --git a/vs2015/zlib/contrib/iostream3/test.cc b/vs/zlib/contrib/iostream3/test.cc similarity index 100% rename from vs2015/zlib/contrib/iostream3/test.cc rename to vs/zlib/contrib/iostream3/test.cc diff --git a/vs2015/zlib/contrib/iostream3/zfstream.cc b/vs/zlib/contrib/iostream3/zfstream.cc similarity index 100% rename from vs2015/zlib/contrib/iostream3/zfstream.cc rename to vs/zlib/contrib/iostream3/zfstream.cc diff --git a/vs2015/zlib/contrib/iostream3/zfstream.h b/vs/zlib/contrib/iostream3/zfstream.h similarity index 100% rename from vs2015/zlib/contrib/iostream3/zfstream.h rename to vs/zlib/contrib/iostream3/zfstream.h diff --git a/vs2015/zlib/contrib/masmx64/bld_ml64.bat b/vs/zlib/contrib/masmx64/bld_ml64.bat similarity index 100% rename from vs2015/zlib/contrib/masmx64/bld_ml64.bat rename to vs/zlib/contrib/masmx64/bld_ml64.bat diff --git a/vs2015/zlib/contrib/masmx64/gvmat64.asm b/vs/zlib/contrib/masmx64/gvmat64.asm similarity index 100% rename from vs2015/zlib/contrib/masmx64/gvmat64.asm rename to vs/zlib/contrib/masmx64/gvmat64.asm diff --git a/vs2015/zlib/contrib/masmx64/inffas8664.c b/vs/zlib/contrib/masmx64/inffas8664.c similarity index 100% rename from vs2015/zlib/contrib/masmx64/inffas8664.c rename to vs/zlib/contrib/masmx64/inffas8664.c diff --git a/vs2015/zlib/contrib/masmx64/inffasx64.asm b/vs/zlib/contrib/masmx64/inffasx64.asm similarity index 100% rename from vs2015/zlib/contrib/masmx64/inffasx64.asm rename to vs/zlib/contrib/masmx64/inffasx64.asm diff --git a/vs2015/zlib/contrib/masmx64/readme.txt b/vs/zlib/contrib/masmx64/readme.txt similarity index 100% rename from vs2015/zlib/contrib/masmx64/readme.txt rename to vs/zlib/contrib/masmx64/readme.txt diff --git a/vs2015/zlib/contrib/masmx86/bld_ml32.bat b/vs/zlib/contrib/masmx86/bld_ml32.bat similarity index 100% rename from vs2015/zlib/contrib/masmx86/bld_ml32.bat rename to vs/zlib/contrib/masmx86/bld_ml32.bat diff --git a/vs2015/zlib/contrib/masmx86/inffas32.asm b/vs/zlib/contrib/masmx86/inffas32.asm similarity index 100% rename from vs2015/zlib/contrib/masmx86/inffas32.asm rename to vs/zlib/contrib/masmx86/inffas32.asm diff --git a/vs2015/zlib/contrib/masmx86/match686.asm b/vs/zlib/contrib/masmx86/match686.asm similarity index 100% rename from vs2015/zlib/contrib/masmx86/match686.asm rename to vs/zlib/contrib/masmx86/match686.asm diff --git a/vs2015/zlib/contrib/masmx86/readme.txt b/vs/zlib/contrib/masmx86/readme.txt similarity index 100% rename from vs2015/zlib/contrib/masmx86/readme.txt rename to vs/zlib/contrib/masmx86/readme.txt diff --git a/vs2015/zlib/contrib/minizip/Makefile.am b/vs/zlib/contrib/minizip/Makefile.am similarity index 100% rename from vs2015/zlib/contrib/minizip/Makefile.am rename to vs/zlib/contrib/minizip/Makefile.am diff --git a/vs2015/zlib/contrib/minizip/MiniZip64_Changes.txt b/vs/zlib/contrib/minizip/MiniZip64_Changes.txt similarity index 100% rename from vs2015/zlib/contrib/minizip/MiniZip64_Changes.txt rename to vs/zlib/contrib/minizip/MiniZip64_Changes.txt diff --git a/vs2015/zlib/contrib/minizip/MiniZip64_info.txt b/vs/zlib/contrib/minizip/MiniZip64_info.txt similarity index 100% rename from vs2015/zlib/contrib/minizip/MiniZip64_info.txt rename to vs/zlib/contrib/minizip/MiniZip64_info.txt diff --git a/vs2015/zlib/contrib/minizip/configure.ac b/vs/zlib/contrib/minizip/configure.ac similarity index 100% rename from vs2015/zlib/contrib/minizip/configure.ac rename to vs/zlib/contrib/minizip/configure.ac diff --git a/vs2015/zlib/contrib/minizip/crypt.h b/vs/zlib/contrib/minizip/crypt.h similarity index 100% rename from vs2015/zlib/contrib/minizip/crypt.h rename to vs/zlib/contrib/minizip/crypt.h diff --git a/vs2015/zlib/contrib/minizip/ioapi.c b/vs/zlib/contrib/minizip/ioapi.c similarity index 100% rename from vs2015/zlib/contrib/minizip/ioapi.c rename to vs/zlib/contrib/minizip/ioapi.c diff --git a/vs2015/zlib/contrib/minizip/ioapi.h b/vs/zlib/contrib/minizip/ioapi.h similarity index 100% rename from vs2015/zlib/contrib/minizip/ioapi.h rename to vs/zlib/contrib/minizip/ioapi.h diff --git a/vs2015/zlib/contrib/minizip/iowin32.c b/vs/zlib/contrib/minizip/iowin32.c similarity index 100% rename from vs2015/zlib/contrib/minizip/iowin32.c rename to vs/zlib/contrib/minizip/iowin32.c diff --git a/vs2015/zlib/contrib/minizip/iowin32.h b/vs/zlib/contrib/minizip/iowin32.h similarity index 100% rename from vs2015/zlib/contrib/minizip/iowin32.h rename to vs/zlib/contrib/minizip/iowin32.h diff --git a/vs2015/zlib/contrib/minizip/make_vms.com b/vs/zlib/contrib/minizip/make_vms.com similarity index 100% rename from vs2015/zlib/contrib/minizip/make_vms.com rename to vs/zlib/contrib/minizip/make_vms.com diff --git a/vs2015/zlib/contrib/minizip/miniunz.c b/vs/zlib/contrib/minizip/miniunz.c similarity index 100% rename from vs2015/zlib/contrib/minizip/miniunz.c rename to vs/zlib/contrib/minizip/miniunz.c diff --git a/vs2015/zlib/contrib/minizip/miniunzip.1 b/vs/zlib/contrib/minizip/miniunzip.1 similarity index 100% rename from vs2015/zlib/contrib/minizip/miniunzip.1 rename to vs/zlib/contrib/minizip/miniunzip.1 diff --git a/vs2015/zlib/contrib/minizip/minizip.1 b/vs/zlib/contrib/minizip/minizip.1 similarity index 100% rename from vs2015/zlib/contrib/minizip/minizip.1 rename to vs/zlib/contrib/minizip/minizip.1 diff --git a/vs2015/zlib/contrib/minizip/minizip.c b/vs/zlib/contrib/minizip/minizip.c similarity index 100% rename from vs2015/zlib/contrib/minizip/minizip.c rename to vs/zlib/contrib/minizip/minizip.c diff --git a/vs2015/zlib/contrib/minizip/mztools.c b/vs/zlib/contrib/minizip/mztools.c similarity index 100% rename from vs2015/zlib/contrib/minizip/mztools.c rename to vs/zlib/contrib/minizip/mztools.c diff --git a/vs2015/zlib/contrib/minizip/mztools.h b/vs/zlib/contrib/minizip/mztools.h similarity index 100% rename from vs2015/zlib/contrib/minizip/mztools.h rename to vs/zlib/contrib/minizip/mztools.h diff --git a/vs2015/zlib/contrib/minizip/unzip.c b/vs/zlib/contrib/minizip/unzip.c similarity index 100% rename from vs2015/zlib/contrib/minizip/unzip.c rename to vs/zlib/contrib/minizip/unzip.c diff --git a/vs2015/zlib/contrib/minizip/unzip.h b/vs/zlib/contrib/minizip/unzip.h similarity index 100% rename from vs2015/zlib/contrib/minizip/unzip.h rename to vs/zlib/contrib/minizip/unzip.h diff --git a/vs2015/zlib/contrib/minizip/zip.c b/vs/zlib/contrib/minizip/zip.c similarity index 100% rename from vs2015/zlib/contrib/minizip/zip.c rename to vs/zlib/contrib/minizip/zip.c diff --git a/vs2015/zlib/contrib/minizip/zip.h b/vs/zlib/contrib/minizip/zip.h similarity index 100% rename from vs2015/zlib/contrib/minizip/zip.h rename to vs/zlib/contrib/minizip/zip.h diff --git a/vs2015/zlib/contrib/pascal/example.pas b/vs/zlib/contrib/pascal/example.pas similarity index 100% rename from vs2015/zlib/contrib/pascal/example.pas rename to vs/zlib/contrib/pascal/example.pas diff --git a/vs2015/zlib/contrib/pascal/readme.txt b/vs/zlib/contrib/pascal/readme.txt similarity index 100% rename from vs2015/zlib/contrib/pascal/readme.txt rename to vs/zlib/contrib/pascal/readme.txt diff --git a/vs2015/zlib/contrib/pascal/zlibd32.mak b/vs/zlib/contrib/pascal/zlibd32.mak similarity index 100% rename from vs2015/zlib/contrib/pascal/zlibd32.mak rename to vs/zlib/contrib/pascal/zlibd32.mak diff --git a/vs2015/zlib/contrib/pascal/zlibpas.pas b/vs/zlib/contrib/pascal/zlibpas.pas similarity index 100% rename from vs2015/zlib/contrib/pascal/zlibpas.pas rename to vs/zlib/contrib/pascal/zlibpas.pas diff --git a/vs2015/zlib/contrib/puff/README b/vs/zlib/contrib/puff/README similarity index 100% rename from vs2015/zlib/contrib/puff/README rename to vs/zlib/contrib/puff/README diff --git a/vs2015/zlib/contrib/puff/puff.c b/vs/zlib/contrib/puff/puff.c similarity index 100% rename from vs2015/zlib/contrib/puff/puff.c rename to vs/zlib/contrib/puff/puff.c diff --git a/vs2015/zlib/contrib/puff/puff.h b/vs/zlib/contrib/puff/puff.h similarity index 100% rename from vs2015/zlib/contrib/puff/puff.h rename to vs/zlib/contrib/puff/puff.h diff --git a/vs2015/zlib/contrib/puff/pufftest.c b/vs/zlib/contrib/puff/pufftest.c similarity index 100% rename from vs2015/zlib/contrib/puff/pufftest.c rename to vs/zlib/contrib/puff/pufftest.c diff --git a/vs2015/zlib/contrib/puff/zeros.raw b/vs/zlib/contrib/puff/zeros.raw similarity index 100% rename from vs2015/zlib/contrib/puff/zeros.raw rename to vs/zlib/contrib/puff/zeros.raw diff --git a/vs2015/zlib/contrib/testzlib/testzlib.c b/vs/zlib/contrib/testzlib/testzlib.c similarity index 100% rename from vs2015/zlib/contrib/testzlib/testzlib.c rename to vs/zlib/contrib/testzlib/testzlib.c diff --git a/vs2015/zlib/contrib/testzlib/testzlib.txt b/vs/zlib/contrib/testzlib/testzlib.txt similarity index 100% rename from vs2015/zlib/contrib/testzlib/testzlib.txt rename to vs/zlib/contrib/testzlib/testzlib.txt diff --git a/vs2015/zlib/contrib/untgz/Makefile.msc b/vs/zlib/contrib/untgz/Makefile.msc similarity index 100% rename from vs2015/zlib/contrib/untgz/Makefile.msc rename to vs/zlib/contrib/untgz/Makefile.msc diff --git a/vs2015/zlib/contrib/untgz/untgz.c b/vs/zlib/contrib/untgz/untgz.c similarity index 100% rename from vs2015/zlib/contrib/untgz/untgz.c rename to vs/zlib/contrib/untgz/untgz.c diff --git a/vs2015/zlib/contrib/vstudio/readme.txt b/vs/zlib/contrib/vstudio/readme.txt similarity index 100% rename from vs2015/zlib/contrib/vstudio/readme.txt rename to vs/zlib/contrib/vstudio/readme.txt diff --git a/vs2015/zlib/contrib/vstudio/vc10/miniunz.vcxproj b/vs/zlib/contrib/vstudio/vc10/miniunz.vcxproj similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc10/miniunz.vcxproj rename to vs/zlib/contrib/vstudio/vc10/miniunz.vcxproj diff --git a/vs2015/zlib/contrib/vstudio/vc10/miniunz.vcxproj.filters b/vs/zlib/contrib/vstudio/vc10/miniunz.vcxproj.filters similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc10/miniunz.vcxproj.filters rename to vs/zlib/contrib/vstudio/vc10/miniunz.vcxproj.filters diff --git a/vs2015/zlib/contrib/vstudio/vc10/minizip.vcxproj b/vs/zlib/contrib/vstudio/vc10/minizip.vcxproj similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc10/minizip.vcxproj rename to vs/zlib/contrib/vstudio/vc10/minizip.vcxproj diff --git a/vs2015/zlib/contrib/vstudio/vc10/minizip.vcxproj.filters b/vs/zlib/contrib/vstudio/vc10/minizip.vcxproj.filters similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc10/minizip.vcxproj.filters rename to vs/zlib/contrib/vstudio/vc10/minizip.vcxproj.filters diff --git a/vs2015/zlib/contrib/vstudio/vc10/testzlib.vcxproj b/vs/zlib/contrib/vstudio/vc10/testzlib.vcxproj similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc10/testzlib.vcxproj rename to vs/zlib/contrib/vstudio/vc10/testzlib.vcxproj diff --git a/vs2015/zlib/contrib/vstudio/vc10/testzlib.vcxproj.filters b/vs/zlib/contrib/vstudio/vc10/testzlib.vcxproj.filters similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc10/testzlib.vcxproj.filters rename to vs/zlib/contrib/vstudio/vc10/testzlib.vcxproj.filters diff --git a/vs2015/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj b/vs/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj rename to vs/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj diff --git a/vs2015/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj.filters b/vs/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj.filters similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj.filters rename to vs/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj.filters diff --git a/vs2015/zlib/contrib/vstudio/vc10/zlib.rc b/vs/zlib/contrib/vstudio/vc10/zlib.rc similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc10/zlib.rc rename to vs/zlib/contrib/vstudio/vc10/zlib.rc diff --git a/vs2015/zlib/contrib/vstudio/vc10/zlibstat.vcxproj b/vs/zlib/contrib/vstudio/vc10/zlibstat.vcxproj similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc10/zlibstat.vcxproj rename to vs/zlib/contrib/vstudio/vc10/zlibstat.vcxproj diff --git a/vs2015/zlib/contrib/vstudio/vc10/zlibstat.vcxproj.filters b/vs/zlib/contrib/vstudio/vc10/zlibstat.vcxproj.filters similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc10/zlibstat.vcxproj.filters rename to vs/zlib/contrib/vstudio/vc10/zlibstat.vcxproj.filters diff --git a/vs2015/zlib/contrib/vstudio/vc10/zlibvc.def b/vs/zlib/contrib/vstudio/vc10/zlibvc.def similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc10/zlibvc.def rename to vs/zlib/contrib/vstudio/vc10/zlibvc.def diff --git a/vs2015/zlib/contrib/vstudio/vc10/zlibvc.sln b/vs/zlib/contrib/vstudio/vc10/zlibvc.sln similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc10/zlibvc.sln rename to vs/zlib/contrib/vstudio/vc10/zlibvc.sln diff --git a/vs2015/zlib/contrib/vstudio/vc10/zlibvc.vcxproj b/vs/zlib/contrib/vstudio/vc10/zlibvc.vcxproj similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc10/zlibvc.vcxproj rename to vs/zlib/contrib/vstudio/vc10/zlibvc.vcxproj diff --git a/vs2015/zlib/contrib/vstudio/vc10/zlibvc.vcxproj.filters b/vs/zlib/contrib/vstudio/vc10/zlibvc.vcxproj.filters similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc10/zlibvc.vcxproj.filters rename to vs/zlib/contrib/vstudio/vc10/zlibvc.vcxproj.filters diff --git a/vs2015/zlib/contrib/vstudio/vc11/miniunz.vcxproj b/vs/zlib/contrib/vstudio/vc11/miniunz.vcxproj similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc11/miniunz.vcxproj rename to vs/zlib/contrib/vstudio/vc11/miniunz.vcxproj diff --git a/vs2015/zlib/contrib/vstudio/vc11/minizip.vcxproj b/vs/zlib/contrib/vstudio/vc11/minizip.vcxproj similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc11/minizip.vcxproj rename to vs/zlib/contrib/vstudio/vc11/minizip.vcxproj diff --git a/vs2015/zlib/contrib/vstudio/vc11/testzlib.vcxproj b/vs/zlib/contrib/vstudio/vc11/testzlib.vcxproj similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc11/testzlib.vcxproj rename to vs/zlib/contrib/vstudio/vc11/testzlib.vcxproj diff --git a/vs2015/zlib/contrib/vstudio/vc11/testzlibdll.vcxproj b/vs/zlib/contrib/vstudio/vc11/testzlibdll.vcxproj similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc11/testzlibdll.vcxproj rename to vs/zlib/contrib/vstudio/vc11/testzlibdll.vcxproj diff --git a/vs2015/zlib/contrib/vstudio/vc11/zlib.rc b/vs/zlib/contrib/vstudio/vc11/zlib.rc similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc11/zlib.rc rename to vs/zlib/contrib/vstudio/vc11/zlib.rc diff --git a/vs2015/zlib/contrib/vstudio/vc11/zlibstat.vcxproj b/vs/zlib/contrib/vstudio/vc11/zlibstat.vcxproj similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc11/zlibstat.vcxproj rename to vs/zlib/contrib/vstudio/vc11/zlibstat.vcxproj diff --git a/vs2015/zlib/contrib/vstudio/vc11/zlibvc.def b/vs/zlib/contrib/vstudio/vc11/zlibvc.def similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc11/zlibvc.def rename to vs/zlib/contrib/vstudio/vc11/zlibvc.def diff --git a/vs2015/zlib/contrib/vstudio/vc11/zlibvc.sln b/vs/zlib/contrib/vstudio/vc11/zlibvc.sln similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc11/zlibvc.sln rename to vs/zlib/contrib/vstudio/vc11/zlibvc.sln diff --git a/vs2015/zlib/contrib/vstudio/vc11/zlibvc.vcxproj b/vs/zlib/contrib/vstudio/vc11/zlibvc.vcxproj similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc11/zlibvc.vcxproj rename to vs/zlib/contrib/vstudio/vc11/zlibvc.vcxproj diff --git a/vs2015/zlib/contrib/vstudio/vc12/miniunz.vcxproj b/vs/zlib/contrib/vstudio/vc12/miniunz.vcxproj similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc12/miniunz.vcxproj rename to vs/zlib/contrib/vstudio/vc12/miniunz.vcxproj diff --git a/vs2015/zlib/contrib/vstudio/vc12/minizip.vcxproj b/vs/zlib/contrib/vstudio/vc12/minizip.vcxproj similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc12/minizip.vcxproj rename to vs/zlib/contrib/vstudio/vc12/minizip.vcxproj diff --git a/vs2015/zlib/contrib/vstudio/vc12/testzlib.vcxproj b/vs/zlib/contrib/vstudio/vc12/testzlib.vcxproj similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc12/testzlib.vcxproj rename to vs/zlib/contrib/vstudio/vc12/testzlib.vcxproj diff --git a/vs2015/zlib/contrib/vstudio/vc12/testzlibdll.vcxproj b/vs/zlib/contrib/vstudio/vc12/testzlibdll.vcxproj similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc12/testzlibdll.vcxproj rename to vs/zlib/contrib/vstudio/vc12/testzlibdll.vcxproj diff --git a/vs2015/zlib/contrib/vstudio/vc12/zlib.rc b/vs/zlib/contrib/vstudio/vc12/zlib.rc similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc12/zlib.rc rename to vs/zlib/contrib/vstudio/vc12/zlib.rc diff --git a/vs2015/zlib/contrib/vstudio/vc12/zlibstat.vcxproj b/vs/zlib/contrib/vstudio/vc12/zlibstat.vcxproj similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc12/zlibstat.vcxproj rename to vs/zlib/contrib/vstudio/vc12/zlibstat.vcxproj diff --git a/vs2015/zlib/contrib/vstudio/vc12/zlibvc.def b/vs/zlib/contrib/vstudio/vc12/zlibvc.def similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc12/zlibvc.def rename to vs/zlib/contrib/vstudio/vc12/zlibvc.def diff --git a/vs2015/zlib/contrib/vstudio/vc12/zlibvc.sln b/vs/zlib/contrib/vstudio/vc12/zlibvc.sln similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc12/zlibvc.sln rename to vs/zlib/contrib/vstudio/vc12/zlibvc.sln diff --git a/vs2015/zlib/contrib/vstudio/vc12/zlibvc.vcxproj b/vs/zlib/contrib/vstudio/vc12/zlibvc.vcxproj similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc12/zlibvc.vcxproj rename to vs/zlib/contrib/vstudio/vc12/zlibvc.vcxproj diff --git a/vs2015/zlib/contrib/vstudio/vc14/miniunz.vcxproj b/vs/zlib/contrib/vstudio/vc14/miniunz.vcxproj similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc14/miniunz.vcxproj rename to vs/zlib/contrib/vstudio/vc14/miniunz.vcxproj diff --git a/vs2015/zlib/contrib/vstudio/vc14/minizip.vcxproj b/vs/zlib/contrib/vstudio/vc14/minizip.vcxproj similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc14/minizip.vcxproj rename to vs/zlib/contrib/vstudio/vc14/minizip.vcxproj diff --git a/vs2015/zlib/contrib/vstudio/vc14/testzlib.vcxproj b/vs/zlib/contrib/vstudio/vc14/testzlib.vcxproj similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc14/testzlib.vcxproj rename to vs/zlib/contrib/vstudio/vc14/testzlib.vcxproj diff --git a/vs2015/zlib/contrib/vstudio/vc14/testzlibdll.vcxproj b/vs/zlib/contrib/vstudio/vc14/testzlibdll.vcxproj similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc14/testzlibdll.vcxproj rename to vs/zlib/contrib/vstudio/vc14/testzlibdll.vcxproj diff --git a/vs2015/zlib/contrib/vstudio/vc14/zlib.rc b/vs/zlib/contrib/vstudio/vc14/zlib.rc similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc14/zlib.rc rename to vs/zlib/contrib/vstudio/vc14/zlib.rc diff --git a/vs2015/zlib/contrib/vstudio/vc14/zlibstat.vcxproj b/vs/zlib/contrib/vstudio/vc14/zlibstat.vcxproj similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc14/zlibstat.vcxproj rename to vs/zlib/contrib/vstudio/vc14/zlibstat.vcxproj diff --git a/vs2015/zlib/contrib/vstudio/vc14/zlibvc.def b/vs/zlib/contrib/vstudio/vc14/zlibvc.def similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc14/zlibvc.def rename to vs/zlib/contrib/vstudio/vc14/zlibvc.def diff --git a/vs2015/zlib/contrib/vstudio/vc14/zlibvc.sln b/vs/zlib/contrib/vstudio/vc14/zlibvc.sln similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc14/zlibvc.sln rename to vs/zlib/contrib/vstudio/vc14/zlibvc.sln diff --git a/vs2015/zlib/contrib/vstudio/vc14/zlibvc.vcxproj b/vs/zlib/contrib/vstudio/vc14/zlibvc.vcxproj similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc14/zlibvc.vcxproj rename to vs/zlib/contrib/vstudio/vc14/zlibvc.vcxproj diff --git a/vs2015/zlib/contrib/vstudio/vc9/miniunz.vcproj b/vs/zlib/contrib/vstudio/vc9/miniunz.vcproj similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc9/miniunz.vcproj rename to vs/zlib/contrib/vstudio/vc9/miniunz.vcproj diff --git a/vs2015/zlib/contrib/vstudio/vc9/minizip.vcproj b/vs/zlib/contrib/vstudio/vc9/minizip.vcproj similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc9/minizip.vcproj rename to vs/zlib/contrib/vstudio/vc9/minizip.vcproj diff --git a/vs2015/zlib/contrib/vstudio/vc9/testzlib.vcproj b/vs/zlib/contrib/vstudio/vc9/testzlib.vcproj similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc9/testzlib.vcproj rename to vs/zlib/contrib/vstudio/vc9/testzlib.vcproj diff --git a/vs2015/zlib/contrib/vstudio/vc9/testzlibdll.vcproj b/vs/zlib/contrib/vstudio/vc9/testzlibdll.vcproj similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc9/testzlibdll.vcproj rename to vs/zlib/contrib/vstudio/vc9/testzlibdll.vcproj diff --git a/vs2015/zlib/contrib/vstudio/vc9/zlib.rc b/vs/zlib/contrib/vstudio/vc9/zlib.rc similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc9/zlib.rc rename to vs/zlib/contrib/vstudio/vc9/zlib.rc diff --git a/vs2015/zlib/contrib/vstudio/vc9/zlibstat.vcproj b/vs/zlib/contrib/vstudio/vc9/zlibstat.vcproj similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc9/zlibstat.vcproj rename to vs/zlib/contrib/vstudio/vc9/zlibstat.vcproj diff --git a/vs2015/zlib/contrib/vstudio/vc9/zlibvc.def b/vs/zlib/contrib/vstudio/vc9/zlibvc.def similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc9/zlibvc.def rename to vs/zlib/contrib/vstudio/vc9/zlibvc.def diff --git a/vs2015/zlib/contrib/vstudio/vc9/zlibvc.sln b/vs/zlib/contrib/vstudio/vc9/zlibvc.sln similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc9/zlibvc.sln rename to vs/zlib/contrib/vstudio/vc9/zlibvc.sln diff --git a/vs2015/zlib/contrib/vstudio/vc9/zlibvc.vcproj b/vs/zlib/contrib/vstudio/vc9/zlibvc.vcproj similarity index 100% rename from vs2015/zlib/contrib/vstudio/vc9/zlibvc.vcproj rename to vs/zlib/contrib/vstudio/vc9/zlibvc.vcproj diff --git a/vs2015/zlib/crc32.c b/vs/zlib/crc32.c similarity index 100% rename from vs2015/zlib/crc32.c rename to vs/zlib/crc32.c diff --git a/vs2015/zlib/crc32.h b/vs/zlib/crc32.h similarity index 100% rename from vs2015/zlib/crc32.h rename to vs/zlib/crc32.h diff --git a/vs2015/zlib/deflate.c b/vs/zlib/deflate.c similarity index 100% rename from vs2015/zlib/deflate.c rename to vs/zlib/deflate.c diff --git a/vs2015/zlib/deflate.h b/vs/zlib/deflate.h similarity index 100% rename from vs2015/zlib/deflate.h rename to vs/zlib/deflate.h diff --git a/vs2015/zlib/doc/algorithm.txt b/vs/zlib/doc/algorithm.txt similarity index 100% rename from vs2015/zlib/doc/algorithm.txt rename to vs/zlib/doc/algorithm.txt diff --git a/vs2015/zlib/doc/rfc1950.txt b/vs/zlib/doc/rfc1950.txt similarity index 100% rename from vs2015/zlib/doc/rfc1950.txt rename to vs/zlib/doc/rfc1950.txt diff --git a/vs2015/zlib/doc/rfc1951.txt b/vs/zlib/doc/rfc1951.txt similarity index 100% rename from vs2015/zlib/doc/rfc1951.txt rename to vs/zlib/doc/rfc1951.txt diff --git a/vs2015/zlib/doc/rfc1952.txt b/vs/zlib/doc/rfc1952.txt similarity index 100% rename from vs2015/zlib/doc/rfc1952.txt rename to vs/zlib/doc/rfc1952.txt diff --git a/vs2015/zlib/doc/txtvsbin.txt b/vs/zlib/doc/txtvsbin.txt similarity index 100% rename from vs2015/zlib/doc/txtvsbin.txt rename to vs/zlib/doc/txtvsbin.txt diff --git a/vs2015/zlib/examples/README.examples b/vs/zlib/examples/README.examples similarity index 100% rename from vs2015/zlib/examples/README.examples rename to vs/zlib/examples/README.examples diff --git a/vs2015/zlib/examples/enough.c b/vs/zlib/examples/enough.c similarity index 100% rename from vs2015/zlib/examples/enough.c rename to vs/zlib/examples/enough.c diff --git a/vs2015/zlib/examples/fitblk.c b/vs/zlib/examples/fitblk.c similarity index 100% rename from vs2015/zlib/examples/fitblk.c rename to vs/zlib/examples/fitblk.c diff --git a/vs2015/zlib/examples/gun.c b/vs/zlib/examples/gun.c similarity index 100% rename from vs2015/zlib/examples/gun.c rename to vs/zlib/examples/gun.c diff --git a/vs2015/zlib/examples/gzappend.c b/vs/zlib/examples/gzappend.c similarity index 100% rename from vs2015/zlib/examples/gzappend.c rename to vs/zlib/examples/gzappend.c diff --git a/vs2015/zlib/examples/gzjoin.c b/vs/zlib/examples/gzjoin.c similarity index 100% rename from vs2015/zlib/examples/gzjoin.c rename to vs/zlib/examples/gzjoin.c diff --git a/vs2015/zlib/examples/gzlog.c b/vs/zlib/examples/gzlog.c similarity index 100% rename from vs2015/zlib/examples/gzlog.c rename to vs/zlib/examples/gzlog.c diff --git a/vs2015/zlib/examples/gzlog.h b/vs/zlib/examples/gzlog.h similarity index 100% rename from vs2015/zlib/examples/gzlog.h rename to vs/zlib/examples/gzlog.h diff --git a/vs2015/zlib/examples/zlib_how.html b/vs/zlib/examples/zlib_how.html similarity index 100% rename from vs2015/zlib/examples/zlib_how.html rename to vs/zlib/examples/zlib_how.html diff --git a/vs2015/zlib/examples/zpipe.c b/vs/zlib/examples/zpipe.c similarity index 100% rename from vs2015/zlib/examples/zpipe.c rename to vs/zlib/examples/zpipe.c diff --git a/vs2015/zlib/examples/zran.c b/vs/zlib/examples/zran.c similarity index 100% rename from vs2015/zlib/examples/zran.c rename to vs/zlib/examples/zran.c diff --git a/vs2015/zlib/gzclose.c b/vs/zlib/gzclose.c similarity index 100% rename from vs2015/zlib/gzclose.c rename to vs/zlib/gzclose.c diff --git a/vs2015/zlib/gzguts.h b/vs/zlib/gzguts.h similarity index 100% rename from vs2015/zlib/gzguts.h rename to vs/zlib/gzguts.h diff --git a/vs2015/zlib/gzlib.c b/vs/zlib/gzlib.c similarity index 100% rename from vs2015/zlib/gzlib.c rename to vs/zlib/gzlib.c diff --git a/vs2015/zlib/gzread.c b/vs/zlib/gzread.c similarity index 100% rename from vs2015/zlib/gzread.c rename to vs/zlib/gzread.c diff --git a/vs2015/zlib/gzwrite.c b/vs/zlib/gzwrite.c similarity index 100% rename from vs2015/zlib/gzwrite.c rename to vs/zlib/gzwrite.c diff --git a/vs2015/zlib/infback.c b/vs/zlib/infback.c similarity index 100% rename from vs2015/zlib/infback.c rename to vs/zlib/infback.c diff --git a/vs2015/zlib/inffast.c b/vs/zlib/inffast.c similarity index 100% rename from vs2015/zlib/inffast.c rename to vs/zlib/inffast.c diff --git a/vs2015/zlib/inffast.h b/vs/zlib/inffast.h similarity index 100% rename from vs2015/zlib/inffast.h rename to vs/zlib/inffast.h diff --git a/vs2015/zlib/inffixed.h b/vs/zlib/inffixed.h similarity index 100% rename from vs2015/zlib/inffixed.h rename to vs/zlib/inffixed.h diff --git a/vs2015/zlib/inflate.c b/vs/zlib/inflate.c similarity index 100% rename from vs2015/zlib/inflate.c rename to vs/zlib/inflate.c diff --git a/vs2015/zlib/inflate.h b/vs/zlib/inflate.h similarity index 100% rename from vs2015/zlib/inflate.h rename to vs/zlib/inflate.h diff --git a/vs2015/zlib/inftrees.c b/vs/zlib/inftrees.c similarity index 100% rename from vs2015/zlib/inftrees.c rename to vs/zlib/inftrees.c diff --git a/vs2015/zlib/inftrees.h b/vs/zlib/inftrees.h similarity index 100% rename from vs2015/zlib/inftrees.h rename to vs/zlib/inftrees.h diff --git a/vs2015/zlib/make_vms.com b/vs/zlib/make_vms.com similarity index 100% rename from vs2015/zlib/make_vms.com rename to vs/zlib/make_vms.com diff --git a/vs2015/zlib/msdos/Makefile.bor b/vs/zlib/msdos/Makefile.bor similarity index 100% rename from vs2015/zlib/msdos/Makefile.bor rename to vs/zlib/msdos/Makefile.bor diff --git a/vs2015/zlib/msdos/Makefile.dj2 b/vs/zlib/msdos/Makefile.dj2 similarity index 100% rename from vs2015/zlib/msdos/Makefile.dj2 rename to vs/zlib/msdos/Makefile.dj2 diff --git a/vs2015/zlib/msdos/Makefile.emx b/vs/zlib/msdos/Makefile.emx similarity index 100% rename from vs2015/zlib/msdos/Makefile.emx rename to vs/zlib/msdos/Makefile.emx diff --git a/vs2015/zlib/msdos/Makefile.msc b/vs/zlib/msdos/Makefile.msc similarity index 100% rename from vs2015/zlib/msdos/Makefile.msc rename to vs/zlib/msdos/Makefile.msc diff --git a/vs2015/zlib/msdos/Makefile.tc b/vs/zlib/msdos/Makefile.tc similarity index 100% rename from vs2015/zlib/msdos/Makefile.tc rename to vs/zlib/msdos/Makefile.tc diff --git a/vs2015/zlib/nintendods/README b/vs/zlib/nintendods/README similarity index 100% rename from vs2015/zlib/nintendods/README rename to vs/zlib/nintendods/README diff --git a/vs2015/zlib/old/Makefile.emx b/vs/zlib/old/Makefile.emx similarity index 100% rename from vs2015/zlib/old/Makefile.emx rename to vs/zlib/old/Makefile.emx diff --git a/vs2015/zlib/old/Makefile.riscos b/vs/zlib/old/Makefile.riscos similarity index 100% rename from vs2015/zlib/old/Makefile.riscos rename to vs/zlib/old/Makefile.riscos diff --git a/vs2015/zlib/old/README b/vs/zlib/old/README similarity index 100% rename from vs2015/zlib/old/README rename to vs/zlib/old/README diff --git a/vs2015/zlib/old/descrip.mms b/vs/zlib/old/descrip.mms similarity index 100% rename from vs2015/zlib/old/descrip.mms rename to vs/zlib/old/descrip.mms diff --git a/vs2015/zlib/old/os2/Makefile.os2 b/vs/zlib/old/os2/Makefile.os2 similarity index 100% rename from vs2015/zlib/old/os2/Makefile.os2 rename to vs/zlib/old/os2/Makefile.os2 diff --git a/vs2015/zlib/old/os2/zlib.def b/vs/zlib/old/os2/zlib.def similarity index 100% rename from vs2015/zlib/old/os2/zlib.def rename to vs/zlib/old/os2/zlib.def diff --git a/vs2015/zlib/old/visual-basic.txt b/vs/zlib/old/visual-basic.txt similarity index 100% rename from vs2015/zlib/old/visual-basic.txt rename to vs/zlib/old/visual-basic.txt diff --git a/vs2015/zlib/os400/README400 b/vs/zlib/os400/README400 similarity index 100% rename from vs2015/zlib/os400/README400 rename to vs/zlib/os400/README400 diff --git a/vs2015/zlib/os400/bndsrc b/vs/zlib/os400/bndsrc similarity index 100% rename from vs2015/zlib/os400/bndsrc rename to vs/zlib/os400/bndsrc diff --git a/vs2015/zlib/os400/make.sh b/vs/zlib/os400/make.sh similarity index 100% rename from vs2015/zlib/os400/make.sh rename to vs/zlib/os400/make.sh diff --git a/vs2015/zlib/os400/zlib.inc b/vs/zlib/os400/zlib.inc similarity index 100% rename from vs2015/zlib/os400/zlib.inc rename to vs/zlib/os400/zlib.inc diff --git a/vs2015/zlib/qnx/package.qpg b/vs/zlib/qnx/package.qpg similarity index 100% rename from vs2015/zlib/qnx/package.qpg rename to vs/zlib/qnx/package.qpg diff --git a/vs2015/zlib/test/example.c b/vs/zlib/test/example.c similarity index 100% rename from vs2015/zlib/test/example.c rename to vs/zlib/test/example.c diff --git a/vs2015/zlib/test/infcover.c b/vs/zlib/test/infcover.c similarity index 100% rename from vs2015/zlib/test/infcover.c rename to vs/zlib/test/infcover.c diff --git a/vs2015/zlib/test/minigzip.c b/vs/zlib/test/minigzip.c similarity index 100% rename from vs2015/zlib/test/minigzip.c rename to vs/zlib/test/minigzip.c diff --git a/vs2015/zlib/treebuild.xml b/vs/zlib/treebuild.xml similarity index 100% rename from vs2015/zlib/treebuild.xml rename to vs/zlib/treebuild.xml diff --git a/vs2015/zlib/trees.c b/vs/zlib/trees.c similarity index 100% rename from vs2015/zlib/trees.c rename to vs/zlib/trees.c diff --git a/vs2015/zlib/trees.h b/vs/zlib/trees.h similarity index 100% rename from vs2015/zlib/trees.h rename to vs/zlib/trees.h diff --git a/vs2015/zlib/uncompr.c b/vs/zlib/uncompr.c similarity index 100% rename from vs2015/zlib/uncompr.c rename to vs/zlib/uncompr.c diff --git a/vs2015/zlib/watcom/watcom_f.mak b/vs/zlib/watcom/watcom_f.mak similarity index 100% rename from vs2015/zlib/watcom/watcom_f.mak rename to vs/zlib/watcom/watcom_f.mak diff --git a/vs2015/zlib/watcom/watcom_l.mak b/vs/zlib/watcom/watcom_l.mak similarity index 100% rename from vs2015/zlib/watcom/watcom_l.mak rename to vs/zlib/watcom/watcom_l.mak diff --git a/vs2015/zlib/win32/DLL_FAQ.txt b/vs/zlib/win32/DLL_FAQ.txt similarity index 100% rename from vs2015/zlib/win32/DLL_FAQ.txt rename to vs/zlib/win32/DLL_FAQ.txt diff --git a/vs2015/zlib/win32/Makefile.bor b/vs/zlib/win32/Makefile.bor similarity index 100% rename from vs2015/zlib/win32/Makefile.bor rename to vs/zlib/win32/Makefile.bor diff --git a/vs2015/zlib/win32/Makefile.gcc b/vs/zlib/win32/Makefile.gcc similarity index 100% rename from vs2015/zlib/win32/Makefile.gcc rename to vs/zlib/win32/Makefile.gcc diff --git a/vs2015/zlib/win32/Makefile.msc b/vs/zlib/win32/Makefile.msc similarity index 100% rename from vs2015/zlib/win32/Makefile.msc rename to vs/zlib/win32/Makefile.msc diff --git a/vs2015/zlib/win32/README-WIN32.txt b/vs/zlib/win32/README-WIN32.txt similarity index 100% rename from vs2015/zlib/win32/README-WIN32.txt rename to vs/zlib/win32/README-WIN32.txt diff --git a/vs2015/zlib/win32/VisualC.txt b/vs/zlib/win32/VisualC.txt similarity index 100% rename from vs2015/zlib/win32/VisualC.txt rename to vs/zlib/win32/VisualC.txt diff --git a/vs2015/zlib/win32/zlib.def b/vs/zlib/win32/zlib.def similarity index 100% rename from vs2015/zlib/win32/zlib.def rename to vs/zlib/win32/zlib.def diff --git a/vs2015/zlib/win32/zlib1.rc b/vs/zlib/win32/zlib1.rc similarity index 100% rename from vs2015/zlib/win32/zlib1.rc rename to vs/zlib/win32/zlib1.rc diff --git a/vs2015/zlib/zconf.h b/vs/zlib/zconf.h similarity index 100% rename from vs2015/zlib/zconf.h rename to vs/zlib/zconf.h diff --git a/vs2015/zlib/zconf.h.cmakein b/vs/zlib/zconf.h.cmakein similarity index 100% rename from vs2015/zlib/zconf.h.cmakein rename to vs/zlib/zconf.h.cmakein diff --git a/vs2015/zlib/zconf.h.in b/vs/zlib/zconf.h.in similarity index 100% rename from vs2015/zlib/zconf.h.in rename to vs/zlib/zconf.h.in diff --git a/vs2015/zlib/zlib.3 b/vs/zlib/zlib.3 similarity index 100% rename from vs2015/zlib/zlib.3 rename to vs/zlib/zlib.3 diff --git a/vs2015/zlib/zlib.3.pdf b/vs/zlib/zlib.3.pdf similarity index 100% rename from vs2015/zlib/zlib.3.pdf rename to vs/zlib/zlib.3.pdf diff --git a/vs2015/zlib/zlib.h b/vs/zlib/zlib.h similarity index 100% rename from vs2015/zlib/zlib.h rename to vs/zlib/zlib.h diff --git a/vs2015/zlib/zlib.map b/vs/zlib/zlib.map similarity index 100% rename from vs2015/zlib/zlib.map rename to vs/zlib/zlib.map diff --git a/vs2015/zlib/zlib.pc.cmakein b/vs/zlib/zlib.pc.cmakein similarity index 100% rename from vs2015/zlib/zlib.pc.cmakein rename to vs/zlib/zlib.pc.cmakein diff --git a/vs2015/zlib/zlib.pc.in b/vs/zlib/zlib.pc.in similarity index 100% rename from vs2015/zlib/zlib.pc.in rename to vs/zlib/zlib.pc.in diff --git a/vs2015/zlib/zlib/zlib.vcxproj b/vs/zlib/zlib/zlib.vcxproj similarity index 100% rename from vs2015/zlib/zlib/zlib.vcxproj rename to vs/zlib/zlib/zlib.vcxproj diff --git a/vs2015/zlib/zlib/zlib.vcxproj.filters b/vs/zlib/zlib/zlib.vcxproj.filters similarity index 100% rename from vs2015/zlib/zlib/zlib.vcxproj.filters rename to vs/zlib/zlib/zlib.vcxproj.filters diff --git a/vs2015/zlib/zlib2ansi b/vs/zlib/zlib2ansi similarity index 100% rename from vs2015/zlib/zlib2ansi rename to vs/zlib/zlib2ansi diff --git a/vs2015/zlib/zutil.c b/vs/zlib/zutil.c similarity index 100% rename from vs2015/zlib/zutil.c rename to vs/zlib/zutil.c diff --git a/vs2015/zlib/zutil.h b/vs/zlib/zutil.h similarity index 100% rename from vs2015/zlib/zutil.h rename to vs/zlib/zutil.h