diff --git a/CMakeLists.txt b/CMakeLists.txt index ae2fb7f..090709f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,38 +73,38 @@ ENDIF(MSVC) # Basic chunks of source code ... SET(ZLIB_SRCS - zlib123/adler32.c - zlib123/compress.c - zlib123/crc32.c - zlib123/deflate.c - zlib123/gzio.c - zlib123/infback.c - zlib123/inffast.c - zlib123/inflate.c - zlib123/inftrees.c - zlib123/trees.c - zlib123/uncompr.c - zlib123/zutil.c + src/zlib123/adler32.c + src/zlib123/compress.c + src/zlib123/crc32.c + src/zlib123/deflate.c + src/zlib123/gzio.c + src/zlib123/infback.c + src/zlib123/inffast.c + src/zlib123/inflate.c + src/zlib123/inftrees.c + src/zlib123/trees.c + src/zlib123/uncompr.c + src/zlib123/zutil.c ) SET(LZMA_SRCS - lzma/C/7zCrc.c - lzma/C/Archive/7z/7zBuffer.c - lzma/C/Archive/7z/7zDecode.c - lzma/C/Archive/7z/7zExtract.c - lzma/C/Archive/7z/7zHeader.c - lzma/C/Archive/7z/7zIn.c - lzma/C/Archive/7z/7zItem.c - lzma/C/Archive/7z/7zMethodID.c - lzma/C/Compress/Branch/BranchX86.c - lzma/C/Compress/Branch/BranchX86_2.c - lzma/C/Compress/Lzma/LzmaDecode.c + src/lzma/C/7zCrc.c + src/lzma/C/Archive/7z/7zBuffer.c + src/lzma/C/Archive/7z/7zDecode.c + src/lzma/C/Archive/7z/7zExtract.c + src/lzma/C/Archive/7z/7zHeader.c + src/lzma/C/Archive/7z/7zIn.c + src/lzma/C/Archive/7z/7zItem.c + src/lzma/C/Archive/7z/7zMethodID.c + src/lzma/C/Compress/Branch/BranchX86.c + src/lzma/C/Compress/Branch/BranchX86_2.c + src/lzma/C/Compress/Lzma/LzmaDecode.c ) IF(BEOS) # We add this explicitly, since we don't want CMake to think this # is a C++ project unless we're on BeOS. - SET(PHYSFS_BEOS_SRCS platform/beos.cpp) + SET(PHYSFS_BEOS_SRCS src/platform_beos.cpp) SET(OPTIONAL_LIBRARY_LIBS ${OPTIONAL_LIBRARY_LIBS} be root) ENDIF(BEOS) @@ -113,23 +113,23 @@ ENDIF(BEOS) # another project or bring up a new build system: just compile all the source # code and #define the things you want. SET(PHYSFS_SRCS - physfs.c - physfs_byteorder.c - physfs_unicode.c - platform/os2.c - platform/pocketpc.c - platform/posix.c - platform/unix.c - platform/macosx.c - platform/windows.c - archivers/dir.c - archivers/grp.c - archivers/hog.c - archivers/lzma.c - archivers/mvl.c - archivers/qpak.c - archivers/wad.c - archivers/zip.c + src/physfs.c + src/physfs_byteorder.c + src/physfs_unicode.c + src/platform_os2.c + src/platform_pocketpc.c + src/platform_posix.c + src/platform_unix.c + src/platform_macosx.c + src/platform_windows.c + src/archiver_dir.c + src/archiver_grp.c + src/archiver_hog.c + src/archiver_lzma.c + src/archiver_mvl.c + src/archiver_qpak.c + src/archiver_wad.c + src/archiver_zip.c ${PHYSFS_BEOS_SRCS} ) diff --git a/README.txt b/README.txt new file mode 100644 index 0000000..b1225b7 --- /dev/null +++ b/README.txt @@ -0,0 +1,7 @@ + +PhysicsFS; a portable, flexible file i/o abstraction. + + http://icculus.org/physfs/ + +Please see the docs directory for documentation, licensing, and information. + diff --git a/CHANGELOG.txt b/docs/CHANGELOG.txt similarity index 100% rename from CHANGELOG.txt rename to docs/CHANGELOG.txt diff --git a/CREDITS.txt b/docs/CREDITS.txt similarity index 100% rename from CREDITS.txt rename to docs/CREDITS.txt diff --git a/Doxyfile b/docs/Doxyfile similarity index 100% rename from Doxyfile rename to docs/Doxyfile diff --git a/INSTALL.txt b/docs/INSTALL.txt similarity index 100% rename from INSTALL.txt rename to docs/INSTALL.txt diff --git a/TODO.txt b/docs/TODO.txt similarity index 100% rename from TODO.txt rename to docs/TODO.txt diff --git a/extras/globbing.c b/extras/globbing.c index bb83d6a..8ca3513 100644 --- a/extras/globbing.c +++ b/extras/globbing.c @@ -22,7 +22,7 @@ * NO WARRANTY. * * Unless otherwise stated, the rest of PhysicsFS falls under the zlib license. - * Please see LICENSE.txt in the root of the source tree. + * Please see LICENSE.txt in the source's "docs" directory. * * \author Ryan C. Gordon. */ diff --git a/extras/globbing.h b/extras/globbing.h index 3784413..ef4ff94 100644 --- a/extras/globbing.h +++ b/extras/globbing.h @@ -25,7 +25,7 @@ * NO WARRANTY. * * Unless otherwise stated, the rest of PhysicsFS falls under the zlib license. - * Please see LICENSE.txt in the root of the source tree. + * Please see LICENSE.txt in the source's "docs" directory. * * \author Ryan C. Gordon. */ diff --git a/makeos2.cmd b/makeos2.cmd index b1fb4c0..a95d962 100644 --- a/makeos2.cmd +++ b/makeos2.cmd @@ -126,40 +126,40 @@ emximp -o bin/physfs.a bin/physfs.def @echo Compiling PhysicsFS library... @echo on -gcc %CFLAGS% -o bin/physfs.obj physfs.c -gcc %CFLAGS% -o bin/physfs_byteorder.obj physfs_byteorder.c -gcc %CFLAGS% -o bin/physfs_unicode.obj physfs_unicode.c -gcc %CFLAGS% -o bin/os2.obj platform/os2.c -gcc %CFLAGS% -o bin/dir.obj archivers/dir.c -gcc %CFLAGS% -o bin/grp.obj archivers/grp.c -gcc %CFLAGS% -o bin/wad.obj archivers/wad.c -gcc %CFLAGS% -o bin/lzma.obj archivers/lzma.c -gcc %CFLAGS% -o bin/zip.obj archivers/zip.c -gcc %CFLAGS% -o bin/qpak.obj archivers/qpak.c -gcc %CFLAGS% -o bin/hog.obj archivers/hog.c -gcc %CFLAGS% -o bin/mvl.obj archivers/mvl.c -gcc %CFLAGS% -o bin/adler32.obj zlib123/adler32.c -gcc %CFLAGS% -o bin/compress.obj zlib123/compress.c -gcc %CFLAGS% -o bin/crc32.obj zlib123/crc32.c -gcc %CFLAGS% -o bin/deflate.obj zlib123/deflate.c -gcc %CFLAGS% -o bin/gzio.obj zlib123/gzio.c -gcc %CFLAGS% -o bin/infback.obj zlib123/infback.c -gcc %CFLAGS% -o bin/inffast.obj zlib123/inffast.c -gcc %CFLAGS% -o bin/inflate.obj zlib123/inflate.c -gcc %CFLAGS% -o bin/inftrees.obj zlib123/inftrees.c -gcc %CFLAGS% -o bin/trees.obj zlib123/trees.c -gcc %CFLAGS% -o bin/uncompr.obj zlib123/uncompr.c -gcc %CFLAGS% -o bin/zutil.obj zlib123/zutil.c -gcc %CFLAGS% -o bin/7zBuffer.obj lzma/7zBuffer.c -gcc %CFLAGS% -o bin/7zCrc.obj lzma/7zCrc.c -gcc %CFLAGS% -o bin/7zDecode.obj lzma/7zDecode.c -gcc %CFLAGS% -o bin/7zExtract.obj lzma/7zExtract.c -gcc %CFLAGS% -o bin/7zHeader.obj lzma/7zHeader.c -gcc %CFLAGS% -o bin/7zIn.obj lzma/7zIn.c -gcc %CFLAGS% -o bin/7zItem.obj lzma/7zItem.c -gcc %CFLAGS% -o bin/7zMethodID.obj lzma/7zMethodID.c -gcc %CFLAGS% -o bin/LzmaDecode.obj lzma/LzmaDecode.c -gcc %CFLAGS% -o bin/LzmaStateDecode.obj lzma/LzmaStateDecode.c +gcc %CFLAGS% -o bin/physfs.obj src/physfs.c +gcc %CFLAGS% -o bin/physfs_byteorder.obj src/physfs_byteorder.c +gcc %CFLAGS% -o bin/physfs_unicode.obj src/physfs_unicode.c +gcc %CFLAGS% -o bin/os2.obj src/platform/os2.c +gcc %CFLAGS% -o bin/dir.obj src/archivers/dir.c +gcc %CFLAGS% -o bin/grp.obj src/archivers/grp.c +gcc %CFLAGS% -o bin/wad.obj src/archivers/wad.c +gcc %CFLAGS% -o bin/lzma.obj src/archivers/lzma.c +gcc %CFLAGS% -o bin/zip.obj src/archivers/zip.c +gcc %CFLAGS% -o bin/qpak.obj src/archivers/qpak.c +gcc %CFLAGS% -o bin/hog.obj src/archivers/hog.c +gcc %CFLAGS% -o bin/mvl.obj src/archivers/mvl.c +gcc %CFLAGS% -o bin/adler32.obj src/zlib123/adler32.c +gcc %CFLAGS% -o bin/compress.obj src/zlib123/compress.c +gcc %CFLAGS% -o bin/crc32.obj src/zlib123/crc32.c +gcc %CFLAGS% -o bin/deflate.obj src/zlib123/deflate.c +gcc %CFLAGS% -o bin/gzio.obj src/zlib123/gzio.c +gcc %CFLAGS% -o bin/infback.obj src/zlib123/infback.c +gcc %CFLAGS% -o bin/inffast.obj src/zlib123/inffast.c +gcc %CFLAGS% -o bin/inflate.obj src/zlib123/inflate.c +gcc %CFLAGS% -o bin/inftrees.obj src/zlib123/inftrees.c +gcc %CFLAGS% -o bin/trees.obj src/zlib123/trees.c +gcc %CFLAGS% -o bin/uncompr.obj src/zlib123/uncompr.c +gcc %CFLAGS% -o bin/zutil.obj src/zlib123/zutil.c +gcc %CFLAGS% -o bin/7zBuffer.obj src/lzma/7zBuffer.c +gcc %CFLAGS% -o bin/7zCrc.obj src/lzma/7zCrc.c +gcc %CFLAGS% -o bin/7zDecode.obj src/lzma/7zDecode.c +gcc %CFLAGS% -o bin/7zExtract.obj src/lzma/7zExtract.c +gcc %CFLAGS% -o bin/7zHeader.obj src/lzma/7zHeader.c +gcc %CFLAGS% -o bin/7zIn.obj src/lzma/7zIn.c +gcc %CFLAGS% -o bin/7zItem.obj src/lzma/7zItem.c +gcc %CFLAGS% -o bin/7zMethodID.obj src/lzma/7zMethodID.c +gcc %CFLAGS% -o bin/LzmaDecode.obj src/lzma/LzmaDecode.c +gcc %CFLAGS% -o bin/LzmaStateDecode.obj src/lzma/LzmaStateDecode.c @echo off :dolinking diff --git a/archivers/dir.c b/src/archiver_dir.c similarity index 100% rename from archivers/dir.c rename to src/archiver_dir.c diff --git a/archivers/grp.c b/src/archiver_grp.c similarity index 100% rename from archivers/grp.c rename to src/archiver_grp.c diff --git a/archivers/hog.c b/src/archiver_hog.c similarity index 100% rename from archivers/hog.c rename to src/archiver_hog.c diff --git a/archivers/lzma.c b/src/archiver_lzma.c similarity index 100% rename from archivers/lzma.c rename to src/archiver_lzma.c diff --git a/archivers/mvl.c b/src/archiver_mvl.c similarity index 100% rename from archivers/mvl.c rename to src/archiver_mvl.c diff --git a/archivers/qpak.c b/src/archiver_qpak.c similarity index 100% rename from archivers/qpak.c rename to src/archiver_qpak.c diff --git a/archivers/wad.c b/src/archiver_wad.c similarity index 100% rename from archivers/wad.c rename to src/archiver_wad.c diff --git a/archivers/zip.c b/src/archiver_zip.c similarity index 100% rename from archivers/zip.c rename to src/archiver_zip.c diff --git a/lzma/7zC.txt b/src/lzma/7zC.txt similarity index 100% rename from lzma/7zC.txt rename to src/lzma/7zC.txt diff --git a/lzma/7zFormat.txt b/src/lzma/7zFormat.txt similarity index 100% rename from lzma/7zFormat.txt rename to src/lzma/7zFormat.txt diff --git a/lzma/C/7zCrc.c b/src/lzma/C/7zCrc.c similarity index 100% rename from lzma/C/7zCrc.c rename to src/lzma/C/7zCrc.c diff --git a/lzma/C/7zCrc.h b/src/lzma/C/7zCrc.h similarity index 100% rename from lzma/C/7zCrc.h rename to src/lzma/C/7zCrc.h diff --git a/lzma/C/7zCrcT8.c b/src/lzma/C/7zCrcT8.c similarity index 100% rename from lzma/C/7zCrcT8.c rename to src/lzma/C/7zCrcT8.c diff --git a/lzma/C/Alloc.c b/src/lzma/C/Alloc.c similarity index 100% rename from lzma/C/Alloc.c rename to src/lzma/C/Alloc.c diff --git a/lzma/C/Alloc.h b/src/lzma/C/Alloc.h similarity index 100% rename from lzma/C/Alloc.h rename to src/lzma/C/Alloc.h diff --git a/lzma/C/Archive/7z/7zAlloc.c b/src/lzma/C/Archive/7z/7zAlloc.c similarity index 100% rename from lzma/C/Archive/7z/7zAlloc.c rename to src/lzma/C/Archive/7z/7zAlloc.c diff --git a/lzma/C/Archive/7z/7zAlloc.h b/src/lzma/C/Archive/7z/7zAlloc.h similarity index 100% rename from lzma/C/Archive/7z/7zAlloc.h rename to src/lzma/C/Archive/7z/7zAlloc.h diff --git a/lzma/C/Archive/7z/7zBuffer.c b/src/lzma/C/Archive/7z/7zBuffer.c similarity index 100% rename from lzma/C/Archive/7z/7zBuffer.c rename to src/lzma/C/Archive/7z/7zBuffer.c diff --git a/lzma/C/Archive/7z/7zBuffer.h b/src/lzma/C/Archive/7z/7zBuffer.h similarity index 100% rename from lzma/C/Archive/7z/7zBuffer.h rename to src/lzma/C/Archive/7z/7zBuffer.h diff --git a/lzma/C/Archive/7z/7zDecode.c b/src/lzma/C/Archive/7z/7zDecode.c similarity index 100% rename from lzma/C/Archive/7z/7zDecode.c rename to src/lzma/C/Archive/7z/7zDecode.c diff --git a/lzma/C/Archive/7z/7zDecode.h b/src/lzma/C/Archive/7z/7zDecode.h similarity index 100% rename from lzma/C/Archive/7z/7zDecode.h rename to src/lzma/C/Archive/7z/7zDecode.h diff --git a/lzma/C/Archive/7z/7zExtract.c b/src/lzma/C/Archive/7z/7zExtract.c similarity index 100% rename from lzma/C/Archive/7z/7zExtract.c rename to src/lzma/C/Archive/7z/7zExtract.c diff --git a/lzma/C/Archive/7z/7zExtract.h b/src/lzma/C/Archive/7z/7zExtract.h similarity index 100% rename from lzma/C/Archive/7z/7zExtract.h rename to src/lzma/C/Archive/7z/7zExtract.h diff --git a/lzma/C/Archive/7z/7zHeader.c b/src/lzma/C/Archive/7z/7zHeader.c similarity index 100% rename from lzma/C/Archive/7z/7zHeader.c rename to src/lzma/C/Archive/7z/7zHeader.c diff --git a/lzma/C/Archive/7z/7zHeader.h b/src/lzma/C/Archive/7z/7zHeader.h similarity index 100% rename from lzma/C/Archive/7z/7zHeader.h rename to src/lzma/C/Archive/7z/7zHeader.h diff --git a/lzma/C/Archive/7z/7zIn.c b/src/lzma/C/Archive/7z/7zIn.c similarity index 100% rename from lzma/C/Archive/7z/7zIn.c rename to src/lzma/C/Archive/7z/7zIn.c diff --git a/lzma/C/Archive/7z/7zIn.h b/src/lzma/C/Archive/7z/7zIn.h similarity index 100% rename from lzma/C/Archive/7z/7zIn.h rename to src/lzma/C/Archive/7z/7zIn.h diff --git a/lzma/C/Archive/7z/7zItem.c b/src/lzma/C/Archive/7z/7zItem.c similarity index 100% rename from lzma/C/Archive/7z/7zItem.c rename to src/lzma/C/Archive/7z/7zItem.c diff --git a/lzma/C/Archive/7z/7zItem.h b/src/lzma/C/Archive/7z/7zItem.h similarity index 100% rename from lzma/C/Archive/7z/7zItem.h rename to src/lzma/C/Archive/7z/7zItem.h diff --git a/lzma/C/Archive/7z/7zMain.c b/src/lzma/C/Archive/7z/7zMain.c similarity index 100% rename from lzma/C/Archive/7z/7zMain.c rename to src/lzma/C/Archive/7z/7zMain.c diff --git a/lzma/C/Archive/7z/7zMethodID.c b/src/lzma/C/Archive/7z/7zMethodID.c similarity index 100% rename from lzma/C/Archive/7z/7zMethodID.c rename to src/lzma/C/Archive/7z/7zMethodID.c diff --git a/lzma/C/Archive/7z/7zMethodID.h b/src/lzma/C/Archive/7z/7zMethodID.h similarity index 100% rename from lzma/C/Archive/7z/7zMethodID.h rename to src/lzma/C/Archive/7z/7zMethodID.h diff --git a/lzma/C/Archive/7z/7z_C.dsp b/src/lzma/C/Archive/7z/7z_C.dsp similarity index 100% rename from lzma/C/Archive/7z/7z_C.dsp rename to src/lzma/C/Archive/7z/7z_C.dsp diff --git a/lzma/C/Archive/7z/7z_C.dsw b/src/lzma/C/Archive/7z/7z_C.dsw similarity index 100% rename from lzma/C/Archive/7z/7z_C.dsw rename to src/lzma/C/Archive/7z/7z_C.dsw diff --git a/lzma/C/Archive/7z/makefile b/src/lzma/C/Archive/7z/makefile similarity index 100% rename from lzma/C/Archive/7z/makefile rename to src/lzma/C/Archive/7z/makefile diff --git a/lzma/C/Archive/7z/makefile.gcc b/src/lzma/C/Archive/7z/makefile.gcc similarity index 100% rename from lzma/C/Archive/7z/makefile.gcc rename to src/lzma/C/Archive/7z/makefile.gcc diff --git a/lzma/C/Compress/Branch/BranchARM.c b/src/lzma/C/Compress/Branch/BranchARM.c similarity index 100% rename from lzma/C/Compress/Branch/BranchARM.c rename to src/lzma/C/Compress/Branch/BranchARM.c diff --git a/lzma/C/Compress/Branch/BranchARM.h b/src/lzma/C/Compress/Branch/BranchARM.h similarity index 100% rename from lzma/C/Compress/Branch/BranchARM.h rename to src/lzma/C/Compress/Branch/BranchARM.h diff --git a/lzma/C/Compress/Branch/BranchARMThumb.c b/src/lzma/C/Compress/Branch/BranchARMThumb.c similarity index 100% rename from lzma/C/Compress/Branch/BranchARMThumb.c rename to src/lzma/C/Compress/Branch/BranchARMThumb.c diff --git a/lzma/C/Compress/Branch/BranchARMThumb.h b/src/lzma/C/Compress/Branch/BranchARMThumb.h similarity index 100% rename from lzma/C/Compress/Branch/BranchARMThumb.h rename to src/lzma/C/Compress/Branch/BranchARMThumb.h diff --git a/lzma/C/Compress/Branch/BranchIA64.c b/src/lzma/C/Compress/Branch/BranchIA64.c similarity index 100% rename from lzma/C/Compress/Branch/BranchIA64.c rename to src/lzma/C/Compress/Branch/BranchIA64.c diff --git a/lzma/C/Compress/Branch/BranchIA64.h b/src/lzma/C/Compress/Branch/BranchIA64.h similarity index 100% rename from lzma/C/Compress/Branch/BranchIA64.h rename to src/lzma/C/Compress/Branch/BranchIA64.h diff --git a/lzma/C/Compress/Branch/BranchPPC.c b/src/lzma/C/Compress/Branch/BranchPPC.c similarity index 100% rename from lzma/C/Compress/Branch/BranchPPC.c rename to src/lzma/C/Compress/Branch/BranchPPC.c diff --git a/lzma/C/Compress/Branch/BranchPPC.h b/src/lzma/C/Compress/Branch/BranchPPC.h similarity index 100% rename from lzma/C/Compress/Branch/BranchPPC.h rename to src/lzma/C/Compress/Branch/BranchPPC.h diff --git a/lzma/C/Compress/Branch/BranchSPARC.c b/src/lzma/C/Compress/Branch/BranchSPARC.c similarity index 100% rename from lzma/C/Compress/Branch/BranchSPARC.c rename to src/lzma/C/Compress/Branch/BranchSPARC.c diff --git a/lzma/C/Compress/Branch/BranchSPARC.h b/src/lzma/C/Compress/Branch/BranchSPARC.h similarity index 100% rename from lzma/C/Compress/Branch/BranchSPARC.h rename to src/lzma/C/Compress/Branch/BranchSPARC.h diff --git a/lzma/C/Compress/Branch/BranchTypes.h b/src/lzma/C/Compress/Branch/BranchTypes.h similarity index 100% rename from lzma/C/Compress/Branch/BranchTypes.h rename to src/lzma/C/Compress/Branch/BranchTypes.h diff --git a/lzma/C/Compress/Branch/BranchX86.c b/src/lzma/C/Compress/Branch/BranchX86.c similarity index 100% rename from lzma/C/Compress/Branch/BranchX86.c rename to src/lzma/C/Compress/Branch/BranchX86.c diff --git a/lzma/C/Compress/Branch/BranchX86.h b/src/lzma/C/Compress/Branch/BranchX86.h similarity index 100% rename from lzma/C/Compress/Branch/BranchX86.h rename to src/lzma/C/Compress/Branch/BranchX86.h diff --git a/lzma/C/Compress/Branch/BranchX86_2.c b/src/lzma/C/Compress/Branch/BranchX86_2.c similarity index 100% rename from lzma/C/Compress/Branch/BranchX86_2.c rename to src/lzma/C/Compress/Branch/BranchX86_2.c diff --git a/lzma/C/Compress/Branch/BranchX86_2.h b/src/lzma/C/Compress/Branch/BranchX86_2.h similarity index 100% rename from lzma/C/Compress/Branch/BranchX86_2.h rename to src/lzma/C/Compress/Branch/BranchX86_2.h diff --git a/lzma/C/Compress/Huffman/HuffmanEncode.c b/src/lzma/C/Compress/Huffman/HuffmanEncode.c similarity index 100% rename from lzma/C/Compress/Huffman/HuffmanEncode.c rename to src/lzma/C/Compress/Huffman/HuffmanEncode.c diff --git a/lzma/C/Compress/Huffman/HuffmanEncode.h b/src/lzma/C/Compress/Huffman/HuffmanEncode.h similarity index 100% rename from lzma/C/Compress/Huffman/HuffmanEncode.h rename to src/lzma/C/Compress/Huffman/HuffmanEncode.h diff --git a/lzma/C/Compress/Lz/LzHash.h b/src/lzma/C/Compress/Lz/LzHash.h similarity index 100% rename from lzma/C/Compress/Lz/LzHash.h rename to src/lzma/C/Compress/Lz/LzHash.h diff --git a/lzma/C/Compress/Lz/MatchFinder.c b/src/lzma/C/Compress/Lz/MatchFinder.c similarity index 100% rename from lzma/C/Compress/Lz/MatchFinder.c rename to src/lzma/C/Compress/Lz/MatchFinder.c diff --git a/lzma/C/Compress/Lz/MatchFinder.h b/src/lzma/C/Compress/Lz/MatchFinder.h similarity index 100% rename from lzma/C/Compress/Lz/MatchFinder.h rename to src/lzma/C/Compress/Lz/MatchFinder.h diff --git a/lzma/C/Compress/Lz/MatchFinderMt.c b/src/lzma/C/Compress/Lz/MatchFinderMt.c similarity index 100% rename from lzma/C/Compress/Lz/MatchFinderMt.c rename to src/lzma/C/Compress/Lz/MatchFinderMt.c diff --git a/lzma/C/Compress/Lz/MatchFinderMt.h b/src/lzma/C/Compress/Lz/MatchFinderMt.h similarity index 100% rename from lzma/C/Compress/Lz/MatchFinderMt.h rename to src/lzma/C/Compress/Lz/MatchFinderMt.h diff --git a/lzma/C/Compress/Lzma/LzmaDecode.c b/src/lzma/C/Compress/Lzma/LzmaDecode.c similarity index 100% rename from lzma/C/Compress/Lzma/LzmaDecode.c rename to src/lzma/C/Compress/Lzma/LzmaDecode.c diff --git a/lzma/C/Compress/Lzma/LzmaDecode.h b/src/lzma/C/Compress/Lzma/LzmaDecode.h similarity index 100% rename from lzma/C/Compress/Lzma/LzmaDecode.h rename to src/lzma/C/Compress/Lzma/LzmaDecode.h diff --git a/lzma/C/Compress/Lzma/LzmaDecodeSize.c b/src/lzma/C/Compress/Lzma/LzmaDecodeSize.c similarity index 100% rename from lzma/C/Compress/Lzma/LzmaDecodeSize.c rename to src/lzma/C/Compress/Lzma/LzmaDecodeSize.c diff --git a/lzma/C/Compress/Lzma/LzmaStateDecode.c b/src/lzma/C/Compress/Lzma/LzmaStateDecode.c similarity index 100% rename from lzma/C/Compress/Lzma/LzmaStateDecode.c rename to src/lzma/C/Compress/Lzma/LzmaStateDecode.c diff --git a/lzma/C/Compress/Lzma/LzmaStateDecode.h b/src/lzma/C/Compress/Lzma/LzmaStateDecode.h similarity index 100% rename from lzma/C/Compress/Lzma/LzmaStateDecode.h rename to src/lzma/C/Compress/Lzma/LzmaStateDecode.h diff --git a/lzma/C/Compress/Lzma/LzmaStateTest.c b/src/lzma/C/Compress/Lzma/LzmaStateTest.c similarity index 100% rename from lzma/C/Compress/Lzma/LzmaStateTest.c rename to src/lzma/C/Compress/Lzma/LzmaStateTest.c diff --git a/lzma/C/Compress/Lzma/LzmaTest.c b/src/lzma/C/Compress/Lzma/LzmaTest.c similarity index 100% rename from lzma/C/Compress/Lzma/LzmaTest.c rename to src/lzma/C/Compress/Lzma/LzmaTest.c diff --git a/lzma/C/Compress/Lzma/LzmaTypes.h b/src/lzma/C/Compress/Lzma/LzmaTypes.h similarity index 100% rename from lzma/C/Compress/Lzma/LzmaTypes.h rename to src/lzma/C/Compress/Lzma/LzmaTypes.h diff --git a/lzma/C/CpuArch.h b/src/lzma/C/CpuArch.h similarity index 100% rename from lzma/C/CpuArch.h rename to src/lzma/C/CpuArch.h diff --git a/lzma/C/IStream.h b/src/lzma/C/IStream.h similarity index 100% rename from lzma/C/IStream.h rename to src/lzma/C/IStream.h diff --git a/lzma/C/Sort.c b/src/lzma/C/Sort.c similarity index 100% rename from lzma/C/Sort.c rename to src/lzma/C/Sort.c diff --git a/lzma/C/Sort.h b/src/lzma/C/Sort.h similarity index 100% rename from lzma/C/Sort.h rename to src/lzma/C/Sort.h diff --git a/lzma/C/Threads.c b/src/lzma/C/Threads.c similarity index 100% rename from lzma/C/Threads.c rename to src/lzma/C/Threads.c diff --git a/lzma/C/Threads.h b/src/lzma/C/Threads.h similarity index 100% rename from lzma/C/Threads.h rename to src/lzma/C/Threads.h diff --git a/lzma/C/Types.h b/src/lzma/C/Types.h similarity index 100% rename from lzma/C/Types.h rename to src/lzma/C/Types.h diff --git a/lzma/CPP/7zip/Archive/7z/7z.ico b/src/lzma/CPP/7zip/Archive/7z/7z.ico similarity index 100% rename from lzma/CPP/7zip/Archive/7z/7z.ico rename to src/lzma/CPP/7zip/Archive/7z/7z.ico diff --git a/lzma/CPP/7zip/Archive/7z/7zCompressionMode.cpp b/src/lzma/CPP/7zip/Archive/7z/7zCompressionMode.cpp similarity index 100% rename from lzma/CPP/7zip/Archive/7z/7zCompressionMode.cpp rename to src/lzma/CPP/7zip/Archive/7z/7zCompressionMode.cpp diff --git a/lzma/CPP/7zip/Archive/7z/7zCompressionMode.h b/src/lzma/CPP/7zip/Archive/7z/7zCompressionMode.h similarity index 100% rename from lzma/CPP/7zip/Archive/7z/7zCompressionMode.h rename to src/lzma/CPP/7zip/Archive/7z/7zCompressionMode.h diff --git a/lzma/CPP/7zip/Archive/7z/7zDecode.cpp b/src/lzma/CPP/7zip/Archive/7z/7zDecode.cpp similarity index 100% rename from lzma/CPP/7zip/Archive/7z/7zDecode.cpp rename to src/lzma/CPP/7zip/Archive/7z/7zDecode.cpp diff --git a/lzma/CPP/7zip/Archive/7z/7zDecode.h b/src/lzma/CPP/7zip/Archive/7z/7zDecode.h similarity index 100% rename from lzma/CPP/7zip/Archive/7z/7zDecode.h rename to src/lzma/CPP/7zip/Archive/7z/7zDecode.h diff --git a/lzma/CPP/7zip/Archive/7z/7zEncode.cpp b/src/lzma/CPP/7zip/Archive/7z/7zEncode.cpp similarity index 100% rename from lzma/CPP/7zip/Archive/7z/7zEncode.cpp rename to src/lzma/CPP/7zip/Archive/7z/7zEncode.cpp diff --git a/lzma/CPP/7zip/Archive/7z/7zEncode.h b/src/lzma/CPP/7zip/Archive/7z/7zEncode.h similarity index 100% rename from lzma/CPP/7zip/Archive/7z/7zEncode.h rename to src/lzma/CPP/7zip/Archive/7z/7zEncode.h diff --git a/lzma/CPP/7zip/Archive/7z/7zExtract.cpp b/src/lzma/CPP/7zip/Archive/7z/7zExtract.cpp similarity index 100% rename from lzma/CPP/7zip/Archive/7z/7zExtract.cpp rename to src/lzma/CPP/7zip/Archive/7z/7zExtract.cpp diff --git a/lzma/CPP/7zip/Archive/7z/7zFolderInStream.cpp b/src/lzma/CPP/7zip/Archive/7z/7zFolderInStream.cpp similarity index 100% rename from lzma/CPP/7zip/Archive/7z/7zFolderInStream.cpp rename to src/lzma/CPP/7zip/Archive/7z/7zFolderInStream.cpp diff --git a/lzma/CPP/7zip/Archive/7z/7zFolderInStream.h b/src/lzma/CPP/7zip/Archive/7z/7zFolderInStream.h similarity index 100% rename from lzma/CPP/7zip/Archive/7z/7zFolderInStream.h rename to src/lzma/CPP/7zip/Archive/7z/7zFolderInStream.h diff --git a/lzma/CPP/7zip/Archive/7z/7zFolderOutStream.cpp b/src/lzma/CPP/7zip/Archive/7z/7zFolderOutStream.cpp similarity index 100% rename from lzma/CPP/7zip/Archive/7z/7zFolderOutStream.cpp rename to src/lzma/CPP/7zip/Archive/7z/7zFolderOutStream.cpp diff --git a/lzma/CPP/7zip/Archive/7z/7zFolderOutStream.h b/src/lzma/CPP/7zip/Archive/7z/7zFolderOutStream.h similarity index 100% rename from lzma/CPP/7zip/Archive/7z/7zFolderOutStream.h rename to src/lzma/CPP/7zip/Archive/7z/7zFolderOutStream.h diff --git a/lzma/CPP/7zip/Archive/7z/7zHandler.cpp b/src/lzma/CPP/7zip/Archive/7z/7zHandler.cpp similarity index 100% rename from lzma/CPP/7zip/Archive/7z/7zHandler.cpp rename to src/lzma/CPP/7zip/Archive/7z/7zHandler.cpp diff --git a/lzma/CPP/7zip/Archive/7z/7zHandler.h b/src/lzma/CPP/7zip/Archive/7z/7zHandler.h similarity index 100% rename from lzma/CPP/7zip/Archive/7z/7zHandler.h rename to src/lzma/CPP/7zip/Archive/7z/7zHandler.h diff --git a/lzma/CPP/7zip/Archive/7z/7zHandlerOut.cpp b/src/lzma/CPP/7zip/Archive/7z/7zHandlerOut.cpp similarity index 100% rename from lzma/CPP/7zip/Archive/7z/7zHandlerOut.cpp rename to src/lzma/CPP/7zip/Archive/7z/7zHandlerOut.cpp diff --git a/lzma/CPP/7zip/Archive/7z/7zHeader.cpp b/src/lzma/CPP/7zip/Archive/7z/7zHeader.cpp similarity index 100% rename from lzma/CPP/7zip/Archive/7z/7zHeader.cpp rename to src/lzma/CPP/7zip/Archive/7z/7zHeader.cpp diff --git a/lzma/CPP/7zip/Archive/7z/7zHeader.h b/src/lzma/CPP/7zip/Archive/7z/7zHeader.h similarity index 100% rename from lzma/CPP/7zip/Archive/7z/7zHeader.h rename to src/lzma/CPP/7zip/Archive/7z/7zHeader.h diff --git a/lzma/CPP/7zip/Archive/7z/7zIn.cpp b/src/lzma/CPP/7zip/Archive/7z/7zIn.cpp similarity index 100% rename from lzma/CPP/7zip/Archive/7z/7zIn.cpp rename to src/lzma/CPP/7zip/Archive/7z/7zIn.cpp diff --git a/lzma/CPP/7zip/Archive/7z/7zIn.h b/src/lzma/CPP/7zip/Archive/7z/7zIn.h similarity index 100% rename from lzma/CPP/7zip/Archive/7z/7zIn.h rename to src/lzma/CPP/7zip/Archive/7z/7zIn.h diff --git a/lzma/CPP/7zip/Archive/7z/7zItem.h b/src/lzma/CPP/7zip/Archive/7z/7zItem.h similarity index 100% rename from lzma/CPP/7zip/Archive/7z/7zItem.h rename to src/lzma/CPP/7zip/Archive/7z/7zItem.h diff --git a/lzma/CPP/7zip/Archive/7z/7zOut.cpp b/src/lzma/CPP/7zip/Archive/7z/7zOut.cpp similarity index 100% rename from lzma/CPP/7zip/Archive/7z/7zOut.cpp rename to src/lzma/CPP/7zip/Archive/7z/7zOut.cpp diff --git a/lzma/CPP/7zip/Archive/7z/7zOut.h b/src/lzma/CPP/7zip/Archive/7z/7zOut.h similarity index 100% rename from lzma/CPP/7zip/Archive/7z/7zOut.h rename to src/lzma/CPP/7zip/Archive/7z/7zOut.h diff --git a/lzma/CPP/7zip/Archive/7z/7zProperties.cpp b/src/lzma/CPP/7zip/Archive/7z/7zProperties.cpp similarity index 100% rename from lzma/CPP/7zip/Archive/7z/7zProperties.cpp rename to src/lzma/CPP/7zip/Archive/7z/7zProperties.cpp diff --git a/lzma/CPP/7zip/Archive/7z/7zProperties.h b/src/lzma/CPP/7zip/Archive/7z/7zProperties.h similarity index 100% rename from lzma/CPP/7zip/Archive/7z/7zProperties.h rename to src/lzma/CPP/7zip/Archive/7z/7zProperties.h diff --git a/lzma/CPP/7zip/Archive/7z/7zRegister.cpp b/src/lzma/CPP/7zip/Archive/7z/7zRegister.cpp similarity index 100% rename from lzma/CPP/7zip/Archive/7z/7zRegister.cpp rename to src/lzma/CPP/7zip/Archive/7z/7zRegister.cpp diff --git a/lzma/CPP/7zip/Archive/7z/7zSpecStream.cpp b/src/lzma/CPP/7zip/Archive/7z/7zSpecStream.cpp similarity index 100% rename from lzma/CPP/7zip/Archive/7z/7zSpecStream.cpp rename to src/lzma/CPP/7zip/Archive/7z/7zSpecStream.cpp diff --git a/lzma/CPP/7zip/Archive/7z/7zSpecStream.h b/src/lzma/CPP/7zip/Archive/7z/7zSpecStream.h similarity index 100% rename from lzma/CPP/7zip/Archive/7z/7zSpecStream.h rename to src/lzma/CPP/7zip/Archive/7z/7zSpecStream.h diff --git a/lzma/CPP/7zip/Archive/7z/7zUpdate.cpp b/src/lzma/CPP/7zip/Archive/7z/7zUpdate.cpp similarity index 100% rename from lzma/CPP/7zip/Archive/7z/7zUpdate.cpp rename to src/lzma/CPP/7zip/Archive/7z/7zUpdate.cpp diff --git a/lzma/CPP/7zip/Archive/7z/7zUpdate.h b/src/lzma/CPP/7zip/Archive/7z/7zUpdate.h similarity index 100% rename from lzma/CPP/7zip/Archive/7z/7zUpdate.h rename to src/lzma/CPP/7zip/Archive/7z/7zUpdate.h diff --git a/lzma/CPP/7zip/Archive/7z/StdAfx.cpp b/src/lzma/CPP/7zip/Archive/7z/StdAfx.cpp similarity index 100% rename from lzma/CPP/7zip/Archive/7z/StdAfx.cpp rename to src/lzma/CPP/7zip/Archive/7z/StdAfx.cpp diff --git a/lzma/CPP/7zip/Archive/7z/StdAfx.h b/src/lzma/CPP/7zip/Archive/7z/StdAfx.h similarity index 100% rename from lzma/CPP/7zip/Archive/7z/StdAfx.h rename to src/lzma/CPP/7zip/Archive/7z/StdAfx.h diff --git a/lzma/CPP/7zip/Archive/Archive.def b/src/lzma/CPP/7zip/Archive/Archive.def similarity index 100% rename from lzma/CPP/7zip/Archive/Archive.def rename to src/lzma/CPP/7zip/Archive/Archive.def diff --git a/lzma/CPP/7zip/Archive/Archive2.def b/src/lzma/CPP/7zip/Archive/Archive2.def similarity index 100% rename from lzma/CPP/7zip/Archive/Archive2.def rename to src/lzma/CPP/7zip/Archive/Archive2.def diff --git a/lzma/CPP/7zip/Archive/ArchiveExports.cpp b/src/lzma/CPP/7zip/Archive/ArchiveExports.cpp similarity index 100% rename from lzma/CPP/7zip/Archive/ArchiveExports.cpp rename to src/lzma/CPP/7zip/Archive/ArchiveExports.cpp diff --git a/lzma/CPP/7zip/Archive/Common/CoderMixer2.cpp b/src/lzma/CPP/7zip/Archive/Common/CoderMixer2.cpp similarity index 100% rename from lzma/CPP/7zip/Archive/Common/CoderMixer2.cpp rename to src/lzma/CPP/7zip/Archive/Common/CoderMixer2.cpp diff --git a/lzma/CPP/7zip/Archive/Common/CoderMixer2.h b/src/lzma/CPP/7zip/Archive/Common/CoderMixer2.h similarity index 100% rename from lzma/CPP/7zip/Archive/Common/CoderMixer2.h rename to src/lzma/CPP/7zip/Archive/Common/CoderMixer2.h diff --git a/lzma/CPP/7zip/Archive/Common/CoderMixer2MT.cpp b/src/lzma/CPP/7zip/Archive/Common/CoderMixer2MT.cpp similarity index 100% rename from lzma/CPP/7zip/Archive/Common/CoderMixer2MT.cpp rename to src/lzma/CPP/7zip/Archive/Common/CoderMixer2MT.cpp diff --git a/lzma/CPP/7zip/Archive/Common/CoderMixer2MT.h b/src/lzma/CPP/7zip/Archive/Common/CoderMixer2MT.h similarity index 100% rename from lzma/CPP/7zip/Archive/Common/CoderMixer2MT.h rename to src/lzma/CPP/7zip/Archive/Common/CoderMixer2MT.h diff --git a/lzma/CPP/7zip/Archive/Common/CrossThreadProgress.cpp b/src/lzma/CPP/7zip/Archive/Common/CrossThreadProgress.cpp similarity index 100% rename from lzma/CPP/7zip/Archive/Common/CrossThreadProgress.cpp rename to src/lzma/CPP/7zip/Archive/Common/CrossThreadProgress.cpp diff --git a/lzma/CPP/7zip/Archive/Common/CrossThreadProgress.h b/src/lzma/CPP/7zip/Archive/Common/CrossThreadProgress.h similarity index 100% rename from lzma/CPP/7zip/Archive/Common/CrossThreadProgress.h rename to src/lzma/CPP/7zip/Archive/Common/CrossThreadProgress.h diff --git a/lzma/CPP/7zip/Archive/Common/DummyOutStream.cpp b/src/lzma/CPP/7zip/Archive/Common/DummyOutStream.cpp similarity index 100% rename from lzma/CPP/7zip/Archive/Common/DummyOutStream.cpp rename to src/lzma/CPP/7zip/Archive/Common/DummyOutStream.cpp diff --git a/lzma/CPP/7zip/Archive/Common/DummyOutStream.h b/src/lzma/CPP/7zip/Archive/Common/DummyOutStream.h similarity index 100% rename from lzma/CPP/7zip/Archive/Common/DummyOutStream.h rename to src/lzma/CPP/7zip/Archive/Common/DummyOutStream.h diff --git a/lzma/CPP/7zip/Archive/Common/HandlerOut.cpp b/src/lzma/CPP/7zip/Archive/Common/HandlerOut.cpp similarity index 100% rename from lzma/CPP/7zip/Archive/Common/HandlerOut.cpp rename to src/lzma/CPP/7zip/Archive/Common/HandlerOut.cpp diff --git a/lzma/CPP/7zip/Archive/Common/HandlerOut.h b/src/lzma/CPP/7zip/Archive/Common/HandlerOut.h similarity index 100% rename from lzma/CPP/7zip/Archive/Common/HandlerOut.h rename to src/lzma/CPP/7zip/Archive/Common/HandlerOut.h diff --git a/lzma/CPP/7zip/Archive/Common/InStreamWithCRC.cpp b/src/lzma/CPP/7zip/Archive/Common/InStreamWithCRC.cpp similarity index 100% rename from lzma/CPP/7zip/Archive/Common/InStreamWithCRC.cpp rename to src/lzma/CPP/7zip/Archive/Common/InStreamWithCRC.cpp diff --git a/lzma/CPP/7zip/Archive/Common/InStreamWithCRC.h b/src/lzma/CPP/7zip/Archive/Common/InStreamWithCRC.h similarity index 100% rename from lzma/CPP/7zip/Archive/Common/InStreamWithCRC.h rename to src/lzma/CPP/7zip/Archive/Common/InStreamWithCRC.h diff --git a/lzma/CPP/7zip/Archive/Common/ItemNameUtils.cpp b/src/lzma/CPP/7zip/Archive/Common/ItemNameUtils.cpp similarity index 100% rename from lzma/CPP/7zip/Archive/Common/ItemNameUtils.cpp rename to src/lzma/CPP/7zip/Archive/Common/ItemNameUtils.cpp diff --git a/lzma/CPP/7zip/Archive/Common/ItemNameUtils.h b/src/lzma/CPP/7zip/Archive/Common/ItemNameUtils.h similarity index 100% rename from lzma/CPP/7zip/Archive/Common/ItemNameUtils.h rename to src/lzma/CPP/7zip/Archive/Common/ItemNameUtils.h diff --git a/lzma/CPP/7zip/Archive/Common/MultiStream.cpp b/src/lzma/CPP/7zip/Archive/Common/MultiStream.cpp similarity index 100% rename from lzma/CPP/7zip/Archive/Common/MultiStream.cpp rename to src/lzma/CPP/7zip/Archive/Common/MultiStream.cpp diff --git a/lzma/CPP/7zip/Archive/Common/MultiStream.h b/src/lzma/CPP/7zip/Archive/Common/MultiStream.h similarity index 100% rename from lzma/CPP/7zip/Archive/Common/MultiStream.h rename to src/lzma/CPP/7zip/Archive/Common/MultiStream.h diff --git a/lzma/CPP/7zip/Archive/Common/OutStreamWithCRC.cpp b/src/lzma/CPP/7zip/Archive/Common/OutStreamWithCRC.cpp similarity index 100% rename from lzma/CPP/7zip/Archive/Common/OutStreamWithCRC.cpp rename to src/lzma/CPP/7zip/Archive/Common/OutStreamWithCRC.cpp diff --git a/lzma/CPP/7zip/Archive/Common/OutStreamWithCRC.h b/src/lzma/CPP/7zip/Archive/Common/OutStreamWithCRC.h similarity index 100% rename from lzma/CPP/7zip/Archive/Common/OutStreamWithCRC.h rename to src/lzma/CPP/7zip/Archive/Common/OutStreamWithCRC.h diff --git a/lzma/CPP/7zip/Archive/Common/ParseProperties.cpp b/src/lzma/CPP/7zip/Archive/Common/ParseProperties.cpp similarity index 100% rename from lzma/CPP/7zip/Archive/Common/ParseProperties.cpp rename to src/lzma/CPP/7zip/Archive/Common/ParseProperties.cpp diff --git a/lzma/CPP/7zip/Archive/Common/ParseProperties.h b/src/lzma/CPP/7zip/Archive/Common/ParseProperties.h similarity index 100% rename from lzma/CPP/7zip/Archive/Common/ParseProperties.h rename to src/lzma/CPP/7zip/Archive/Common/ParseProperties.h diff --git a/lzma/CPP/7zip/Archive/DllExports2.cpp b/src/lzma/CPP/7zip/Archive/DllExports2.cpp similarity index 100% rename from lzma/CPP/7zip/Archive/DllExports2.cpp rename to src/lzma/CPP/7zip/Archive/DllExports2.cpp diff --git a/lzma/CPP/7zip/Archive/IArchive.h b/src/lzma/CPP/7zip/Archive/IArchive.h similarity index 100% rename from lzma/CPP/7zip/Archive/IArchive.h rename to src/lzma/CPP/7zip/Archive/IArchive.h diff --git a/lzma/CPP/7zip/Bundles/Alone7z/Alone.dsp b/src/lzma/CPP/7zip/Bundles/Alone7z/Alone.dsp similarity index 100% rename from lzma/CPP/7zip/Bundles/Alone7z/Alone.dsp rename to src/lzma/CPP/7zip/Bundles/Alone7z/Alone.dsp diff --git a/lzma/CPP/7zip/Bundles/Alone7z/Alone.dsw b/src/lzma/CPP/7zip/Bundles/Alone7z/Alone.dsw similarity index 100% rename from lzma/CPP/7zip/Bundles/Alone7z/Alone.dsw rename to src/lzma/CPP/7zip/Bundles/Alone7z/Alone.dsw diff --git a/lzma/CPP/7zip/Bundles/Alone7z/StdAfx.cpp b/src/lzma/CPP/7zip/Bundles/Alone7z/StdAfx.cpp similarity index 100% rename from lzma/CPP/7zip/Bundles/Alone7z/StdAfx.cpp rename to src/lzma/CPP/7zip/Bundles/Alone7z/StdAfx.cpp diff --git a/lzma/CPP/7zip/Bundles/Alone7z/StdAfx.h b/src/lzma/CPP/7zip/Bundles/Alone7z/StdAfx.h similarity index 100% rename from lzma/CPP/7zip/Bundles/Alone7z/StdAfx.h rename to src/lzma/CPP/7zip/Bundles/Alone7z/StdAfx.h diff --git a/lzma/CPP/7zip/Bundles/Alone7z/makefile b/src/lzma/CPP/7zip/Bundles/Alone7z/makefile similarity index 100% rename from lzma/CPP/7zip/Bundles/Alone7z/makefile rename to src/lzma/CPP/7zip/Bundles/Alone7z/makefile diff --git a/lzma/CPP/7zip/Bundles/Alone7z/resource.rc b/src/lzma/CPP/7zip/Bundles/Alone7z/resource.rc similarity index 100% rename from lzma/CPP/7zip/Bundles/Alone7z/resource.rc rename to src/lzma/CPP/7zip/Bundles/Alone7z/resource.rc diff --git a/lzma/CPP/7zip/Bundles/Format7zExtractR/StdAfx.cpp b/src/lzma/CPP/7zip/Bundles/Format7zExtractR/StdAfx.cpp similarity index 100% rename from lzma/CPP/7zip/Bundles/Format7zExtractR/StdAfx.cpp rename to src/lzma/CPP/7zip/Bundles/Format7zExtractR/StdAfx.cpp diff --git a/lzma/CPP/7zip/Bundles/Format7zExtractR/StdAfx.h b/src/lzma/CPP/7zip/Bundles/Format7zExtractR/StdAfx.h similarity index 100% rename from lzma/CPP/7zip/Bundles/Format7zExtractR/StdAfx.h rename to src/lzma/CPP/7zip/Bundles/Format7zExtractR/StdAfx.h diff --git a/lzma/CPP/7zip/Bundles/Format7zExtractR/makefile b/src/lzma/CPP/7zip/Bundles/Format7zExtractR/makefile similarity index 100% rename from lzma/CPP/7zip/Bundles/Format7zExtractR/makefile rename to src/lzma/CPP/7zip/Bundles/Format7zExtractR/makefile diff --git a/lzma/CPP/7zip/Bundles/Format7zExtractR/resource.rc b/src/lzma/CPP/7zip/Bundles/Format7zExtractR/resource.rc similarity index 100% rename from lzma/CPP/7zip/Bundles/Format7zExtractR/resource.rc rename to src/lzma/CPP/7zip/Bundles/Format7zExtractR/resource.rc diff --git a/lzma/CPP/7zip/Bundles/Format7zR/StdAfx.cpp b/src/lzma/CPP/7zip/Bundles/Format7zR/StdAfx.cpp similarity index 100% rename from lzma/CPP/7zip/Bundles/Format7zR/StdAfx.cpp rename to src/lzma/CPP/7zip/Bundles/Format7zR/StdAfx.cpp diff --git a/lzma/CPP/7zip/Bundles/Format7zR/StdAfx.h b/src/lzma/CPP/7zip/Bundles/Format7zR/StdAfx.h similarity index 100% rename from lzma/CPP/7zip/Bundles/Format7zR/StdAfx.h rename to src/lzma/CPP/7zip/Bundles/Format7zR/StdAfx.h diff --git a/lzma/CPP/7zip/Bundles/Format7zR/makefile b/src/lzma/CPP/7zip/Bundles/Format7zR/makefile similarity index 100% rename from lzma/CPP/7zip/Bundles/Format7zR/makefile rename to src/lzma/CPP/7zip/Bundles/Format7zR/makefile diff --git a/lzma/CPP/7zip/Bundles/Format7zR/resource.rc b/src/lzma/CPP/7zip/Bundles/Format7zR/resource.rc similarity index 100% rename from lzma/CPP/7zip/Bundles/Format7zR/resource.rc rename to src/lzma/CPP/7zip/Bundles/Format7zR/resource.rc diff --git a/lzma/CPP/7zip/Common/CreateCoder.cpp b/src/lzma/CPP/7zip/Common/CreateCoder.cpp similarity index 100% rename from lzma/CPP/7zip/Common/CreateCoder.cpp rename to src/lzma/CPP/7zip/Common/CreateCoder.cpp diff --git a/lzma/CPP/7zip/Common/CreateCoder.h b/src/lzma/CPP/7zip/Common/CreateCoder.h similarity index 100% rename from lzma/CPP/7zip/Common/CreateCoder.h rename to src/lzma/CPP/7zip/Common/CreateCoder.h diff --git a/lzma/CPP/7zip/Common/FilePathAutoRename.cpp b/src/lzma/CPP/7zip/Common/FilePathAutoRename.cpp similarity index 100% rename from lzma/CPP/7zip/Common/FilePathAutoRename.cpp rename to src/lzma/CPP/7zip/Common/FilePathAutoRename.cpp diff --git a/lzma/CPP/7zip/Common/FilePathAutoRename.h b/src/lzma/CPP/7zip/Common/FilePathAutoRename.h similarity index 100% rename from lzma/CPP/7zip/Common/FilePathAutoRename.h rename to src/lzma/CPP/7zip/Common/FilePathAutoRename.h diff --git a/lzma/CPP/7zip/Common/FileStreams.cpp b/src/lzma/CPP/7zip/Common/FileStreams.cpp similarity index 100% rename from lzma/CPP/7zip/Common/FileStreams.cpp rename to src/lzma/CPP/7zip/Common/FileStreams.cpp diff --git a/lzma/CPP/7zip/Common/FileStreams.h b/src/lzma/CPP/7zip/Common/FileStreams.h similarity index 100% rename from lzma/CPP/7zip/Common/FileStreams.h rename to src/lzma/CPP/7zip/Common/FileStreams.h diff --git a/lzma/CPP/7zip/Common/FilterCoder.cpp b/src/lzma/CPP/7zip/Common/FilterCoder.cpp similarity index 100% rename from lzma/CPP/7zip/Common/FilterCoder.cpp rename to src/lzma/CPP/7zip/Common/FilterCoder.cpp diff --git a/lzma/CPP/7zip/Common/FilterCoder.h b/src/lzma/CPP/7zip/Common/FilterCoder.h similarity index 100% rename from lzma/CPP/7zip/Common/FilterCoder.h rename to src/lzma/CPP/7zip/Common/FilterCoder.h diff --git a/lzma/CPP/7zip/Common/InBuffer.cpp b/src/lzma/CPP/7zip/Common/InBuffer.cpp similarity index 100% rename from lzma/CPP/7zip/Common/InBuffer.cpp rename to src/lzma/CPP/7zip/Common/InBuffer.cpp diff --git a/lzma/CPP/7zip/Common/InBuffer.h b/src/lzma/CPP/7zip/Common/InBuffer.h similarity index 100% rename from lzma/CPP/7zip/Common/InBuffer.h rename to src/lzma/CPP/7zip/Common/InBuffer.h diff --git a/lzma/CPP/7zip/Common/InOutTempBuffer.cpp b/src/lzma/CPP/7zip/Common/InOutTempBuffer.cpp similarity index 100% rename from lzma/CPP/7zip/Common/InOutTempBuffer.cpp rename to src/lzma/CPP/7zip/Common/InOutTempBuffer.cpp diff --git a/lzma/CPP/7zip/Common/InOutTempBuffer.h b/src/lzma/CPP/7zip/Common/InOutTempBuffer.h similarity index 100% rename from lzma/CPP/7zip/Common/InOutTempBuffer.h rename to src/lzma/CPP/7zip/Common/InOutTempBuffer.h diff --git a/lzma/CPP/7zip/Common/LimitedStreams.cpp b/src/lzma/CPP/7zip/Common/LimitedStreams.cpp similarity index 100% rename from lzma/CPP/7zip/Common/LimitedStreams.cpp rename to src/lzma/CPP/7zip/Common/LimitedStreams.cpp diff --git a/lzma/CPP/7zip/Common/LimitedStreams.h b/src/lzma/CPP/7zip/Common/LimitedStreams.h similarity index 100% rename from lzma/CPP/7zip/Common/LimitedStreams.h rename to src/lzma/CPP/7zip/Common/LimitedStreams.h diff --git a/lzma/CPP/7zip/Common/LockedStream.cpp b/src/lzma/CPP/7zip/Common/LockedStream.cpp similarity index 100% rename from lzma/CPP/7zip/Common/LockedStream.cpp rename to src/lzma/CPP/7zip/Common/LockedStream.cpp diff --git a/lzma/CPP/7zip/Common/LockedStream.h b/src/lzma/CPP/7zip/Common/LockedStream.h similarity index 100% rename from lzma/CPP/7zip/Common/LockedStream.h rename to src/lzma/CPP/7zip/Common/LockedStream.h diff --git a/lzma/CPP/7zip/Common/MethodId.cpp b/src/lzma/CPP/7zip/Common/MethodId.cpp similarity index 100% rename from lzma/CPP/7zip/Common/MethodId.cpp rename to src/lzma/CPP/7zip/Common/MethodId.cpp diff --git a/lzma/CPP/7zip/Common/MethodId.h b/src/lzma/CPP/7zip/Common/MethodId.h similarity index 100% rename from lzma/CPP/7zip/Common/MethodId.h rename to src/lzma/CPP/7zip/Common/MethodId.h diff --git a/lzma/CPP/7zip/Common/MethodProps.cpp b/src/lzma/CPP/7zip/Common/MethodProps.cpp similarity index 100% rename from lzma/CPP/7zip/Common/MethodProps.cpp rename to src/lzma/CPP/7zip/Common/MethodProps.cpp diff --git a/lzma/CPP/7zip/Common/MethodProps.h b/src/lzma/CPP/7zip/Common/MethodProps.h similarity index 100% rename from lzma/CPP/7zip/Common/MethodProps.h rename to src/lzma/CPP/7zip/Common/MethodProps.h diff --git a/lzma/CPP/7zip/Common/OffsetStream.cpp b/src/lzma/CPP/7zip/Common/OffsetStream.cpp similarity index 100% rename from lzma/CPP/7zip/Common/OffsetStream.cpp rename to src/lzma/CPP/7zip/Common/OffsetStream.cpp diff --git a/lzma/CPP/7zip/Common/OffsetStream.h b/src/lzma/CPP/7zip/Common/OffsetStream.h similarity index 100% rename from lzma/CPP/7zip/Common/OffsetStream.h rename to src/lzma/CPP/7zip/Common/OffsetStream.h diff --git a/lzma/CPP/7zip/Common/OutBuffer.cpp b/src/lzma/CPP/7zip/Common/OutBuffer.cpp similarity index 100% rename from lzma/CPP/7zip/Common/OutBuffer.cpp rename to src/lzma/CPP/7zip/Common/OutBuffer.cpp diff --git a/lzma/CPP/7zip/Common/OutBuffer.h b/src/lzma/CPP/7zip/Common/OutBuffer.h similarity index 100% rename from lzma/CPP/7zip/Common/OutBuffer.h rename to src/lzma/CPP/7zip/Common/OutBuffer.h diff --git a/lzma/CPP/7zip/Common/ProgressUtils.cpp b/src/lzma/CPP/7zip/Common/ProgressUtils.cpp similarity index 100% rename from lzma/CPP/7zip/Common/ProgressUtils.cpp rename to src/lzma/CPP/7zip/Common/ProgressUtils.cpp diff --git a/lzma/CPP/7zip/Common/ProgressUtils.h b/src/lzma/CPP/7zip/Common/ProgressUtils.h similarity index 100% rename from lzma/CPP/7zip/Common/ProgressUtils.h rename to src/lzma/CPP/7zip/Common/ProgressUtils.h diff --git a/lzma/CPP/7zip/Common/RegisterArc.h b/src/lzma/CPP/7zip/Common/RegisterArc.h similarity index 100% rename from lzma/CPP/7zip/Common/RegisterArc.h rename to src/lzma/CPP/7zip/Common/RegisterArc.h diff --git a/lzma/CPP/7zip/Common/RegisterCodec.h b/src/lzma/CPP/7zip/Common/RegisterCodec.h similarity index 100% rename from lzma/CPP/7zip/Common/RegisterCodec.h rename to src/lzma/CPP/7zip/Common/RegisterCodec.h diff --git a/lzma/CPP/7zip/Common/StdAfx.h b/src/lzma/CPP/7zip/Common/StdAfx.h similarity index 100% rename from lzma/CPP/7zip/Common/StdAfx.h rename to src/lzma/CPP/7zip/Common/StdAfx.h diff --git a/lzma/CPP/7zip/Common/StreamBinder.cpp b/src/lzma/CPP/7zip/Common/StreamBinder.cpp similarity index 100% rename from lzma/CPP/7zip/Common/StreamBinder.cpp rename to src/lzma/CPP/7zip/Common/StreamBinder.cpp diff --git a/lzma/CPP/7zip/Common/StreamBinder.h b/src/lzma/CPP/7zip/Common/StreamBinder.h similarity index 100% rename from lzma/CPP/7zip/Common/StreamBinder.h rename to src/lzma/CPP/7zip/Common/StreamBinder.h diff --git a/lzma/CPP/7zip/Common/StreamObjects.cpp b/src/lzma/CPP/7zip/Common/StreamObjects.cpp similarity index 100% rename from lzma/CPP/7zip/Common/StreamObjects.cpp rename to src/lzma/CPP/7zip/Common/StreamObjects.cpp diff --git a/lzma/CPP/7zip/Common/StreamObjects.h b/src/lzma/CPP/7zip/Common/StreamObjects.h similarity index 100% rename from lzma/CPP/7zip/Common/StreamObjects.h rename to src/lzma/CPP/7zip/Common/StreamObjects.h diff --git a/lzma/CPP/7zip/Common/StreamUtils.cpp b/src/lzma/CPP/7zip/Common/StreamUtils.cpp similarity index 100% rename from lzma/CPP/7zip/Common/StreamUtils.cpp rename to src/lzma/CPP/7zip/Common/StreamUtils.cpp diff --git a/lzma/CPP/7zip/Common/StreamUtils.h b/src/lzma/CPP/7zip/Common/StreamUtils.h similarity index 100% rename from lzma/CPP/7zip/Common/StreamUtils.h rename to src/lzma/CPP/7zip/Common/StreamUtils.h diff --git a/lzma/CPP/7zip/Common/VirtThread.cpp b/src/lzma/CPP/7zip/Common/VirtThread.cpp similarity index 100% rename from lzma/CPP/7zip/Common/VirtThread.cpp rename to src/lzma/CPP/7zip/Common/VirtThread.cpp diff --git a/lzma/CPP/7zip/Common/VirtThread.h b/src/lzma/CPP/7zip/Common/VirtThread.h similarity index 100% rename from lzma/CPP/7zip/Common/VirtThread.h rename to src/lzma/CPP/7zip/Common/VirtThread.h diff --git a/lzma/CPP/7zip/Compress/Branch/ARM.cpp b/src/lzma/CPP/7zip/Compress/Branch/ARM.cpp similarity index 100% rename from lzma/CPP/7zip/Compress/Branch/ARM.cpp rename to src/lzma/CPP/7zip/Compress/Branch/ARM.cpp diff --git a/lzma/CPP/7zip/Compress/Branch/ARM.h b/src/lzma/CPP/7zip/Compress/Branch/ARM.h similarity index 100% rename from lzma/CPP/7zip/Compress/Branch/ARM.h rename to src/lzma/CPP/7zip/Compress/Branch/ARM.h diff --git a/lzma/CPP/7zip/Compress/Branch/ARMThumb.cpp b/src/lzma/CPP/7zip/Compress/Branch/ARMThumb.cpp similarity index 100% rename from lzma/CPP/7zip/Compress/Branch/ARMThumb.cpp rename to src/lzma/CPP/7zip/Compress/Branch/ARMThumb.cpp diff --git a/lzma/CPP/7zip/Compress/Branch/ARMThumb.h b/src/lzma/CPP/7zip/Compress/Branch/ARMThumb.h similarity index 100% rename from lzma/CPP/7zip/Compress/Branch/ARMThumb.h rename to src/lzma/CPP/7zip/Compress/Branch/ARMThumb.h diff --git a/lzma/CPP/7zip/Compress/Branch/BCJ2Register.cpp b/src/lzma/CPP/7zip/Compress/Branch/BCJ2Register.cpp similarity index 100% rename from lzma/CPP/7zip/Compress/Branch/BCJ2Register.cpp rename to src/lzma/CPP/7zip/Compress/Branch/BCJ2Register.cpp diff --git a/lzma/CPP/7zip/Compress/Branch/BCJRegister.cpp b/src/lzma/CPP/7zip/Compress/Branch/BCJRegister.cpp similarity index 100% rename from lzma/CPP/7zip/Compress/Branch/BCJRegister.cpp rename to src/lzma/CPP/7zip/Compress/Branch/BCJRegister.cpp diff --git a/lzma/CPP/7zip/Compress/Branch/BranchCoder.cpp b/src/lzma/CPP/7zip/Compress/Branch/BranchCoder.cpp similarity index 100% rename from lzma/CPP/7zip/Compress/Branch/BranchCoder.cpp rename to src/lzma/CPP/7zip/Compress/Branch/BranchCoder.cpp diff --git a/lzma/CPP/7zip/Compress/Branch/BranchCoder.h b/src/lzma/CPP/7zip/Compress/Branch/BranchCoder.h similarity index 100% rename from lzma/CPP/7zip/Compress/Branch/BranchCoder.h rename to src/lzma/CPP/7zip/Compress/Branch/BranchCoder.h diff --git a/lzma/CPP/7zip/Compress/Branch/BranchRegister.cpp b/src/lzma/CPP/7zip/Compress/Branch/BranchRegister.cpp similarity index 100% rename from lzma/CPP/7zip/Compress/Branch/BranchRegister.cpp rename to src/lzma/CPP/7zip/Compress/Branch/BranchRegister.cpp diff --git a/lzma/CPP/7zip/Compress/Branch/IA64.cpp b/src/lzma/CPP/7zip/Compress/Branch/IA64.cpp similarity index 100% rename from lzma/CPP/7zip/Compress/Branch/IA64.cpp rename to src/lzma/CPP/7zip/Compress/Branch/IA64.cpp diff --git a/lzma/CPP/7zip/Compress/Branch/IA64.h b/src/lzma/CPP/7zip/Compress/Branch/IA64.h similarity index 100% rename from lzma/CPP/7zip/Compress/Branch/IA64.h rename to src/lzma/CPP/7zip/Compress/Branch/IA64.h diff --git a/lzma/CPP/7zip/Compress/Branch/PPC.cpp b/src/lzma/CPP/7zip/Compress/Branch/PPC.cpp similarity index 100% rename from lzma/CPP/7zip/Compress/Branch/PPC.cpp rename to src/lzma/CPP/7zip/Compress/Branch/PPC.cpp diff --git a/lzma/CPP/7zip/Compress/Branch/PPC.h b/src/lzma/CPP/7zip/Compress/Branch/PPC.h similarity index 100% rename from lzma/CPP/7zip/Compress/Branch/PPC.h rename to src/lzma/CPP/7zip/Compress/Branch/PPC.h diff --git a/lzma/CPP/7zip/Compress/Branch/SPARC.cpp b/src/lzma/CPP/7zip/Compress/Branch/SPARC.cpp similarity index 100% rename from lzma/CPP/7zip/Compress/Branch/SPARC.cpp rename to src/lzma/CPP/7zip/Compress/Branch/SPARC.cpp diff --git a/lzma/CPP/7zip/Compress/Branch/SPARC.h b/src/lzma/CPP/7zip/Compress/Branch/SPARC.h similarity index 100% rename from lzma/CPP/7zip/Compress/Branch/SPARC.h rename to src/lzma/CPP/7zip/Compress/Branch/SPARC.h diff --git a/lzma/CPP/7zip/Compress/Branch/StdAfx.cpp b/src/lzma/CPP/7zip/Compress/Branch/StdAfx.cpp similarity index 100% rename from lzma/CPP/7zip/Compress/Branch/StdAfx.cpp rename to src/lzma/CPP/7zip/Compress/Branch/StdAfx.cpp diff --git a/lzma/CPP/7zip/Compress/Branch/StdAfx.h b/src/lzma/CPP/7zip/Compress/Branch/StdAfx.h similarity index 100% rename from lzma/CPP/7zip/Compress/Branch/StdAfx.h rename to src/lzma/CPP/7zip/Compress/Branch/StdAfx.h diff --git a/lzma/CPP/7zip/Compress/Branch/x86.cpp b/src/lzma/CPP/7zip/Compress/Branch/x86.cpp similarity index 100% rename from lzma/CPP/7zip/Compress/Branch/x86.cpp rename to src/lzma/CPP/7zip/Compress/Branch/x86.cpp diff --git a/lzma/CPP/7zip/Compress/Branch/x86.h b/src/lzma/CPP/7zip/Compress/Branch/x86.h similarity index 100% rename from lzma/CPP/7zip/Compress/Branch/x86.h rename to src/lzma/CPP/7zip/Compress/Branch/x86.h diff --git a/lzma/CPP/7zip/Compress/Branch/x86_2.cpp b/src/lzma/CPP/7zip/Compress/Branch/x86_2.cpp similarity index 100% rename from lzma/CPP/7zip/Compress/Branch/x86_2.cpp rename to src/lzma/CPP/7zip/Compress/Branch/x86_2.cpp diff --git a/lzma/CPP/7zip/Compress/Branch/x86_2.h b/src/lzma/CPP/7zip/Compress/Branch/x86_2.h similarity index 100% rename from lzma/CPP/7zip/Compress/Branch/x86_2.h rename to src/lzma/CPP/7zip/Compress/Branch/x86_2.h diff --git a/lzma/CPP/7zip/Compress/ByteSwap/ByteSwap.cpp b/src/lzma/CPP/7zip/Compress/ByteSwap/ByteSwap.cpp similarity index 100% rename from lzma/CPP/7zip/Compress/ByteSwap/ByteSwap.cpp rename to src/lzma/CPP/7zip/Compress/ByteSwap/ByteSwap.cpp diff --git a/lzma/CPP/7zip/Compress/ByteSwap/ByteSwap.h b/src/lzma/CPP/7zip/Compress/ByteSwap/ByteSwap.h similarity index 100% rename from lzma/CPP/7zip/Compress/ByteSwap/ByteSwap.h rename to src/lzma/CPP/7zip/Compress/ByteSwap/ByteSwap.h diff --git a/lzma/CPP/7zip/Compress/ByteSwap/ByteSwapRegister.cpp b/src/lzma/CPP/7zip/Compress/ByteSwap/ByteSwapRegister.cpp similarity index 100% rename from lzma/CPP/7zip/Compress/ByteSwap/ByteSwapRegister.cpp rename to src/lzma/CPP/7zip/Compress/ByteSwap/ByteSwapRegister.cpp diff --git a/lzma/CPP/7zip/Compress/ByteSwap/StdAfx.cpp b/src/lzma/CPP/7zip/Compress/ByteSwap/StdAfx.cpp similarity index 100% rename from lzma/CPP/7zip/Compress/ByteSwap/StdAfx.cpp rename to src/lzma/CPP/7zip/Compress/ByteSwap/StdAfx.cpp diff --git a/lzma/CPP/7zip/Compress/ByteSwap/StdAfx.h b/src/lzma/CPP/7zip/Compress/ByteSwap/StdAfx.h similarity index 100% rename from lzma/CPP/7zip/Compress/ByteSwap/StdAfx.h rename to src/lzma/CPP/7zip/Compress/ByteSwap/StdAfx.h diff --git a/lzma/CPP/7zip/Compress/CodecExports.cpp b/src/lzma/CPP/7zip/Compress/CodecExports.cpp similarity index 100% rename from lzma/CPP/7zip/Compress/CodecExports.cpp rename to src/lzma/CPP/7zip/Compress/CodecExports.cpp diff --git a/lzma/CPP/7zip/Compress/Copy/CopyCoder.cpp b/src/lzma/CPP/7zip/Compress/Copy/CopyCoder.cpp similarity index 100% rename from lzma/CPP/7zip/Compress/Copy/CopyCoder.cpp rename to src/lzma/CPP/7zip/Compress/Copy/CopyCoder.cpp diff --git a/lzma/CPP/7zip/Compress/Copy/CopyCoder.h b/src/lzma/CPP/7zip/Compress/Copy/CopyCoder.h similarity index 100% rename from lzma/CPP/7zip/Compress/Copy/CopyCoder.h rename to src/lzma/CPP/7zip/Compress/Copy/CopyCoder.h diff --git a/lzma/CPP/7zip/Compress/Copy/CopyRegister.cpp b/src/lzma/CPP/7zip/Compress/Copy/CopyRegister.cpp similarity index 100% rename from lzma/CPP/7zip/Compress/Copy/CopyRegister.cpp rename to src/lzma/CPP/7zip/Compress/Copy/CopyRegister.cpp diff --git a/lzma/CPP/7zip/Compress/Copy/StdAfx.cpp b/src/lzma/CPP/7zip/Compress/Copy/StdAfx.cpp similarity index 100% rename from lzma/CPP/7zip/Compress/Copy/StdAfx.cpp rename to src/lzma/CPP/7zip/Compress/Copy/StdAfx.cpp diff --git a/lzma/CPP/7zip/Compress/Copy/StdAfx.h b/src/lzma/CPP/7zip/Compress/Copy/StdAfx.h similarity index 100% rename from lzma/CPP/7zip/Compress/Copy/StdAfx.h rename to src/lzma/CPP/7zip/Compress/Copy/StdAfx.h diff --git a/lzma/CPP/7zip/Compress/LZ/LZOutWindow.cpp b/src/lzma/CPP/7zip/Compress/LZ/LZOutWindow.cpp similarity index 100% rename from lzma/CPP/7zip/Compress/LZ/LZOutWindow.cpp rename to src/lzma/CPP/7zip/Compress/LZ/LZOutWindow.cpp diff --git a/lzma/CPP/7zip/Compress/LZ/LZOutWindow.h b/src/lzma/CPP/7zip/Compress/LZ/LZOutWindow.h similarity index 100% rename from lzma/CPP/7zip/Compress/LZ/LZOutWindow.h rename to src/lzma/CPP/7zip/Compress/LZ/LZOutWindow.h diff --git a/lzma/CPP/7zip/Compress/LZ/StdAfx.h b/src/lzma/CPP/7zip/Compress/LZ/StdAfx.h similarity index 100% rename from lzma/CPP/7zip/Compress/LZ/StdAfx.h rename to src/lzma/CPP/7zip/Compress/LZ/StdAfx.h diff --git a/lzma/CPP/7zip/Compress/LZMA/LZMA.h b/src/lzma/CPP/7zip/Compress/LZMA/LZMA.h similarity index 100% rename from lzma/CPP/7zip/Compress/LZMA/LZMA.h rename to src/lzma/CPP/7zip/Compress/LZMA/LZMA.h diff --git a/lzma/CPP/7zip/Compress/LZMA/LZMADecoder.cpp b/src/lzma/CPP/7zip/Compress/LZMA/LZMADecoder.cpp similarity index 100% rename from lzma/CPP/7zip/Compress/LZMA/LZMADecoder.cpp rename to src/lzma/CPP/7zip/Compress/LZMA/LZMADecoder.cpp diff --git a/lzma/CPP/7zip/Compress/LZMA/LZMADecoder.h b/src/lzma/CPP/7zip/Compress/LZMA/LZMADecoder.h similarity index 100% rename from lzma/CPP/7zip/Compress/LZMA/LZMADecoder.h rename to src/lzma/CPP/7zip/Compress/LZMA/LZMADecoder.h diff --git a/lzma/CPP/7zip/Compress/LZMA/LZMAEncoder.cpp b/src/lzma/CPP/7zip/Compress/LZMA/LZMAEncoder.cpp similarity index 100% rename from lzma/CPP/7zip/Compress/LZMA/LZMAEncoder.cpp rename to src/lzma/CPP/7zip/Compress/LZMA/LZMAEncoder.cpp diff --git a/lzma/CPP/7zip/Compress/LZMA/LZMAEncoder.h b/src/lzma/CPP/7zip/Compress/LZMA/LZMAEncoder.h similarity index 100% rename from lzma/CPP/7zip/Compress/LZMA/LZMAEncoder.h rename to src/lzma/CPP/7zip/Compress/LZMA/LZMAEncoder.h diff --git a/lzma/CPP/7zip/Compress/LZMA/LZMARegister.cpp b/src/lzma/CPP/7zip/Compress/LZMA/LZMARegister.cpp similarity index 100% rename from lzma/CPP/7zip/Compress/LZMA/LZMARegister.cpp rename to src/lzma/CPP/7zip/Compress/LZMA/LZMARegister.cpp diff --git a/lzma/CPP/7zip/Compress/LZMA/StdAfx.cpp b/src/lzma/CPP/7zip/Compress/LZMA/StdAfx.cpp similarity index 100% rename from lzma/CPP/7zip/Compress/LZMA/StdAfx.cpp rename to src/lzma/CPP/7zip/Compress/LZMA/StdAfx.cpp diff --git a/lzma/CPP/7zip/Compress/LZMA/StdAfx.h b/src/lzma/CPP/7zip/Compress/LZMA/StdAfx.h similarity index 100% rename from lzma/CPP/7zip/Compress/LZMA/StdAfx.h rename to src/lzma/CPP/7zip/Compress/LZMA/StdAfx.h diff --git a/lzma/CPP/7zip/Compress/LZMA_Alone/AloneLZMA.dsp b/src/lzma/CPP/7zip/Compress/LZMA_Alone/AloneLZMA.dsp similarity index 100% rename from lzma/CPP/7zip/Compress/LZMA_Alone/AloneLZMA.dsp rename to src/lzma/CPP/7zip/Compress/LZMA_Alone/AloneLZMA.dsp diff --git a/lzma/CPP/7zip/Compress/LZMA_Alone/AloneLZMA.dsw b/src/lzma/CPP/7zip/Compress/LZMA_Alone/AloneLZMA.dsw similarity index 100% rename from lzma/CPP/7zip/Compress/LZMA_Alone/AloneLZMA.dsw rename to src/lzma/CPP/7zip/Compress/LZMA_Alone/AloneLZMA.dsw diff --git a/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaAlone.cpp b/src/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaAlone.cpp similarity index 100% rename from lzma/CPP/7zip/Compress/LZMA_Alone/LzmaAlone.cpp rename to src/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaAlone.cpp diff --git a/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaBench.cpp b/src/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaBench.cpp similarity index 100% rename from lzma/CPP/7zip/Compress/LZMA_Alone/LzmaBench.cpp rename to src/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaBench.cpp diff --git a/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaBench.h b/src/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaBench.h similarity index 100% rename from lzma/CPP/7zip/Compress/LZMA_Alone/LzmaBench.h rename to src/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaBench.h diff --git a/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaBenchCon.cpp b/src/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaBenchCon.cpp similarity index 100% rename from lzma/CPP/7zip/Compress/LZMA_Alone/LzmaBenchCon.cpp rename to src/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaBenchCon.cpp diff --git a/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaBenchCon.h b/src/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaBenchCon.h similarity index 100% rename from lzma/CPP/7zip/Compress/LZMA_Alone/LzmaBenchCon.h rename to src/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaBenchCon.h diff --git a/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaRam.cpp b/src/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaRam.cpp similarity index 100% rename from lzma/CPP/7zip/Compress/LZMA_Alone/LzmaRam.cpp rename to src/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaRam.cpp diff --git a/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaRam.h b/src/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaRam.h similarity index 100% rename from lzma/CPP/7zip/Compress/LZMA_Alone/LzmaRam.h rename to src/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaRam.h diff --git a/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaRamDecode.c b/src/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaRamDecode.c similarity index 100% rename from lzma/CPP/7zip/Compress/LZMA_Alone/LzmaRamDecode.c rename to src/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaRamDecode.c diff --git a/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaRamDecode.h b/src/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaRamDecode.h similarity index 100% rename from lzma/CPP/7zip/Compress/LZMA_Alone/LzmaRamDecode.h rename to src/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaRamDecode.h diff --git a/lzma/CPP/7zip/Compress/LZMA_Alone/StdAfx.cpp b/src/lzma/CPP/7zip/Compress/LZMA_Alone/StdAfx.cpp similarity index 100% rename from lzma/CPP/7zip/Compress/LZMA_Alone/StdAfx.cpp rename to src/lzma/CPP/7zip/Compress/LZMA_Alone/StdAfx.cpp diff --git a/lzma/CPP/7zip/Compress/LZMA_Alone/StdAfx.h b/src/lzma/CPP/7zip/Compress/LZMA_Alone/StdAfx.h similarity index 100% rename from lzma/CPP/7zip/Compress/LZMA_Alone/StdAfx.h rename to src/lzma/CPP/7zip/Compress/LZMA_Alone/StdAfx.h diff --git a/lzma/CPP/7zip/Compress/LZMA_Alone/makefile b/src/lzma/CPP/7zip/Compress/LZMA_Alone/makefile similarity index 100% rename from lzma/CPP/7zip/Compress/LZMA_Alone/makefile rename to src/lzma/CPP/7zip/Compress/LZMA_Alone/makefile diff --git a/lzma/CPP/7zip/Compress/LZMA_Alone/makefile.gcc b/src/lzma/CPP/7zip/Compress/LZMA_Alone/makefile.gcc similarity index 100% rename from lzma/CPP/7zip/Compress/LZMA_Alone/makefile.gcc rename to src/lzma/CPP/7zip/Compress/LZMA_Alone/makefile.gcc diff --git a/lzma/CPP/7zip/Compress/RangeCoder/RangeCoder.h b/src/lzma/CPP/7zip/Compress/RangeCoder/RangeCoder.h similarity index 100% rename from lzma/CPP/7zip/Compress/RangeCoder/RangeCoder.h rename to src/lzma/CPP/7zip/Compress/RangeCoder/RangeCoder.h diff --git a/lzma/CPP/7zip/Compress/RangeCoder/RangeCoderBit.cpp b/src/lzma/CPP/7zip/Compress/RangeCoder/RangeCoderBit.cpp similarity index 100% rename from lzma/CPP/7zip/Compress/RangeCoder/RangeCoderBit.cpp rename to src/lzma/CPP/7zip/Compress/RangeCoder/RangeCoderBit.cpp diff --git a/lzma/CPP/7zip/Compress/RangeCoder/RangeCoderBit.h b/src/lzma/CPP/7zip/Compress/RangeCoder/RangeCoderBit.h similarity index 100% rename from lzma/CPP/7zip/Compress/RangeCoder/RangeCoderBit.h rename to src/lzma/CPP/7zip/Compress/RangeCoder/RangeCoderBit.h diff --git a/lzma/CPP/7zip/Compress/RangeCoder/RangeCoderBitTree.h b/src/lzma/CPP/7zip/Compress/RangeCoder/RangeCoderBitTree.h similarity index 100% rename from lzma/CPP/7zip/Compress/RangeCoder/RangeCoderBitTree.h rename to src/lzma/CPP/7zip/Compress/RangeCoder/RangeCoderBitTree.h diff --git a/lzma/CPP/7zip/Compress/RangeCoder/RangeCoderOpt.h b/src/lzma/CPP/7zip/Compress/RangeCoder/RangeCoderOpt.h similarity index 100% rename from lzma/CPP/7zip/Compress/RangeCoder/RangeCoderOpt.h rename to src/lzma/CPP/7zip/Compress/RangeCoder/RangeCoderOpt.h diff --git a/lzma/CPP/7zip/Compress/RangeCoder/StdAfx.h b/src/lzma/CPP/7zip/Compress/RangeCoder/StdAfx.h similarity index 100% rename from lzma/CPP/7zip/Compress/RangeCoder/StdAfx.h rename to src/lzma/CPP/7zip/Compress/RangeCoder/StdAfx.h diff --git a/lzma/CPP/7zip/ICoder.h b/src/lzma/CPP/7zip/ICoder.h similarity index 100% rename from lzma/CPP/7zip/ICoder.h rename to src/lzma/CPP/7zip/ICoder.h diff --git a/lzma/CPP/7zip/IDecl.h b/src/lzma/CPP/7zip/IDecl.h similarity index 100% rename from lzma/CPP/7zip/IDecl.h rename to src/lzma/CPP/7zip/IDecl.h diff --git a/lzma/CPP/7zip/IPassword.h b/src/lzma/CPP/7zip/IPassword.h similarity index 100% rename from lzma/CPP/7zip/IPassword.h rename to src/lzma/CPP/7zip/IPassword.h diff --git a/lzma/CPP/7zip/IProgress.h b/src/lzma/CPP/7zip/IProgress.h similarity index 100% rename from lzma/CPP/7zip/IProgress.h rename to src/lzma/CPP/7zip/IProgress.h diff --git a/lzma/CPP/7zip/IStream.h b/src/lzma/CPP/7zip/IStream.h similarity index 100% rename from lzma/CPP/7zip/IStream.h rename to src/lzma/CPP/7zip/IStream.h diff --git a/lzma/CPP/7zip/MyVersion.h b/src/lzma/CPP/7zip/MyVersion.h similarity index 100% rename from lzma/CPP/7zip/MyVersion.h rename to src/lzma/CPP/7zip/MyVersion.h diff --git a/lzma/CPP/7zip/MyVersionInfo.rc b/src/lzma/CPP/7zip/MyVersionInfo.rc similarity index 100% rename from lzma/CPP/7zip/MyVersionInfo.rc rename to src/lzma/CPP/7zip/MyVersionInfo.rc diff --git a/lzma/CPP/7zip/PropID.h b/src/lzma/CPP/7zip/PropID.h similarity index 100% rename from lzma/CPP/7zip/PropID.h rename to src/lzma/CPP/7zip/PropID.h diff --git a/lzma/CPP/7zip/UI/Client7z/Client7z.cpp b/src/lzma/CPP/7zip/UI/Client7z/Client7z.cpp similarity index 100% rename from lzma/CPP/7zip/UI/Client7z/Client7z.cpp rename to src/lzma/CPP/7zip/UI/Client7z/Client7z.cpp diff --git a/lzma/CPP/7zip/UI/Client7z/Client7z.dsp b/src/lzma/CPP/7zip/UI/Client7z/Client7z.dsp similarity index 100% rename from lzma/CPP/7zip/UI/Client7z/Client7z.dsp rename to src/lzma/CPP/7zip/UI/Client7z/Client7z.dsp diff --git a/lzma/CPP/7zip/UI/Client7z/Client7z.dsw b/src/lzma/CPP/7zip/UI/Client7z/Client7z.dsw similarity index 100% rename from lzma/CPP/7zip/UI/Client7z/Client7z.dsw rename to src/lzma/CPP/7zip/UI/Client7z/Client7z.dsw diff --git a/lzma/CPP/7zip/UI/Client7z/StdAfx.cpp b/src/lzma/CPP/7zip/UI/Client7z/StdAfx.cpp similarity index 100% rename from lzma/CPP/7zip/UI/Client7z/StdAfx.cpp rename to src/lzma/CPP/7zip/UI/Client7z/StdAfx.cpp diff --git a/lzma/CPP/7zip/UI/Client7z/StdAfx.h b/src/lzma/CPP/7zip/UI/Client7z/StdAfx.h similarity index 100% rename from lzma/CPP/7zip/UI/Client7z/StdAfx.h rename to src/lzma/CPP/7zip/UI/Client7z/StdAfx.h diff --git a/lzma/CPP/7zip/UI/Client7z/makefile b/src/lzma/CPP/7zip/UI/Client7z/makefile similarity index 100% rename from lzma/CPP/7zip/UI/Client7z/makefile rename to src/lzma/CPP/7zip/UI/Client7z/makefile diff --git a/lzma/CPP/7zip/UI/Common/ArchiveCommandLine.cpp b/src/lzma/CPP/7zip/UI/Common/ArchiveCommandLine.cpp similarity index 100% rename from lzma/CPP/7zip/UI/Common/ArchiveCommandLine.cpp rename to src/lzma/CPP/7zip/UI/Common/ArchiveCommandLine.cpp diff --git a/lzma/CPP/7zip/UI/Common/ArchiveCommandLine.h b/src/lzma/CPP/7zip/UI/Common/ArchiveCommandLine.h similarity index 100% rename from lzma/CPP/7zip/UI/Common/ArchiveCommandLine.h rename to src/lzma/CPP/7zip/UI/Common/ArchiveCommandLine.h diff --git a/lzma/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp b/src/lzma/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp similarity index 100% rename from lzma/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp rename to src/lzma/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp diff --git a/lzma/CPP/7zip/UI/Common/ArchiveExtractCallback.h b/src/lzma/CPP/7zip/UI/Common/ArchiveExtractCallback.h similarity index 100% rename from lzma/CPP/7zip/UI/Common/ArchiveExtractCallback.h rename to src/lzma/CPP/7zip/UI/Common/ArchiveExtractCallback.h diff --git a/lzma/CPP/7zip/UI/Common/ArchiveName.cpp b/src/lzma/CPP/7zip/UI/Common/ArchiveName.cpp similarity index 100% rename from lzma/CPP/7zip/UI/Common/ArchiveName.cpp rename to src/lzma/CPP/7zip/UI/Common/ArchiveName.cpp diff --git a/lzma/CPP/7zip/UI/Common/ArchiveName.h b/src/lzma/CPP/7zip/UI/Common/ArchiveName.h similarity index 100% rename from lzma/CPP/7zip/UI/Common/ArchiveName.h rename to src/lzma/CPP/7zip/UI/Common/ArchiveName.h diff --git a/lzma/CPP/7zip/UI/Common/ArchiveOpenCallback.cpp b/src/lzma/CPP/7zip/UI/Common/ArchiveOpenCallback.cpp similarity index 100% rename from lzma/CPP/7zip/UI/Common/ArchiveOpenCallback.cpp rename to src/lzma/CPP/7zip/UI/Common/ArchiveOpenCallback.cpp diff --git a/lzma/CPP/7zip/UI/Common/ArchiveOpenCallback.h b/src/lzma/CPP/7zip/UI/Common/ArchiveOpenCallback.h similarity index 100% rename from lzma/CPP/7zip/UI/Common/ArchiveOpenCallback.h rename to src/lzma/CPP/7zip/UI/Common/ArchiveOpenCallback.h diff --git a/lzma/CPP/7zip/UI/Common/DefaultName.cpp b/src/lzma/CPP/7zip/UI/Common/DefaultName.cpp similarity index 100% rename from lzma/CPP/7zip/UI/Common/DefaultName.cpp rename to src/lzma/CPP/7zip/UI/Common/DefaultName.cpp diff --git a/lzma/CPP/7zip/UI/Common/DefaultName.h b/src/lzma/CPP/7zip/UI/Common/DefaultName.h similarity index 100% rename from lzma/CPP/7zip/UI/Common/DefaultName.h rename to src/lzma/CPP/7zip/UI/Common/DefaultName.h diff --git a/lzma/CPP/7zip/UI/Common/DirItem.h b/src/lzma/CPP/7zip/UI/Common/DirItem.h similarity index 100% rename from lzma/CPP/7zip/UI/Common/DirItem.h rename to src/lzma/CPP/7zip/UI/Common/DirItem.h diff --git a/lzma/CPP/7zip/UI/Common/EnumDirItems.cpp b/src/lzma/CPP/7zip/UI/Common/EnumDirItems.cpp similarity index 100% rename from lzma/CPP/7zip/UI/Common/EnumDirItems.cpp rename to src/lzma/CPP/7zip/UI/Common/EnumDirItems.cpp diff --git a/lzma/CPP/7zip/UI/Common/EnumDirItems.h b/src/lzma/CPP/7zip/UI/Common/EnumDirItems.h similarity index 100% rename from lzma/CPP/7zip/UI/Common/EnumDirItems.h rename to src/lzma/CPP/7zip/UI/Common/EnumDirItems.h diff --git a/lzma/CPP/7zip/UI/Common/ExitCode.h b/src/lzma/CPP/7zip/UI/Common/ExitCode.h similarity index 100% rename from lzma/CPP/7zip/UI/Common/ExitCode.h rename to src/lzma/CPP/7zip/UI/Common/ExitCode.h diff --git a/lzma/CPP/7zip/UI/Common/Extract.cpp b/src/lzma/CPP/7zip/UI/Common/Extract.cpp similarity index 100% rename from lzma/CPP/7zip/UI/Common/Extract.cpp rename to src/lzma/CPP/7zip/UI/Common/Extract.cpp diff --git a/lzma/CPP/7zip/UI/Common/Extract.h b/src/lzma/CPP/7zip/UI/Common/Extract.h similarity index 100% rename from lzma/CPP/7zip/UI/Common/Extract.h rename to src/lzma/CPP/7zip/UI/Common/Extract.h diff --git a/lzma/CPP/7zip/UI/Common/ExtractMode.h b/src/lzma/CPP/7zip/UI/Common/ExtractMode.h similarity index 100% rename from lzma/CPP/7zip/UI/Common/ExtractMode.h rename to src/lzma/CPP/7zip/UI/Common/ExtractMode.h diff --git a/lzma/CPP/7zip/UI/Common/ExtractingFilePath.cpp b/src/lzma/CPP/7zip/UI/Common/ExtractingFilePath.cpp similarity index 100% rename from lzma/CPP/7zip/UI/Common/ExtractingFilePath.cpp rename to src/lzma/CPP/7zip/UI/Common/ExtractingFilePath.cpp diff --git a/lzma/CPP/7zip/UI/Common/ExtractingFilePath.h b/src/lzma/CPP/7zip/UI/Common/ExtractingFilePath.h similarity index 100% rename from lzma/CPP/7zip/UI/Common/ExtractingFilePath.h rename to src/lzma/CPP/7zip/UI/Common/ExtractingFilePath.h diff --git a/lzma/CPP/7zip/UI/Common/IFileExtractCallback.h b/src/lzma/CPP/7zip/UI/Common/IFileExtractCallback.h similarity index 100% rename from lzma/CPP/7zip/UI/Common/IFileExtractCallback.h rename to src/lzma/CPP/7zip/UI/Common/IFileExtractCallback.h diff --git a/lzma/CPP/7zip/UI/Common/LoadCodecs.cpp b/src/lzma/CPP/7zip/UI/Common/LoadCodecs.cpp similarity index 100% rename from lzma/CPP/7zip/UI/Common/LoadCodecs.cpp rename to src/lzma/CPP/7zip/UI/Common/LoadCodecs.cpp diff --git a/lzma/CPP/7zip/UI/Common/LoadCodecs.h b/src/lzma/CPP/7zip/UI/Common/LoadCodecs.h similarity index 100% rename from lzma/CPP/7zip/UI/Common/LoadCodecs.h rename to src/lzma/CPP/7zip/UI/Common/LoadCodecs.h diff --git a/lzma/CPP/7zip/UI/Common/OpenArchive.cpp b/src/lzma/CPP/7zip/UI/Common/OpenArchive.cpp similarity index 100% rename from lzma/CPP/7zip/UI/Common/OpenArchive.cpp rename to src/lzma/CPP/7zip/UI/Common/OpenArchive.cpp diff --git a/lzma/CPP/7zip/UI/Common/OpenArchive.h b/src/lzma/CPP/7zip/UI/Common/OpenArchive.h similarity index 100% rename from lzma/CPP/7zip/UI/Common/OpenArchive.h rename to src/lzma/CPP/7zip/UI/Common/OpenArchive.h diff --git a/lzma/CPP/7zip/UI/Common/PropIDUtils.cpp b/src/lzma/CPP/7zip/UI/Common/PropIDUtils.cpp similarity index 100% rename from lzma/CPP/7zip/UI/Common/PropIDUtils.cpp rename to src/lzma/CPP/7zip/UI/Common/PropIDUtils.cpp diff --git a/lzma/CPP/7zip/UI/Common/PropIDUtils.h b/src/lzma/CPP/7zip/UI/Common/PropIDUtils.h similarity index 100% rename from lzma/CPP/7zip/UI/Common/PropIDUtils.h rename to src/lzma/CPP/7zip/UI/Common/PropIDUtils.h diff --git a/lzma/CPP/7zip/UI/Common/Property.h b/src/lzma/CPP/7zip/UI/Common/Property.h similarity index 100% rename from lzma/CPP/7zip/UI/Common/Property.h rename to src/lzma/CPP/7zip/UI/Common/Property.h diff --git a/lzma/CPP/7zip/UI/Common/SetProperties.cpp b/src/lzma/CPP/7zip/UI/Common/SetProperties.cpp similarity index 100% rename from lzma/CPP/7zip/UI/Common/SetProperties.cpp rename to src/lzma/CPP/7zip/UI/Common/SetProperties.cpp diff --git a/lzma/CPP/7zip/UI/Common/SetProperties.h b/src/lzma/CPP/7zip/UI/Common/SetProperties.h similarity index 100% rename from lzma/CPP/7zip/UI/Common/SetProperties.h rename to src/lzma/CPP/7zip/UI/Common/SetProperties.h diff --git a/lzma/CPP/7zip/UI/Common/SortUtils.cpp b/src/lzma/CPP/7zip/UI/Common/SortUtils.cpp similarity index 100% rename from lzma/CPP/7zip/UI/Common/SortUtils.cpp rename to src/lzma/CPP/7zip/UI/Common/SortUtils.cpp diff --git a/lzma/CPP/7zip/UI/Common/SortUtils.h b/src/lzma/CPP/7zip/UI/Common/SortUtils.h similarity index 100% rename from lzma/CPP/7zip/UI/Common/SortUtils.h rename to src/lzma/CPP/7zip/UI/Common/SortUtils.h diff --git a/lzma/CPP/7zip/UI/Common/TempFiles.cpp b/src/lzma/CPP/7zip/UI/Common/TempFiles.cpp similarity index 100% rename from lzma/CPP/7zip/UI/Common/TempFiles.cpp rename to src/lzma/CPP/7zip/UI/Common/TempFiles.cpp diff --git a/lzma/CPP/7zip/UI/Common/TempFiles.h b/src/lzma/CPP/7zip/UI/Common/TempFiles.h similarity index 100% rename from lzma/CPP/7zip/UI/Common/TempFiles.h rename to src/lzma/CPP/7zip/UI/Common/TempFiles.h diff --git a/lzma/CPP/7zip/UI/Common/Update.cpp b/src/lzma/CPP/7zip/UI/Common/Update.cpp similarity index 100% rename from lzma/CPP/7zip/UI/Common/Update.cpp rename to src/lzma/CPP/7zip/UI/Common/Update.cpp diff --git a/lzma/CPP/7zip/UI/Common/Update.h b/src/lzma/CPP/7zip/UI/Common/Update.h similarity index 100% rename from lzma/CPP/7zip/UI/Common/Update.h rename to src/lzma/CPP/7zip/UI/Common/Update.h diff --git a/lzma/CPP/7zip/UI/Common/UpdateAction.cpp b/src/lzma/CPP/7zip/UI/Common/UpdateAction.cpp similarity index 100% rename from lzma/CPP/7zip/UI/Common/UpdateAction.cpp rename to src/lzma/CPP/7zip/UI/Common/UpdateAction.cpp diff --git a/lzma/CPP/7zip/UI/Common/UpdateAction.h b/src/lzma/CPP/7zip/UI/Common/UpdateAction.h similarity index 100% rename from lzma/CPP/7zip/UI/Common/UpdateAction.h rename to src/lzma/CPP/7zip/UI/Common/UpdateAction.h diff --git a/lzma/CPP/7zip/UI/Common/UpdateCallback.cpp b/src/lzma/CPP/7zip/UI/Common/UpdateCallback.cpp similarity index 100% rename from lzma/CPP/7zip/UI/Common/UpdateCallback.cpp rename to src/lzma/CPP/7zip/UI/Common/UpdateCallback.cpp diff --git a/lzma/CPP/7zip/UI/Common/UpdateCallback.h b/src/lzma/CPP/7zip/UI/Common/UpdateCallback.h similarity index 100% rename from lzma/CPP/7zip/UI/Common/UpdateCallback.h rename to src/lzma/CPP/7zip/UI/Common/UpdateCallback.h diff --git a/lzma/CPP/7zip/UI/Common/UpdatePair.cpp b/src/lzma/CPP/7zip/UI/Common/UpdatePair.cpp similarity index 100% rename from lzma/CPP/7zip/UI/Common/UpdatePair.cpp rename to src/lzma/CPP/7zip/UI/Common/UpdatePair.cpp diff --git a/lzma/CPP/7zip/UI/Common/UpdatePair.h b/src/lzma/CPP/7zip/UI/Common/UpdatePair.h similarity index 100% rename from lzma/CPP/7zip/UI/Common/UpdatePair.h rename to src/lzma/CPP/7zip/UI/Common/UpdatePair.h diff --git a/lzma/CPP/7zip/UI/Common/UpdateProduce.cpp b/src/lzma/CPP/7zip/UI/Common/UpdateProduce.cpp similarity index 100% rename from lzma/CPP/7zip/UI/Common/UpdateProduce.cpp rename to src/lzma/CPP/7zip/UI/Common/UpdateProduce.cpp diff --git a/lzma/CPP/7zip/UI/Common/UpdateProduce.h b/src/lzma/CPP/7zip/UI/Common/UpdateProduce.h similarity index 100% rename from lzma/CPP/7zip/UI/Common/UpdateProduce.h rename to src/lzma/CPP/7zip/UI/Common/UpdateProduce.h diff --git a/lzma/CPP/7zip/UI/Common/WorkDir.cpp b/src/lzma/CPP/7zip/UI/Common/WorkDir.cpp similarity index 100% rename from lzma/CPP/7zip/UI/Common/WorkDir.cpp rename to src/lzma/CPP/7zip/UI/Common/WorkDir.cpp diff --git a/lzma/CPP/7zip/UI/Common/WorkDir.h b/src/lzma/CPP/7zip/UI/Common/WorkDir.h similarity index 100% rename from lzma/CPP/7zip/UI/Common/WorkDir.h rename to src/lzma/CPP/7zip/UI/Common/WorkDir.h diff --git a/lzma/CPP/7zip/UI/Common/ZipRegistry.h b/src/lzma/CPP/7zip/UI/Common/ZipRegistry.h similarity index 100% rename from lzma/CPP/7zip/UI/Common/ZipRegistry.h rename to src/lzma/CPP/7zip/UI/Common/ZipRegistry.h diff --git a/lzma/CPP/7zip/UI/Console/ConsoleClose.cpp b/src/lzma/CPP/7zip/UI/Console/ConsoleClose.cpp similarity index 100% rename from lzma/CPP/7zip/UI/Console/ConsoleClose.cpp rename to src/lzma/CPP/7zip/UI/Console/ConsoleClose.cpp diff --git a/lzma/CPP/7zip/UI/Console/ConsoleClose.h b/src/lzma/CPP/7zip/UI/Console/ConsoleClose.h similarity index 100% rename from lzma/CPP/7zip/UI/Console/ConsoleClose.h rename to src/lzma/CPP/7zip/UI/Console/ConsoleClose.h diff --git a/lzma/CPP/7zip/UI/Console/ExtractCallbackConsole.cpp b/src/lzma/CPP/7zip/UI/Console/ExtractCallbackConsole.cpp similarity index 100% rename from lzma/CPP/7zip/UI/Console/ExtractCallbackConsole.cpp rename to src/lzma/CPP/7zip/UI/Console/ExtractCallbackConsole.cpp diff --git a/lzma/CPP/7zip/UI/Console/ExtractCallbackConsole.h b/src/lzma/CPP/7zip/UI/Console/ExtractCallbackConsole.h similarity index 100% rename from lzma/CPP/7zip/UI/Console/ExtractCallbackConsole.h rename to src/lzma/CPP/7zip/UI/Console/ExtractCallbackConsole.h diff --git a/lzma/CPP/7zip/UI/Console/List.cpp b/src/lzma/CPP/7zip/UI/Console/List.cpp similarity index 100% rename from lzma/CPP/7zip/UI/Console/List.cpp rename to src/lzma/CPP/7zip/UI/Console/List.cpp diff --git a/lzma/CPP/7zip/UI/Console/List.h b/src/lzma/CPP/7zip/UI/Console/List.h similarity index 100% rename from lzma/CPP/7zip/UI/Console/List.h rename to src/lzma/CPP/7zip/UI/Console/List.h diff --git a/lzma/CPP/7zip/UI/Console/Main.cpp b/src/lzma/CPP/7zip/UI/Console/Main.cpp similarity index 100% rename from lzma/CPP/7zip/UI/Console/Main.cpp rename to src/lzma/CPP/7zip/UI/Console/Main.cpp diff --git a/lzma/CPP/7zip/UI/Console/MainAr.cpp b/src/lzma/CPP/7zip/UI/Console/MainAr.cpp similarity index 100% rename from lzma/CPP/7zip/UI/Console/MainAr.cpp rename to src/lzma/CPP/7zip/UI/Console/MainAr.cpp diff --git a/lzma/CPP/7zip/UI/Console/OpenCallbackConsole.cpp b/src/lzma/CPP/7zip/UI/Console/OpenCallbackConsole.cpp similarity index 100% rename from lzma/CPP/7zip/UI/Console/OpenCallbackConsole.cpp rename to src/lzma/CPP/7zip/UI/Console/OpenCallbackConsole.cpp diff --git a/lzma/CPP/7zip/UI/Console/OpenCallbackConsole.h b/src/lzma/CPP/7zip/UI/Console/OpenCallbackConsole.h similarity index 100% rename from lzma/CPP/7zip/UI/Console/OpenCallbackConsole.h rename to src/lzma/CPP/7zip/UI/Console/OpenCallbackConsole.h diff --git a/lzma/CPP/7zip/UI/Console/PercentPrinter.cpp b/src/lzma/CPP/7zip/UI/Console/PercentPrinter.cpp similarity index 100% rename from lzma/CPP/7zip/UI/Console/PercentPrinter.cpp rename to src/lzma/CPP/7zip/UI/Console/PercentPrinter.cpp diff --git a/lzma/CPP/7zip/UI/Console/PercentPrinter.h b/src/lzma/CPP/7zip/UI/Console/PercentPrinter.h similarity index 100% rename from lzma/CPP/7zip/UI/Console/PercentPrinter.h rename to src/lzma/CPP/7zip/UI/Console/PercentPrinter.h diff --git a/lzma/CPP/7zip/UI/Console/StdAfx.cpp b/src/lzma/CPP/7zip/UI/Console/StdAfx.cpp similarity index 100% rename from lzma/CPP/7zip/UI/Console/StdAfx.cpp rename to src/lzma/CPP/7zip/UI/Console/StdAfx.cpp diff --git a/lzma/CPP/7zip/UI/Console/StdAfx.h b/src/lzma/CPP/7zip/UI/Console/StdAfx.h similarity index 100% rename from lzma/CPP/7zip/UI/Console/StdAfx.h rename to src/lzma/CPP/7zip/UI/Console/StdAfx.h diff --git a/lzma/CPP/7zip/UI/Console/UpdateCallbackConsole.cpp b/src/lzma/CPP/7zip/UI/Console/UpdateCallbackConsole.cpp similarity index 100% rename from lzma/CPP/7zip/UI/Console/UpdateCallbackConsole.cpp rename to src/lzma/CPP/7zip/UI/Console/UpdateCallbackConsole.cpp diff --git a/lzma/CPP/7zip/UI/Console/UpdateCallbackConsole.h b/src/lzma/CPP/7zip/UI/Console/UpdateCallbackConsole.h similarity index 100% rename from lzma/CPP/7zip/UI/Console/UpdateCallbackConsole.h rename to src/lzma/CPP/7zip/UI/Console/UpdateCallbackConsole.h diff --git a/lzma/CPP/7zip/UI/Console/UserInputUtils.cpp b/src/lzma/CPP/7zip/UI/Console/UserInputUtils.cpp similarity index 100% rename from lzma/CPP/7zip/UI/Console/UserInputUtils.cpp rename to src/lzma/CPP/7zip/UI/Console/UserInputUtils.cpp diff --git a/lzma/CPP/7zip/UI/Console/UserInputUtils.h b/src/lzma/CPP/7zip/UI/Console/UserInputUtils.h similarity index 100% rename from lzma/CPP/7zip/UI/Console/UserInputUtils.h rename to src/lzma/CPP/7zip/UI/Console/UserInputUtils.h diff --git a/lzma/CPP/7zip/UI/Console/afxres.h b/src/lzma/CPP/7zip/UI/Console/afxres.h similarity index 100% rename from lzma/CPP/7zip/UI/Console/afxres.h rename to src/lzma/CPP/7zip/UI/Console/afxres.h diff --git a/lzma/CPP/Build.mak b/src/lzma/CPP/Build.mak similarity index 100% rename from lzma/CPP/Build.mak rename to src/lzma/CPP/Build.mak diff --git a/lzma/CPP/Common/AutoPtr.h b/src/lzma/CPP/Common/AutoPtr.h similarity index 100% rename from lzma/CPP/Common/AutoPtr.h rename to src/lzma/CPP/Common/AutoPtr.h diff --git a/lzma/CPP/Common/Buffer.h b/src/lzma/CPP/Common/Buffer.h similarity index 100% rename from lzma/CPP/Common/Buffer.h rename to src/lzma/CPP/Common/Buffer.h diff --git a/lzma/CPP/Common/CRC.cpp b/src/lzma/CPP/Common/CRC.cpp similarity index 100% rename from lzma/CPP/Common/CRC.cpp rename to src/lzma/CPP/Common/CRC.cpp diff --git a/lzma/CPP/Common/C_FileIO.cpp b/src/lzma/CPP/Common/C_FileIO.cpp similarity index 100% rename from lzma/CPP/Common/C_FileIO.cpp rename to src/lzma/CPP/Common/C_FileIO.cpp diff --git a/lzma/CPP/Common/C_FileIO.h b/src/lzma/CPP/Common/C_FileIO.h similarity index 100% rename from lzma/CPP/Common/C_FileIO.h rename to src/lzma/CPP/Common/C_FileIO.h diff --git a/lzma/CPP/Common/ComTry.h b/src/lzma/CPP/Common/ComTry.h similarity index 100% rename from lzma/CPP/Common/ComTry.h rename to src/lzma/CPP/Common/ComTry.h diff --git a/lzma/CPP/Common/CommandLineParser.cpp b/src/lzma/CPP/Common/CommandLineParser.cpp similarity index 100% rename from lzma/CPP/Common/CommandLineParser.cpp rename to src/lzma/CPP/Common/CommandLineParser.cpp diff --git a/lzma/CPP/Common/CommandLineParser.h b/src/lzma/CPP/Common/CommandLineParser.h similarity index 100% rename from lzma/CPP/Common/CommandLineParser.h rename to src/lzma/CPP/Common/CommandLineParser.h diff --git a/lzma/CPP/Common/Defs.h b/src/lzma/CPP/Common/Defs.h similarity index 100% rename from lzma/CPP/Common/Defs.h rename to src/lzma/CPP/Common/Defs.h diff --git a/lzma/CPP/Common/DynamicBuffer.h b/src/lzma/CPP/Common/DynamicBuffer.h similarity index 100% rename from lzma/CPP/Common/DynamicBuffer.h rename to src/lzma/CPP/Common/DynamicBuffer.h diff --git a/lzma/CPP/Common/IntToString.cpp b/src/lzma/CPP/Common/IntToString.cpp similarity index 100% rename from lzma/CPP/Common/IntToString.cpp rename to src/lzma/CPP/Common/IntToString.cpp diff --git a/lzma/CPP/Common/IntToString.h b/src/lzma/CPP/Common/IntToString.h similarity index 100% rename from lzma/CPP/Common/IntToString.h rename to src/lzma/CPP/Common/IntToString.h diff --git a/lzma/CPP/Common/ListFileUtils.cpp b/src/lzma/CPP/Common/ListFileUtils.cpp similarity index 100% rename from lzma/CPP/Common/ListFileUtils.cpp rename to src/lzma/CPP/Common/ListFileUtils.cpp diff --git a/lzma/CPP/Common/ListFileUtils.h b/src/lzma/CPP/Common/ListFileUtils.h similarity index 100% rename from lzma/CPP/Common/ListFileUtils.h rename to src/lzma/CPP/Common/ListFileUtils.h diff --git a/lzma/CPP/Common/MyCom.h b/src/lzma/CPP/Common/MyCom.h similarity index 100% rename from lzma/CPP/Common/MyCom.h rename to src/lzma/CPP/Common/MyCom.h diff --git a/lzma/CPP/Common/MyException.h b/src/lzma/CPP/Common/MyException.h similarity index 100% rename from lzma/CPP/Common/MyException.h rename to src/lzma/CPP/Common/MyException.h diff --git a/lzma/CPP/Common/MyGuidDef.h b/src/lzma/CPP/Common/MyGuidDef.h similarity index 100% rename from lzma/CPP/Common/MyGuidDef.h rename to src/lzma/CPP/Common/MyGuidDef.h diff --git a/lzma/CPP/Common/MyInitGuid.h b/src/lzma/CPP/Common/MyInitGuid.h similarity index 100% rename from lzma/CPP/Common/MyInitGuid.h rename to src/lzma/CPP/Common/MyInitGuid.h diff --git a/lzma/CPP/Common/MyString.cpp b/src/lzma/CPP/Common/MyString.cpp similarity index 100% rename from lzma/CPP/Common/MyString.cpp rename to src/lzma/CPP/Common/MyString.cpp diff --git a/lzma/CPP/Common/MyString.h b/src/lzma/CPP/Common/MyString.h similarity index 100% rename from lzma/CPP/Common/MyString.h rename to src/lzma/CPP/Common/MyString.h diff --git a/lzma/CPP/Common/MyUnknown.h b/src/lzma/CPP/Common/MyUnknown.h similarity index 100% rename from lzma/CPP/Common/MyUnknown.h rename to src/lzma/CPP/Common/MyUnknown.h diff --git a/lzma/CPP/Common/MyVector.cpp b/src/lzma/CPP/Common/MyVector.cpp similarity index 100% rename from lzma/CPP/Common/MyVector.cpp rename to src/lzma/CPP/Common/MyVector.cpp diff --git a/lzma/CPP/Common/MyVector.h b/src/lzma/CPP/Common/MyVector.h similarity index 100% rename from lzma/CPP/Common/MyVector.h rename to src/lzma/CPP/Common/MyVector.h diff --git a/lzma/CPP/Common/MyWindows.h b/src/lzma/CPP/Common/MyWindows.h similarity index 100% rename from lzma/CPP/Common/MyWindows.h rename to src/lzma/CPP/Common/MyWindows.h diff --git a/lzma/CPP/Common/NewHandler.cpp b/src/lzma/CPP/Common/NewHandler.cpp similarity index 100% rename from lzma/CPP/Common/NewHandler.cpp rename to src/lzma/CPP/Common/NewHandler.cpp diff --git a/lzma/CPP/Common/NewHandler.h b/src/lzma/CPP/Common/NewHandler.h similarity index 100% rename from lzma/CPP/Common/NewHandler.h rename to src/lzma/CPP/Common/NewHandler.h diff --git a/lzma/CPP/Common/StdAfx.h b/src/lzma/CPP/Common/StdAfx.h similarity index 100% rename from lzma/CPP/Common/StdAfx.h rename to src/lzma/CPP/Common/StdAfx.h diff --git a/lzma/CPP/Common/StdInStream.cpp b/src/lzma/CPP/Common/StdInStream.cpp similarity index 100% rename from lzma/CPP/Common/StdInStream.cpp rename to src/lzma/CPP/Common/StdInStream.cpp diff --git a/lzma/CPP/Common/StdInStream.h b/src/lzma/CPP/Common/StdInStream.h similarity index 100% rename from lzma/CPP/Common/StdInStream.h rename to src/lzma/CPP/Common/StdInStream.h diff --git a/lzma/CPP/Common/StdOutStream.cpp b/src/lzma/CPP/Common/StdOutStream.cpp similarity index 100% rename from lzma/CPP/Common/StdOutStream.cpp rename to src/lzma/CPP/Common/StdOutStream.cpp diff --git a/lzma/CPP/Common/StdOutStream.h b/src/lzma/CPP/Common/StdOutStream.h similarity index 100% rename from lzma/CPP/Common/StdOutStream.h rename to src/lzma/CPP/Common/StdOutStream.h diff --git a/lzma/CPP/Common/StringConvert.cpp b/src/lzma/CPP/Common/StringConvert.cpp similarity index 100% rename from lzma/CPP/Common/StringConvert.cpp rename to src/lzma/CPP/Common/StringConvert.cpp diff --git a/lzma/CPP/Common/StringConvert.h b/src/lzma/CPP/Common/StringConvert.h similarity index 100% rename from lzma/CPP/Common/StringConvert.h rename to src/lzma/CPP/Common/StringConvert.h diff --git a/lzma/CPP/Common/StringToInt.cpp b/src/lzma/CPP/Common/StringToInt.cpp similarity index 100% rename from lzma/CPP/Common/StringToInt.cpp rename to src/lzma/CPP/Common/StringToInt.cpp diff --git a/lzma/CPP/Common/StringToInt.h b/src/lzma/CPP/Common/StringToInt.h similarity index 100% rename from lzma/CPP/Common/StringToInt.h rename to src/lzma/CPP/Common/StringToInt.h diff --git a/lzma/CPP/Common/Types.h b/src/lzma/CPP/Common/Types.h similarity index 100% rename from lzma/CPP/Common/Types.h rename to src/lzma/CPP/Common/Types.h diff --git a/lzma/CPP/Common/UTFConvert.cpp b/src/lzma/CPP/Common/UTFConvert.cpp similarity index 100% rename from lzma/CPP/Common/UTFConvert.cpp rename to src/lzma/CPP/Common/UTFConvert.cpp diff --git a/lzma/CPP/Common/UTFConvert.h b/src/lzma/CPP/Common/UTFConvert.h similarity index 100% rename from lzma/CPP/Common/UTFConvert.h rename to src/lzma/CPP/Common/UTFConvert.h diff --git a/lzma/CPP/Common/Wildcard.cpp b/src/lzma/CPP/Common/Wildcard.cpp similarity index 100% rename from lzma/CPP/Common/Wildcard.cpp rename to src/lzma/CPP/Common/Wildcard.cpp diff --git a/lzma/CPP/Common/Wildcard.h b/src/lzma/CPP/Common/Wildcard.h similarity index 100% rename from lzma/CPP/Common/Wildcard.h rename to src/lzma/CPP/Common/Wildcard.h diff --git a/lzma/CPP/Windows/DLL.cpp b/src/lzma/CPP/Windows/DLL.cpp similarity index 100% rename from lzma/CPP/Windows/DLL.cpp rename to src/lzma/CPP/Windows/DLL.cpp diff --git a/lzma/CPP/Windows/DLL.h b/src/lzma/CPP/Windows/DLL.h similarity index 100% rename from lzma/CPP/Windows/DLL.h rename to src/lzma/CPP/Windows/DLL.h diff --git a/lzma/CPP/Windows/Defs.h b/src/lzma/CPP/Windows/Defs.h similarity index 100% rename from lzma/CPP/Windows/Defs.h rename to src/lzma/CPP/Windows/Defs.h diff --git a/lzma/CPP/Windows/Error.cpp b/src/lzma/CPP/Windows/Error.cpp similarity index 100% rename from lzma/CPP/Windows/Error.cpp rename to src/lzma/CPP/Windows/Error.cpp diff --git a/lzma/CPP/Windows/Error.h b/src/lzma/CPP/Windows/Error.h similarity index 100% rename from lzma/CPP/Windows/Error.h rename to src/lzma/CPP/Windows/Error.h diff --git a/lzma/CPP/Windows/FileDir.cpp b/src/lzma/CPP/Windows/FileDir.cpp similarity index 100% rename from lzma/CPP/Windows/FileDir.cpp rename to src/lzma/CPP/Windows/FileDir.cpp diff --git a/lzma/CPP/Windows/FileDir.h b/src/lzma/CPP/Windows/FileDir.h similarity index 100% rename from lzma/CPP/Windows/FileDir.h rename to src/lzma/CPP/Windows/FileDir.h diff --git a/lzma/CPP/Windows/FileFind.cpp b/src/lzma/CPP/Windows/FileFind.cpp similarity index 100% rename from lzma/CPP/Windows/FileFind.cpp rename to src/lzma/CPP/Windows/FileFind.cpp diff --git a/lzma/CPP/Windows/FileFind.h b/src/lzma/CPP/Windows/FileFind.h similarity index 100% rename from lzma/CPP/Windows/FileFind.h rename to src/lzma/CPP/Windows/FileFind.h diff --git a/lzma/CPP/Windows/FileIO.cpp b/src/lzma/CPP/Windows/FileIO.cpp similarity index 100% rename from lzma/CPP/Windows/FileIO.cpp rename to src/lzma/CPP/Windows/FileIO.cpp diff --git a/lzma/CPP/Windows/FileIO.h b/src/lzma/CPP/Windows/FileIO.h similarity index 100% rename from lzma/CPP/Windows/FileIO.h rename to src/lzma/CPP/Windows/FileIO.h diff --git a/lzma/CPP/Windows/FileMapping.cpp b/src/lzma/CPP/Windows/FileMapping.cpp similarity index 100% rename from lzma/CPP/Windows/FileMapping.cpp rename to src/lzma/CPP/Windows/FileMapping.cpp diff --git a/lzma/CPP/Windows/FileMapping.h b/src/lzma/CPP/Windows/FileMapping.h similarity index 100% rename from lzma/CPP/Windows/FileMapping.h rename to src/lzma/CPP/Windows/FileMapping.h diff --git a/lzma/CPP/Windows/FileName.cpp b/src/lzma/CPP/Windows/FileName.cpp similarity index 100% rename from lzma/CPP/Windows/FileName.cpp rename to src/lzma/CPP/Windows/FileName.cpp diff --git a/lzma/CPP/Windows/FileName.h b/src/lzma/CPP/Windows/FileName.h similarity index 100% rename from lzma/CPP/Windows/FileName.h rename to src/lzma/CPP/Windows/FileName.h diff --git a/lzma/CPP/Windows/Handle.h b/src/lzma/CPP/Windows/Handle.h similarity index 100% rename from lzma/CPP/Windows/Handle.h rename to src/lzma/CPP/Windows/Handle.h diff --git a/lzma/CPP/Windows/MemoryLock.cpp b/src/lzma/CPP/Windows/MemoryLock.cpp similarity index 100% rename from lzma/CPP/Windows/MemoryLock.cpp rename to src/lzma/CPP/Windows/MemoryLock.cpp diff --git a/lzma/CPP/Windows/MemoryLock.h b/src/lzma/CPP/Windows/MemoryLock.h similarity index 100% rename from lzma/CPP/Windows/MemoryLock.h rename to src/lzma/CPP/Windows/MemoryLock.h diff --git a/lzma/CPP/Windows/PropVariant.cpp b/src/lzma/CPP/Windows/PropVariant.cpp similarity index 100% rename from lzma/CPP/Windows/PropVariant.cpp rename to src/lzma/CPP/Windows/PropVariant.cpp diff --git a/lzma/CPP/Windows/PropVariant.h b/src/lzma/CPP/Windows/PropVariant.h similarity index 100% rename from lzma/CPP/Windows/PropVariant.h rename to src/lzma/CPP/Windows/PropVariant.h diff --git a/lzma/CPP/Windows/PropVariantConversions.cpp b/src/lzma/CPP/Windows/PropVariantConversions.cpp similarity index 100% rename from lzma/CPP/Windows/PropVariantConversions.cpp rename to src/lzma/CPP/Windows/PropVariantConversions.cpp diff --git a/lzma/CPP/Windows/PropVariantConversions.h b/src/lzma/CPP/Windows/PropVariantConversions.h similarity index 100% rename from lzma/CPP/Windows/PropVariantConversions.h rename to src/lzma/CPP/Windows/PropVariantConversions.h diff --git a/lzma/CPP/Windows/StdAfx.h b/src/lzma/CPP/Windows/StdAfx.h similarity index 100% rename from lzma/CPP/Windows/StdAfx.h rename to src/lzma/CPP/Windows/StdAfx.h diff --git a/lzma/CPP/Windows/Synchronization.cpp b/src/lzma/CPP/Windows/Synchronization.cpp similarity index 100% rename from lzma/CPP/Windows/Synchronization.cpp rename to src/lzma/CPP/Windows/Synchronization.cpp diff --git a/lzma/CPP/Windows/Synchronization.h b/src/lzma/CPP/Windows/Synchronization.h similarity index 100% rename from lzma/CPP/Windows/Synchronization.h rename to src/lzma/CPP/Windows/Synchronization.h diff --git a/lzma/CPP/Windows/System.cpp b/src/lzma/CPP/Windows/System.cpp similarity index 100% rename from lzma/CPP/Windows/System.cpp rename to src/lzma/CPP/Windows/System.cpp diff --git a/lzma/CPP/Windows/System.h b/src/lzma/CPP/Windows/System.h similarity index 100% rename from lzma/CPP/Windows/System.h rename to src/lzma/CPP/Windows/System.h diff --git a/lzma/CPP/Windows/Thread.h b/src/lzma/CPP/Windows/Thread.h similarity index 100% rename from lzma/CPP/Windows/Thread.h rename to src/lzma/CPP/Windows/Thread.h diff --git a/lzma/CPP/Windows/Time.h b/src/lzma/CPP/Windows/Time.h similarity index 100% rename from lzma/CPP/Windows/Time.h rename to src/lzma/CPP/Windows/Time.h diff --git a/lzma/CS/7zip/Common/CRC.cs b/src/lzma/CS/7zip/Common/CRC.cs similarity index 100% rename from lzma/CS/7zip/Common/CRC.cs rename to src/lzma/CS/7zip/Common/CRC.cs diff --git a/lzma/CS/7zip/Common/CommandLineParser.cs b/src/lzma/CS/7zip/Common/CommandLineParser.cs similarity index 100% rename from lzma/CS/7zip/Common/CommandLineParser.cs rename to src/lzma/CS/7zip/Common/CommandLineParser.cs diff --git a/lzma/CS/7zip/Common/InBuffer.cs b/src/lzma/CS/7zip/Common/InBuffer.cs similarity index 100% rename from lzma/CS/7zip/Common/InBuffer.cs rename to src/lzma/CS/7zip/Common/InBuffer.cs diff --git a/lzma/CS/7zip/Common/OutBuffer.cs b/src/lzma/CS/7zip/Common/OutBuffer.cs similarity index 100% rename from lzma/CS/7zip/Common/OutBuffer.cs rename to src/lzma/CS/7zip/Common/OutBuffer.cs diff --git a/lzma/CS/7zip/Compress/LZ/IMatchFinder.cs b/src/lzma/CS/7zip/Compress/LZ/IMatchFinder.cs similarity index 100% rename from lzma/CS/7zip/Compress/LZ/IMatchFinder.cs rename to src/lzma/CS/7zip/Compress/LZ/IMatchFinder.cs diff --git a/lzma/CS/7zip/Compress/LZ/LzBinTree.cs b/src/lzma/CS/7zip/Compress/LZ/LzBinTree.cs similarity index 100% rename from lzma/CS/7zip/Compress/LZ/LzBinTree.cs rename to src/lzma/CS/7zip/Compress/LZ/LzBinTree.cs diff --git a/lzma/CS/7zip/Compress/LZ/LzInWindow.cs b/src/lzma/CS/7zip/Compress/LZ/LzInWindow.cs similarity index 100% rename from lzma/CS/7zip/Compress/LZ/LzInWindow.cs rename to src/lzma/CS/7zip/Compress/LZ/LzInWindow.cs diff --git a/lzma/CS/7zip/Compress/LZ/LzOutWindow.cs b/src/lzma/CS/7zip/Compress/LZ/LzOutWindow.cs similarity index 100% rename from lzma/CS/7zip/Compress/LZ/LzOutWindow.cs rename to src/lzma/CS/7zip/Compress/LZ/LzOutWindow.cs diff --git a/lzma/CS/7zip/Compress/LZMA/LzmaBase.cs b/src/lzma/CS/7zip/Compress/LZMA/LzmaBase.cs similarity index 100% rename from lzma/CS/7zip/Compress/LZMA/LzmaBase.cs rename to src/lzma/CS/7zip/Compress/LZMA/LzmaBase.cs diff --git a/lzma/CS/7zip/Compress/LZMA/LzmaDecoder.cs b/src/lzma/CS/7zip/Compress/LZMA/LzmaDecoder.cs similarity index 100% rename from lzma/CS/7zip/Compress/LZMA/LzmaDecoder.cs rename to src/lzma/CS/7zip/Compress/LZMA/LzmaDecoder.cs diff --git a/lzma/CS/7zip/Compress/LZMA/LzmaEncoder.cs b/src/lzma/CS/7zip/Compress/LZMA/LzmaEncoder.cs similarity index 100% rename from lzma/CS/7zip/Compress/LZMA/LzmaEncoder.cs rename to src/lzma/CS/7zip/Compress/LZMA/LzmaEncoder.cs diff --git a/lzma/CS/7zip/Compress/LzmaAlone/LzmaAlone.cs b/src/lzma/CS/7zip/Compress/LzmaAlone/LzmaAlone.cs similarity index 100% rename from lzma/CS/7zip/Compress/LzmaAlone/LzmaAlone.cs rename to src/lzma/CS/7zip/Compress/LzmaAlone/LzmaAlone.cs diff --git a/lzma/CS/7zip/Compress/LzmaAlone/LzmaAlone.csproj b/src/lzma/CS/7zip/Compress/LzmaAlone/LzmaAlone.csproj similarity index 100% rename from lzma/CS/7zip/Compress/LzmaAlone/LzmaAlone.csproj rename to src/lzma/CS/7zip/Compress/LzmaAlone/LzmaAlone.csproj diff --git a/lzma/CS/7zip/Compress/LzmaAlone/LzmaAlone.sln b/src/lzma/CS/7zip/Compress/LzmaAlone/LzmaAlone.sln similarity index 100% rename from lzma/CS/7zip/Compress/LzmaAlone/LzmaAlone.sln rename to src/lzma/CS/7zip/Compress/LzmaAlone/LzmaAlone.sln diff --git a/lzma/CS/7zip/Compress/LzmaAlone/LzmaBench.cs b/src/lzma/CS/7zip/Compress/LzmaAlone/LzmaBench.cs similarity index 100% rename from lzma/CS/7zip/Compress/LzmaAlone/LzmaBench.cs rename to src/lzma/CS/7zip/Compress/LzmaAlone/LzmaBench.cs diff --git a/lzma/CS/7zip/Compress/LzmaAlone/Properties/AssemblyInfo.cs b/src/lzma/CS/7zip/Compress/LzmaAlone/Properties/AssemblyInfo.cs similarity index 100% rename from lzma/CS/7zip/Compress/LzmaAlone/Properties/AssemblyInfo.cs rename to src/lzma/CS/7zip/Compress/LzmaAlone/Properties/AssemblyInfo.cs diff --git a/lzma/CS/7zip/Compress/LzmaAlone/Properties/Resources.cs b/src/lzma/CS/7zip/Compress/LzmaAlone/Properties/Resources.cs similarity index 100% rename from lzma/CS/7zip/Compress/LzmaAlone/Properties/Resources.cs rename to src/lzma/CS/7zip/Compress/LzmaAlone/Properties/Resources.cs diff --git a/lzma/CS/7zip/Compress/LzmaAlone/Properties/Settings.cs b/src/lzma/CS/7zip/Compress/LzmaAlone/Properties/Settings.cs similarity index 100% rename from lzma/CS/7zip/Compress/LzmaAlone/Properties/Settings.cs rename to src/lzma/CS/7zip/Compress/LzmaAlone/Properties/Settings.cs diff --git a/lzma/CS/7zip/Compress/RangeCoder/RangeCoder.cs b/src/lzma/CS/7zip/Compress/RangeCoder/RangeCoder.cs similarity index 100% rename from lzma/CS/7zip/Compress/RangeCoder/RangeCoder.cs rename to src/lzma/CS/7zip/Compress/RangeCoder/RangeCoder.cs diff --git a/lzma/CS/7zip/Compress/RangeCoder/RangeCoderBit.cs b/src/lzma/CS/7zip/Compress/RangeCoder/RangeCoderBit.cs similarity index 100% rename from lzma/CS/7zip/Compress/RangeCoder/RangeCoderBit.cs rename to src/lzma/CS/7zip/Compress/RangeCoder/RangeCoderBit.cs diff --git a/lzma/CS/7zip/Compress/RangeCoder/RangeCoderBitTree.cs b/src/lzma/CS/7zip/Compress/RangeCoder/RangeCoderBitTree.cs similarity index 100% rename from lzma/CS/7zip/Compress/RangeCoder/RangeCoderBitTree.cs rename to src/lzma/CS/7zip/Compress/RangeCoder/RangeCoderBitTree.cs diff --git a/lzma/CS/7zip/ICoder.cs b/src/lzma/CS/7zip/ICoder.cs similarity index 100% rename from lzma/CS/7zip/ICoder.cs rename to src/lzma/CS/7zip/ICoder.cs diff --git a/lzma/Java/SevenZip/CRC.java b/src/lzma/Java/SevenZip/CRC.java similarity index 100% rename from lzma/Java/SevenZip/CRC.java rename to src/lzma/Java/SevenZip/CRC.java diff --git a/lzma/Java/SevenZip/Compression/LZ/BinTree.java b/src/lzma/Java/SevenZip/Compression/LZ/BinTree.java similarity index 100% rename from lzma/Java/SevenZip/Compression/LZ/BinTree.java rename to src/lzma/Java/SevenZip/Compression/LZ/BinTree.java diff --git a/lzma/Java/SevenZip/Compression/LZ/InWindow.java b/src/lzma/Java/SevenZip/Compression/LZ/InWindow.java similarity index 100% rename from lzma/Java/SevenZip/Compression/LZ/InWindow.java rename to src/lzma/Java/SevenZip/Compression/LZ/InWindow.java diff --git a/lzma/Java/SevenZip/Compression/LZ/OutWindow.java b/src/lzma/Java/SevenZip/Compression/LZ/OutWindow.java similarity index 100% rename from lzma/Java/SevenZip/Compression/LZ/OutWindow.java rename to src/lzma/Java/SevenZip/Compression/LZ/OutWindow.java diff --git a/lzma/Java/SevenZip/Compression/LZMA/Base.java b/src/lzma/Java/SevenZip/Compression/LZMA/Base.java similarity index 100% rename from lzma/Java/SevenZip/Compression/LZMA/Base.java rename to src/lzma/Java/SevenZip/Compression/LZMA/Base.java diff --git a/lzma/Java/SevenZip/Compression/LZMA/Decoder.java b/src/lzma/Java/SevenZip/Compression/LZMA/Decoder.java similarity index 100% rename from lzma/Java/SevenZip/Compression/LZMA/Decoder.java rename to src/lzma/Java/SevenZip/Compression/LZMA/Decoder.java diff --git a/lzma/Java/SevenZip/Compression/LZMA/Encoder.java b/src/lzma/Java/SevenZip/Compression/LZMA/Encoder.java similarity index 100% rename from lzma/Java/SevenZip/Compression/LZMA/Encoder.java rename to src/lzma/Java/SevenZip/Compression/LZMA/Encoder.java diff --git a/lzma/Java/SevenZip/Compression/RangeCoder/BitTreeDecoder.java b/src/lzma/Java/SevenZip/Compression/RangeCoder/BitTreeDecoder.java similarity index 100% rename from lzma/Java/SevenZip/Compression/RangeCoder/BitTreeDecoder.java rename to src/lzma/Java/SevenZip/Compression/RangeCoder/BitTreeDecoder.java diff --git a/lzma/Java/SevenZip/Compression/RangeCoder/BitTreeEncoder.java b/src/lzma/Java/SevenZip/Compression/RangeCoder/BitTreeEncoder.java similarity index 100% rename from lzma/Java/SevenZip/Compression/RangeCoder/BitTreeEncoder.java rename to src/lzma/Java/SevenZip/Compression/RangeCoder/BitTreeEncoder.java diff --git a/lzma/Java/SevenZip/Compression/RangeCoder/Decoder.java b/src/lzma/Java/SevenZip/Compression/RangeCoder/Decoder.java similarity index 100% rename from lzma/Java/SevenZip/Compression/RangeCoder/Decoder.java rename to src/lzma/Java/SevenZip/Compression/RangeCoder/Decoder.java diff --git a/lzma/Java/SevenZip/Compression/RangeCoder/Encoder.java b/src/lzma/Java/SevenZip/Compression/RangeCoder/Encoder.java similarity index 100% rename from lzma/Java/SevenZip/Compression/RangeCoder/Encoder.java rename to src/lzma/Java/SevenZip/Compression/RangeCoder/Encoder.java diff --git a/lzma/Java/SevenZip/ICodeProgress.java b/src/lzma/Java/SevenZip/ICodeProgress.java similarity index 100% rename from lzma/Java/SevenZip/ICodeProgress.java rename to src/lzma/Java/SevenZip/ICodeProgress.java diff --git a/lzma/Java/SevenZip/LzmaAlone.java b/src/lzma/Java/SevenZip/LzmaAlone.java similarity index 100% rename from lzma/Java/SevenZip/LzmaAlone.java rename to src/lzma/Java/SevenZip/LzmaAlone.java diff --git a/lzma/Java/SevenZip/LzmaBench.java b/src/lzma/Java/SevenZip/LzmaBench.java similarity index 100% rename from lzma/Java/SevenZip/LzmaBench.java rename to src/lzma/Java/SevenZip/LzmaBench.java diff --git a/lzma/LGPL.txt b/src/lzma/LGPL.txt similarity index 100% rename from lzma/LGPL.txt rename to src/lzma/LGPL.txt diff --git a/lzma/Methods.txt b/src/lzma/Methods.txt similarity index 100% rename from lzma/Methods.txt rename to src/lzma/Methods.txt diff --git a/lzma/history.txt b/src/lzma/history.txt similarity index 100% rename from lzma/history.txt rename to src/lzma/history.txt diff --git a/lzma/lzma.exe b/src/lzma/lzma.exe similarity index 100% rename from lzma/lzma.exe rename to src/lzma/lzma.exe diff --git a/lzma/lzma.txt b/src/lzma/lzma.txt similarity index 100% rename from lzma/lzma.txt rename to src/lzma/lzma.txt diff --git a/physfs.c b/src/physfs.c similarity index 100% rename from physfs.c rename to src/physfs.c diff --git a/physfs.h b/src/physfs.h similarity index 100% rename from physfs.h rename to src/physfs.h diff --git a/physfs_byteorder.c b/src/physfs_byteorder.c similarity index 100% rename from physfs_byteorder.c rename to src/physfs_byteorder.c diff --git a/physfs_casefolding.h b/src/physfs_casefolding.h similarity index 100% rename from physfs_casefolding.h rename to src/physfs_casefolding.h diff --git a/physfs_internal.h b/src/physfs_internal.h similarity index 100% rename from physfs_internal.h rename to src/physfs_internal.h diff --git a/physfs_platforms.h b/src/physfs_platforms.h similarity index 100% rename from physfs_platforms.h rename to src/physfs_platforms.h diff --git a/physfs_unicode.c b/src/physfs_unicode.c similarity index 100% rename from physfs_unicode.c rename to src/physfs_unicode.c diff --git a/platform/beos.cpp b/src/platform_beos.cpp similarity index 100% rename from platform/beos.cpp rename to src/platform_beos.cpp diff --git a/platform/macosx.c b/src/platform_macosx.c similarity index 100% rename from platform/macosx.c rename to src/platform_macosx.c diff --git a/platform/os2.c b/src/platform_os2.c similarity index 100% rename from platform/os2.c rename to src/platform_os2.c diff --git a/platform/pocketpc.c b/src/platform_pocketpc.c similarity index 100% rename from platform/pocketpc.c rename to src/platform_pocketpc.c diff --git a/platform/posix.c b/src/platform_posix.c similarity index 100% rename from platform/posix.c rename to src/platform_posix.c diff --git a/platform/unix.c b/src/platform_unix.c similarity index 100% rename from platform/unix.c rename to src/platform_unix.c diff --git a/platform/windows.c b/src/platform_windows.c similarity index 100% rename from platform/windows.c rename to src/platform_windows.c diff --git a/zlib123/README b/src/zlib123/README similarity index 100% rename from zlib123/README rename to src/zlib123/README diff --git a/zlib123/adler32.c b/src/zlib123/adler32.c similarity index 100% rename from zlib123/adler32.c rename to src/zlib123/adler32.c diff --git a/zlib123/compress.c b/src/zlib123/compress.c similarity index 100% rename from zlib123/compress.c rename to src/zlib123/compress.c diff --git a/zlib123/crc32.c b/src/zlib123/crc32.c similarity index 100% rename from zlib123/crc32.c rename to src/zlib123/crc32.c diff --git a/zlib123/crc32.h b/src/zlib123/crc32.h similarity index 100% rename from zlib123/crc32.h rename to src/zlib123/crc32.h diff --git a/zlib123/deflate.c b/src/zlib123/deflate.c similarity index 100% rename from zlib123/deflate.c rename to src/zlib123/deflate.c diff --git a/zlib123/deflate.h b/src/zlib123/deflate.h similarity index 100% rename from zlib123/deflate.h rename to src/zlib123/deflate.h diff --git a/zlib123/gzio.c b/src/zlib123/gzio.c similarity index 100% rename from zlib123/gzio.c rename to src/zlib123/gzio.c diff --git a/zlib123/infback.c b/src/zlib123/infback.c similarity index 100% rename from zlib123/infback.c rename to src/zlib123/infback.c diff --git a/zlib123/inffast.c b/src/zlib123/inffast.c similarity index 100% rename from zlib123/inffast.c rename to src/zlib123/inffast.c diff --git a/zlib123/inffast.h b/src/zlib123/inffast.h similarity index 100% rename from zlib123/inffast.h rename to src/zlib123/inffast.h diff --git a/zlib123/inffixed.h b/src/zlib123/inffixed.h similarity index 100% rename from zlib123/inffixed.h rename to src/zlib123/inffixed.h diff --git a/zlib123/inflate.c b/src/zlib123/inflate.c similarity index 100% rename from zlib123/inflate.c rename to src/zlib123/inflate.c diff --git a/zlib123/inflate.h b/src/zlib123/inflate.h similarity index 100% rename from zlib123/inflate.h rename to src/zlib123/inflate.h diff --git a/zlib123/inftrees.c b/src/zlib123/inftrees.c similarity index 100% rename from zlib123/inftrees.c rename to src/zlib123/inftrees.c diff --git a/zlib123/inftrees.h b/src/zlib123/inftrees.h similarity index 100% rename from zlib123/inftrees.h rename to src/zlib123/inftrees.h diff --git a/zlib123/trees.c b/src/zlib123/trees.c similarity index 100% rename from zlib123/trees.c rename to src/zlib123/trees.c diff --git a/zlib123/trees.h b/src/zlib123/trees.h similarity index 100% rename from zlib123/trees.h rename to src/zlib123/trees.h diff --git a/zlib123/uncompr.c b/src/zlib123/uncompr.c similarity index 100% rename from zlib123/uncompr.c rename to src/zlib123/uncompr.c diff --git a/zlib123/zconf.h b/src/zlib123/zconf.h similarity index 100% rename from zlib123/zconf.h rename to src/zlib123/zconf.h diff --git a/zlib123/zlib.h b/src/zlib123/zlib.h similarity index 100% rename from zlib123/zlib.h rename to src/zlib123/zlib.h diff --git a/zlib123/zutil.c b/src/zlib123/zutil.c similarity index 100% rename from zlib123/zutil.c rename to src/zlib123/zutil.c diff --git a/zlib123/zutil.h b/src/zlib123/zutil.h similarity index 100% rename from zlib123/zutil.h rename to src/zlib123/zutil.h