diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..3d2fb55
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,63 @@
+project(QuaZip)
+cmake_minimum_required(VERSION 2.6)
+
+# CMP0042: Explicitly acknowledge MACOSX_RPATH
+# (introduced in CMake 2.8.12, enabled by default in CMake 3.0,
+# and producing a warning when unset since 3.7.1)
+cmake_policy(SET CMP0042 NEW)
+
+option(BUILD_WITH_QT4 "Build QuaZip with Qt4 no matter if Qt5 was found" OFF)
+
+if( NOT BUILD_WITH_QT4 )
+    # try Qt5 first, and prefer that if found
+    find_package(Qt5Core QUIET)
+endif()
+
+if(Qt5Core_FOUND)
+    set(CMAKE_CXX_STANDARD 11)
+    set(QTCORE_LIBRARIES ${Qt5Core_LIBRARIES})
+    set(QUAZIP_LIB_VERSION_SUFFIX 5)
+    # if there is no QT_ROOT, try to deduce it from Qt QtCore include
+    if("${QT_ROOT}" STREQUAL "")
+        set(QT_ROOT ${QT_QTCORE_INCLUDE_DIR}/../..)
+    endif()
+    include_directories(${Qt5Core_INCLUDE_DIRS})
+
+    macro(qt_wrap_cpp)
+        qt5_wrap_cpp(${ARGN})
+    endmacro()
+else()
+    set(qt_min_version "4.5.0")
+    find_package(Qt4 REQUIRED)
+    set(QT_USE_QTGUI false)
+    include(${QT_USE_FILE})
+    include_directories(${QT_INCLUDES})
+    set(QTCORE_LIBRARIES ${QT_QTCORE_LIBRARY})
+
+    macro(qt_wrap_cpp)
+        qt4_wrap_cpp(${ARGN})
+    endmacro()
+endif()
+
+# Use system zlib on unix and Qt ZLIB on Windows
+if(UNIX OR MINGW)
+    find_package(ZLIB REQUIRED)
+else(UNIX OR MINGW)
+    set(ZLIB_INCLUDE_DIRS "${QT_ROOT}/src/3rdparty/zlib" CACHE STRING "Path to ZLIB headers of Qt")
+    set(ZLIB_LIBRARIES "")
+    if(NOT EXISTS "${ZLIB_INCLUDE_DIRS}/zlib.h")
+        message("Please specify a valid zlib include dir")
+    endif(NOT EXISTS "${ZLIB_INCLUDE_DIRS}/zlib.h")
+endif(UNIX OR MINGW)
+
+# All build libraries are moved to this directory
+set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR})
+
+set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)")
+set(LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Library directory name" FORCE)
+set(QUAZIP_LIB_TARGET_NAME quazip${QUAZIP_LIB_VERSION_SUFFIX} CACHE
+    INTERNAL "Target name of libquazip" FORCE)
+
+add_subdirectory(quazip)
+
+install(FILES FindQuaZip.cmake RENAME FindQuaZip${QUAZIP_LIB_VERSION_SUFFIX}.cmake DESTINATION ${CMAKE_ROOT}/Modules)
diff --git a/quazip/COPYING b/COPYING
similarity index 100%
rename from quazip/COPYING
rename to COPYING
diff --git a/quazip/Doxyfile b/Doxyfile
similarity index 100%
rename from quazip/Doxyfile
rename to Doxyfile
diff --git a/quazip/FindQuaZip.cmake b/FindQuaZip.cmake
similarity index 100%
rename from quazip/FindQuaZip.cmake
rename to FindQuaZip.cmake
diff --git a/quazip/NEWS.txt b/NEWS.txt
similarity index 100%
rename from quazip/NEWS.txt
rename to NEWS.txt
diff --git a/quazip/README.txt b/README.txt
similarity index 100%
rename from quazip/README.txt
rename to README.txt
diff --git a/quazip/includes.pri b/includes.pri
similarity index 100%
rename from quazip/includes.pri
rename to includes.pri
diff --git a/quazip.pri b/quazip.pri
new file mode 100644
index 0000000..07cd9c0
--- /dev/null
+++ b/quazip.pri
@@ -0,0 +1,3 @@
+INCLUDEPATH+=$$PWD
+DEPENDPATH+=$$PWD/quazip
+include($$PWD/quazip/quazip.pri)
diff --git a/quazip.pro b/quazip.pro
new file mode 100644
index 0000000..86d4587
--- /dev/null
+++ b/quazip.pro
@@ -0,0 +1,3 @@
+TEMPLATE=subdirs
+SUBDIRS=quazip qztest
+qztest.depends = quazip
diff --git a/quazip.sln b/quazip.sln
new file mode 100644
index 0000000..2fe98ff
--- /dev/null
+++ b/quazip.sln
@@ -0,0 +1,37 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.40629.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quazip", "quazip\quazip.vcxproj", "{E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qztest", "qztest\qztest.vcxproj", "{7632B767-D089-4F15-8B1E-C4B3F9EBF592}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD}.Debug|Win32.Build.0 = Debug|Win32
+		{E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD}.Debug|x64.ActiveCfg = Debug|x64
+		{E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD}.Debug|x64.Build.0 = Debug|x64
+		{E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD}.Release|Win32.ActiveCfg = Release|Win32
+		{E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD}.Release|Win32.Build.0 = Release|Win32
+		{E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD}.Release|x64.ActiveCfg = Release|x64
+		{E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD}.Release|x64.Build.0 = Release|x64
+		{7632B767-D089-4F15-8B1E-C4B3F9EBF592}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7632B767-D089-4F15-8B1E-C4B3F9EBF592}.Debug|Win32.Build.0 = Debug|Win32
+		{7632B767-D089-4F15-8B1E-C4B3F9EBF592}.Debug|x64.ActiveCfg = Debug|Win32
+		{7632B767-D089-4F15-8B1E-C4B3F9EBF592}.Release|Win32.ActiveCfg = Release|Win32
+		{7632B767-D089-4F15-8B1E-C4B3F9EBF592}.Release|Win32.Build.0 = Release|Win32
+		{7632B767-D089-4F15-8B1E-C4B3F9EBF592}.Release|x64.ActiveCfg = Release|x64
+		{7632B767-D089-4F15-8B1E-C4B3F9EBF592}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/quazip/CMakeLists.txt b/quazip/CMakeLists.txt
index 3d2fb55..b6b8ab6 100644
--- a/quazip/CMakeLists.txt
+++ b/quazip/CMakeLists.txt
@@ -1,63 +1,31 @@
-project(QuaZip)
-cmake_minimum_required(VERSION 2.6)
+# set all include directories for in and out of source builds
+include_directories(
+	${CMAKE_CURRENT_SOURCE_DIR}
+	${CMAKE_CURRENT_BINARY_DIR}
+	${ZLIB_INCLUDE_DIRS}
+)
 
-# CMP0042: Explicitly acknowledge MACOSX_RPATH
-# (introduced in CMake 2.8.12, enabled by default in CMake 3.0,
-# and producing a warning when unset since 3.7.1)
-cmake_policy(SET CMP0042 NEW)
+file(GLOB SRCS "*.c" "*.cpp")
+file(GLOB PUBLIC_HEADERS "*.h")
 
-option(BUILD_WITH_QT4 "Build QuaZip with Qt4 no matter if Qt5 was found" OFF)
+# Must be added to enable export macro
+ADD_DEFINITIONS(-DQUAZIP_BUILD)
 
-if( NOT BUILD_WITH_QT4 )
-    # try Qt5 first, and prefer that if found
-    find_package(Qt5Core QUIET)
-endif()
+qt_wrap_cpp(MOC_SRCS ${PUBLIC_HEADERS})
+set(SRCS ${SRCS} ${MOC_SRCS})
 
-if(Qt5Core_FOUND)
-    set(CMAKE_CXX_STANDARD 11)
-    set(QTCORE_LIBRARIES ${Qt5Core_LIBRARIES})
-    set(QUAZIP_LIB_VERSION_SUFFIX 5)
-    # if there is no QT_ROOT, try to deduce it from Qt QtCore include
-    if("${QT_ROOT}" STREQUAL "")
-        set(QT_ROOT ${QT_QTCORE_INCLUDE_DIR}/../..)
-    endif()
-    include_directories(${Qt5Core_INCLUDE_DIRS})
+add_library(${QUAZIP_LIB_TARGET_NAME} SHARED ${SRCS})
+add_library(quazip_static STATIC ${SRCS})
+ 
+# Windows uses .lib extension for both static and shared library
+# *nix systems use different extensions for SHARED and STATIC library and by convention both libraries have the same name
+if (NOT WIN32)
+	set_target_properties(quazip_static PROPERTIES OUTPUT_NAME quazip${QUAZIP_LIB_VERSION_SUFFIX})
+endif ()
 
-    macro(qt_wrap_cpp)
-        qt5_wrap_cpp(${ARGN})
-    endmacro()
-else()
-    set(qt_min_version "4.5.0")
-    find_package(Qt4 REQUIRED)
-    set(QT_USE_QTGUI false)
-    include(${QT_USE_FILE})
-    include_directories(${QT_INCLUDES})
-    set(QTCORE_LIBRARIES ${QT_QTCORE_LIBRARY})
+set_target_properties(${QUAZIP_LIB_TARGET_NAME} quazip_static PROPERTIES VERSION 1.0.0 SOVERSION 1 DEBUG_POSTFIX d)
+# Link against ZLIB_LIBRARIES if needed (on Windows this variable is empty)
+target_link_libraries(${QUAZIP_LIB_TARGET_NAME} quazip_static ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES})
 
-    macro(qt_wrap_cpp)
-        qt4_wrap_cpp(${ARGN})
-    endmacro()
-endif()
-
-# Use system zlib on unix and Qt ZLIB on Windows
-if(UNIX OR MINGW)
-    find_package(ZLIB REQUIRED)
-else(UNIX OR MINGW)
-    set(ZLIB_INCLUDE_DIRS "${QT_ROOT}/src/3rdparty/zlib" CACHE STRING "Path to ZLIB headers of Qt")
-    set(ZLIB_LIBRARIES "")
-    if(NOT EXISTS "${ZLIB_INCLUDE_DIRS}/zlib.h")
-        message("Please specify a valid zlib include dir")
-    endif(NOT EXISTS "${ZLIB_INCLUDE_DIRS}/zlib.h")
-endif(UNIX OR MINGW)
-
-# All build libraries are moved to this directory
-set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR})
-
-set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)")
-set(LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Library directory name" FORCE)
-set(QUAZIP_LIB_TARGET_NAME quazip${QUAZIP_LIB_VERSION_SUFFIX} CACHE
-    INTERNAL "Target name of libquazip" FORCE)
-
-add_subdirectory(quazip)
-
-install(FILES FindQuaZip.cmake RENAME FindQuaZip${QUAZIP_LIB_VERSION_SUFFIX}.cmake DESTINATION ${CMAKE_ROOT}/Modules)
+install(FILES ${PUBLIC_HEADERS} DESTINATION include/quazip${QUAZIP_LIB_VERSION_SUFFIX})
+install(TARGETS ${QUAZIP_LIB_TARGET_NAME} quazip_static LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION})
diff --git a/quazip/quazip/JlCompress.cpp b/quazip/JlCompress.cpp
similarity index 100%
rename from quazip/quazip/JlCompress.cpp
rename to quazip/JlCompress.cpp
diff --git a/quazip/quazip/JlCompress.h b/quazip/JlCompress.h
similarity index 100%
rename from quazip/quazip/JlCompress.h
rename to quazip/JlCompress.h
diff --git a/quazip/quazip/crypt.h b/quazip/crypt.h
similarity index 100%
rename from quazip/quazip/crypt.h
rename to quazip/crypt.h
diff --git a/quazip/quazip/debian/libquazip0.symbols b/quazip/debian/libquazip0.symbols
similarity index 100%
rename from quazip/quazip/debian/libquazip0.symbols
rename to quazip/debian/libquazip0.symbols
diff --git a/quazip/quazip/doc/faq.dox b/quazip/doc/faq.dox
similarity index 100%
rename from quazip/quazip/doc/faq.dox
rename to quazip/doc/faq.dox
diff --git a/quazip/quazip/doc/index.dox b/quazip/doc/index.dox
similarity index 100%
rename from quazip/quazip/doc/index.dox
rename to quazip/doc/index.dox
diff --git a/quazip/quazip/doc/usage.dox b/quazip/doc/usage.dox
similarity index 100%
rename from quazip/quazip/doc/usage.dox
rename to quazip/doc/usage.dox
diff --git a/quazip/quazip/ioapi.h b/quazip/ioapi.h
similarity index 100%
rename from quazip/quazip/ioapi.h
rename to quazip/ioapi.h
diff --git a/quazip/quazip/qioapi.cpp b/quazip/qioapi.cpp
similarity index 100%
rename from quazip/quazip/qioapi.cpp
rename to quazip/qioapi.cpp
diff --git a/quazip/quazip/quaadler32.cpp b/quazip/quaadler32.cpp
similarity index 100%
rename from quazip/quazip/quaadler32.cpp
rename to quazip/quaadler32.cpp
diff --git a/quazip/quazip/quaadler32.h b/quazip/quaadler32.h
similarity index 100%
rename from quazip/quazip/quaadler32.h
rename to quazip/quaadler32.h
diff --git a/quazip/quazip/quachecksum32.h b/quazip/quachecksum32.h
similarity index 100%
rename from quazip/quazip/quachecksum32.h
rename to quazip/quachecksum32.h
diff --git a/quazip/quazip/quacrc32.cpp b/quazip/quacrc32.cpp
similarity index 100%
rename from quazip/quazip/quacrc32.cpp
rename to quazip/quacrc32.cpp
diff --git a/quazip/quazip/quacrc32.h b/quazip/quacrc32.h
similarity index 100%
rename from quazip/quazip/quacrc32.h
rename to quazip/quacrc32.h
diff --git a/quazip/quazip/quagzipfile.cpp b/quazip/quagzipfile.cpp
similarity index 100%
rename from quazip/quazip/quagzipfile.cpp
rename to quazip/quagzipfile.cpp
diff --git a/quazip/quazip/quagzipfile.h b/quazip/quagzipfile.h
similarity index 100%
rename from quazip/quazip/quagzipfile.h
rename to quazip/quagzipfile.h
diff --git a/quazip/quazip/quaziodevice.cpp b/quazip/quaziodevice.cpp
similarity index 100%
rename from quazip/quazip/quaziodevice.cpp
rename to quazip/quaziodevice.cpp
diff --git a/quazip/quazip/quaziodevice.h b/quazip/quaziodevice.h
similarity index 100%
rename from quazip/quazip/quaziodevice.h
rename to quazip/quaziodevice.h
diff --git a/quazip/quazip/quazip.cpp b/quazip/quazip.cpp
similarity index 100%
rename from quazip/quazip/quazip.cpp
rename to quazip/quazip.cpp
diff --git a/quazip/quazip/quazip.h b/quazip/quazip.h
similarity index 100%
rename from quazip/quazip/quazip.h
rename to quazip/quazip.h
diff --git a/quazip/quazip.pri b/quazip/quazip.pri
index 07cd9c0..1a9db99 100644
--- a/quazip/quazip.pri
+++ b/quazip/quazip.pri
@@ -1,3 +1,33 @@
-INCLUDEPATH+=$$PWD
-DEPENDPATH+=$$PWD/quazip
-include($$PWD/quazip/quazip.pri)
+INCLUDEPATH += $$PWD
+DEPENDPATH += $$PWD
+HEADERS += \
+        $$PWD/crypt.h \
+        $$PWD/ioapi.h \
+        $$PWD/JlCompress.h \
+        $$PWD/quaadler32.h \
+        $$PWD/quachecksum32.h \
+        $$PWD/quacrc32.h \
+        $$PWD/quagzipfile.h \
+        $$PWD/quaziodevice.h \
+        $$PWD/quazipdir.h \
+        $$PWD/quazipfile.h \
+        $$PWD/quazipfileinfo.h \
+        $$PWD/quazip_global.h \
+        $$PWD/quazip.h \
+        $$PWD/quazipnewinfo.h \
+        $$PWD/unzip.h \
+        $$PWD/zip.h
+
+SOURCES += $$PWD/qioapi.cpp \
+           $$PWD/JlCompress.cpp \
+           $$PWD/quaadler32.cpp \
+           $$PWD/quacrc32.cpp \
+           $$PWD/quagzipfile.cpp \
+           $$PWD/quaziodevice.cpp \
+           $$PWD/quazip.cpp \
+           $$PWD/quazipdir.cpp \
+           $$PWD/quazipfile.cpp \
+           $$PWD/quazipfileinfo.cpp \
+           $$PWD/quazipnewinfo.cpp \
+           $$PWD/unzip.c \
+           $$PWD/zip.c
diff --git a/quazip/quazip.pro b/quazip/quazip.pro
index 86d4587..3e10f36 100644
--- a/quazip/quazip.pro
+++ b/quazip/quazip.pro
@@ -1,3 +1,87 @@
-TEMPLATE=subdirs
-SUBDIRS=quazip qztest
-qztest.depends = quazip
+TEMPLATE = lib
+CONFIG += qt warn_on
+QT -= gui
+
+# The ABI version.
+
+!win32:VERSION = 1.0.0
+
+# 1.0.0 is the first stable ABI.
+# The next binary incompatible change will be 2.0.0 and so on.
+# The existing QuaZIP policy on changing ABI requires to bump the
+# major version of QuaZIP itself as well. Note that there may be
+# other reasons for chaging the major version of QuaZIP, so
+# in case where there is a QuaZIP major version bump but no ABI change,
+# the VERSION variable will stay the same.
+
+# For example:
+
+# QuaZIP 1.0 is released after some 0.x, keeping binary compatibility.
+# VERSION stays 1.0.0.
+# Then some binary incompatible change is introduced. QuaZIP goes up to
+# 2.0, VERSION to 2.0.0.
+# And so on.
+
+
+# This one handles dllimport/dllexport directives.
+DEFINES += QUAZIP_BUILD
+
+# You'll need to define this one manually if using a build system other
+# than qmake or using QuaZIP sources directly in your project.
+CONFIG(staticlib): DEFINES += QUAZIP_STATIC
+
+# Input
+include(quazip.pri)
+
+
+CONFIG(debug, debug|release) {
+     mac: TARGET = $$join(TARGET,,,_debug) 
+     win32: TARGET = $$join(TARGET,,,d)
+}
+
+unix:!symbian {
+    headers.path=$$PREFIX/include/quazip
+    headers.files=$$HEADERS
+    target.path=$$PREFIX/lib/$${LIB_ARCH}
+    INSTALLS += headers target
+
+	OBJECTS_DIR=.obj
+	MOC_DIR=.moc
+	
+}
+
+win32 {
+    headers.path=$$PREFIX/include/quazip
+    headers.files=$$HEADERS
+    target.path=$$PREFIX/lib
+    INSTALLS += headers target
+    # workaround for qdatetime.h macro bug
+    DEFINES += NOMINMAX
+}
+
+
+symbian {
+
+    # Note, on Symbian you may run into troubles with LGPL.
+    # The point is, if your application uses some version of QuaZip,
+    # and a newer binary compatible version of QuaZip is released, then
+    # the users of your application must be able to relink it with the
+    # new QuaZip version. For example, to take advantage of some QuaZip
+    # bug fixes.
+
+    # This is probably best achieved by building QuaZip as a static
+    # library and providing linkable object files of your application,
+    # so users can relink it.
+
+    CONFIG += staticlib
+    CONFIG += debug_and_release
+
+    LIBS += -lezip
+
+    #Export headers to SDK Epoc32/include directory
+    exportheaders.sources = $$HEADERS
+    exportheaders.path = quazip
+    for(header, exportheaders.sources) {
+        BLD_INF_RULES.prj_exports += "$$header $$exportheaders.path/$$basename(header)"
+    }
+}
diff --git a/quazip/quazip.sln b/quazip/quazip.sln
index 2fe98ff..549f3a4 100644
--- a/quazip/quazip.sln
+++ b/quazip/quazip.sln
@@ -1,35 +1,18 @@
 
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.40629.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quazip", "quazip\quazip.vcxproj", "{E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qztest", "qztest\qztest.vcxproj", "{7632B767-D089-4F15-8B1E-C4B3F9EBF592}"
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual C++ Express 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quazip", "quazip.vcproj", "{E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
 		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD}.Debug|Win32.Build.0 = Debug|Win32
-		{E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD}.Debug|x64.ActiveCfg = Debug|x64
-		{E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD}.Debug|x64.Build.0 = Debug|x64
 		{E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD}.Release|Win32.ActiveCfg = Release|Win32
 		{E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD}.Release|Win32.Build.0 = Release|Win32
-		{E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD}.Release|x64.ActiveCfg = Release|x64
-		{E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD}.Release|x64.Build.0 = Release|x64
-		{7632B767-D089-4F15-8B1E-C4B3F9EBF592}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7632B767-D089-4F15-8B1E-C4B3F9EBF592}.Debug|Win32.Build.0 = Debug|Win32
-		{7632B767-D089-4F15-8B1E-C4B3F9EBF592}.Debug|x64.ActiveCfg = Debug|Win32
-		{7632B767-D089-4F15-8B1E-C4B3F9EBF592}.Release|Win32.ActiveCfg = Release|Win32
-		{7632B767-D089-4F15-8B1E-C4B3F9EBF592}.Release|Win32.Build.0 = Release|Win32
-		{7632B767-D089-4F15-8B1E-C4B3F9EBF592}.Release|x64.ActiveCfg = Release|x64
-		{7632B767-D089-4F15-8B1E-C4B3F9EBF592}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/quazip/quazip/quazip.vcproj b/quazip/quazip.vcproj
similarity index 100%
rename from quazip/quazip/quazip.vcproj
rename to quazip/quazip.vcproj
diff --git a/quazip/quazip/quazip.vcxproj b/quazip/quazip.vcxproj
similarity index 100%
rename from quazip/quazip/quazip.vcxproj
rename to quazip/quazip.vcxproj
diff --git a/quazip/quazip/quazip.vcxproj.filters b/quazip/quazip.vcxproj.filters
similarity index 100%
rename from quazip/quazip/quazip.vcxproj.filters
rename to quazip/quazip.vcxproj.filters
diff --git a/quazip/quazip/CMakeLists.txt b/quazip/quazip/CMakeLists.txt
deleted file mode 100644
index b6b8ab6..0000000
--- a/quazip/quazip/CMakeLists.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-# set all include directories for in and out of source builds
-include_directories(
-	${CMAKE_CURRENT_SOURCE_DIR}
-	${CMAKE_CURRENT_BINARY_DIR}
-	${ZLIB_INCLUDE_DIRS}
-)
-
-file(GLOB SRCS "*.c" "*.cpp")
-file(GLOB PUBLIC_HEADERS "*.h")
-
-# Must be added to enable export macro
-ADD_DEFINITIONS(-DQUAZIP_BUILD)
-
-qt_wrap_cpp(MOC_SRCS ${PUBLIC_HEADERS})
-set(SRCS ${SRCS} ${MOC_SRCS})
-
-add_library(${QUAZIP_LIB_TARGET_NAME} SHARED ${SRCS})
-add_library(quazip_static STATIC ${SRCS})
- 
-# Windows uses .lib extension for both static and shared library
-# *nix systems use different extensions for SHARED and STATIC library and by convention both libraries have the same name
-if (NOT WIN32)
-	set_target_properties(quazip_static PROPERTIES OUTPUT_NAME quazip${QUAZIP_LIB_VERSION_SUFFIX})
-endif ()
-
-set_target_properties(${QUAZIP_LIB_TARGET_NAME} quazip_static PROPERTIES VERSION 1.0.0 SOVERSION 1 DEBUG_POSTFIX d)
-# Link against ZLIB_LIBRARIES if needed (on Windows this variable is empty)
-target_link_libraries(${QUAZIP_LIB_TARGET_NAME} quazip_static ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES})
-
-install(FILES ${PUBLIC_HEADERS} DESTINATION include/quazip${QUAZIP_LIB_VERSION_SUFFIX})
-install(TARGETS ${QUAZIP_LIB_TARGET_NAME} quazip_static LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION})
diff --git a/quazip/quazip/quazip.pri b/quazip/quazip/quazip.pri
deleted file mode 100644
index 1a9db99..0000000
--- a/quazip/quazip/quazip.pri
+++ /dev/null
@@ -1,33 +0,0 @@
-INCLUDEPATH += $$PWD
-DEPENDPATH += $$PWD
-HEADERS += \
-        $$PWD/crypt.h \
-        $$PWD/ioapi.h \
-        $$PWD/JlCompress.h \
-        $$PWD/quaadler32.h \
-        $$PWD/quachecksum32.h \
-        $$PWD/quacrc32.h \
-        $$PWD/quagzipfile.h \
-        $$PWD/quaziodevice.h \
-        $$PWD/quazipdir.h \
-        $$PWD/quazipfile.h \
-        $$PWD/quazipfileinfo.h \
-        $$PWD/quazip_global.h \
-        $$PWD/quazip.h \
-        $$PWD/quazipnewinfo.h \
-        $$PWD/unzip.h \
-        $$PWD/zip.h
-
-SOURCES += $$PWD/qioapi.cpp \
-           $$PWD/JlCompress.cpp \
-           $$PWD/quaadler32.cpp \
-           $$PWD/quacrc32.cpp \
-           $$PWD/quagzipfile.cpp \
-           $$PWD/quaziodevice.cpp \
-           $$PWD/quazip.cpp \
-           $$PWD/quazipdir.cpp \
-           $$PWD/quazipfile.cpp \
-           $$PWD/quazipfileinfo.cpp \
-           $$PWD/quazipnewinfo.cpp \
-           $$PWD/unzip.c \
-           $$PWD/zip.c
diff --git a/quazip/quazip/quazip.pro b/quazip/quazip/quazip.pro
deleted file mode 100644
index 3e10f36..0000000
--- a/quazip/quazip/quazip.pro
+++ /dev/null
@@ -1,87 +0,0 @@
-TEMPLATE = lib
-CONFIG += qt warn_on
-QT -= gui
-
-# The ABI version.
-
-!win32:VERSION = 1.0.0
-
-# 1.0.0 is the first stable ABI.
-# The next binary incompatible change will be 2.0.0 and so on.
-# The existing QuaZIP policy on changing ABI requires to bump the
-# major version of QuaZIP itself as well. Note that there may be
-# other reasons for chaging the major version of QuaZIP, so
-# in case where there is a QuaZIP major version bump but no ABI change,
-# the VERSION variable will stay the same.
-
-# For example:
-
-# QuaZIP 1.0 is released after some 0.x, keeping binary compatibility.
-# VERSION stays 1.0.0.
-# Then some binary incompatible change is introduced. QuaZIP goes up to
-# 2.0, VERSION to 2.0.0.
-# And so on.
-
-
-# This one handles dllimport/dllexport directives.
-DEFINES += QUAZIP_BUILD
-
-# You'll need to define this one manually if using a build system other
-# than qmake or using QuaZIP sources directly in your project.
-CONFIG(staticlib): DEFINES += QUAZIP_STATIC
-
-# Input
-include(quazip.pri)
-
-
-CONFIG(debug, debug|release) {
-     mac: TARGET = $$join(TARGET,,,_debug) 
-     win32: TARGET = $$join(TARGET,,,d)
-}
-
-unix:!symbian {
-    headers.path=$$PREFIX/include/quazip
-    headers.files=$$HEADERS
-    target.path=$$PREFIX/lib/$${LIB_ARCH}
-    INSTALLS += headers target
-
-	OBJECTS_DIR=.obj
-	MOC_DIR=.moc
-	
-}
-
-win32 {
-    headers.path=$$PREFIX/include/quazip
-    headers.files=$$HEADERS
-    target.path=$$PREFIX/lib
-    INSTALLS += headers target
-    # workaround for qdatetime.h macro bug
-    DEFINES += NOMINMAX
-}
-
-
-symbian {
-
-    # Note, on Symbian you may run into troubles with LGPL.
-    # The point is, if your application uses some version of QuaZip,
-    # and a newer binary compatible version of QuaZip is released, then
-    # the users of your application must be able to relink it with the
-    # new QuaZip version. For example, to take advantage of some QuaZip
-    # bug fixes.
-
-    # This is probably best achieved by building QuaZip as a static
-    # library and providing linkable object files of your application,
-    # so users can relink it.
-
-    CONFIG += staticlib
-    CONFIG += debug_and_release
-
-    LIBS += -lezip
-
-    #Export headers to SDK Epoc32/include directory
-    exportheaders.sources = $$HEADERS
-    exportheaders.path = quazip
-    for(header, exportheaders.sources) {
-        BLD_INF_RULES.prj_exports += "$$header $$exportheaders.path/$$basename(header)"
-    }
-}
diff --git a/quazip/quazip/quazip.sln b/quazip/quazip/quazip.sln
deleted file mode 100644
index 549f3a4..0000000
--- a/quazip/quazip/quazip.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual C++ Express 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quazip", "quazip.vcproj", "{E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD}.Debug|Win32.Build.0 = Debug|Win32
-		{E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD}.Release|Win32.ActiveCfg = Release|Win32
-		{E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/quazip/quazip/quazip_global.h b/quazip/quazip_global.h
similarity index 100%
rename from quazip/quazip/quazip_global.h
rename to quazip/quazip_global.h
diff --git a/quazip/quazip/quazipdir.cpp b/quazip/quazipdir.cpp
similarity index 100%
rename from quazip/quazip/quazipdir.cpp
rename to quazip/quazipdir.cpp
diff --git a/quazip/quazip/quazipdir.h b/quazip/quazipdir.h
similarity index 100%
rename from quazip/quazip/quazipdir.h
rename to quazip/quazipdir.h
diff --git a/quazip/quazip/quazipfile.cpp b/quazip/quazipfile.cpp
similarity index 100%
rename from quazip/quazip/quazipfile.cpp
rename to quazip/quazipfile.cpp
diff --git a/quazip/quazip/quazipfile.h b/quazip/quazipfile.h
similarity index 100%
rename from quazip/quazip/quazipfile.h
rename to quazip/quazipfile.h
diff --git a/quazip/quazip/quazipfileinfo.cpp b/quazip/quazipfileinfo.cpp
similarity index 100%
rename from quazip/quazip/quazipfileinfo.cpp
rename to quazip/quazipfileinfo.cpp
diff --git a/quazip/quazip/quazipfileinfo.h b/quazip/quazipfileinfo.h
similarity index 100%
rename from quazip/quazip/quazipfileinfo.h
rename to quazip/quazipfileinfo.h
diff --git a/quazip/quazip/quazipnewinfo.cpp b/quazip/quazipnewinfo.cpp
similarity index 100%
rename from quazip/quazip/quazipnewinfo.cpp
rename to quazip/quazipnewinfo.cpp
diff --git a/quazip/quazip/quazipnewinfo.h b/quazip/quazipnewinfo.h
similarity index 100%
rename from quazip/quazip/quazipnewinfo.h
rename to quazip/quazipnewinfo.h
diff --git a/quazip/quazip/run_moc.bat b/quazip/run_moc.bat
similarity index 100%
rename from quazip/quazip/run_moc.bat
rename to quazip/run_moc.bat
diff --git a/quazip/quazip/unzip.c b/quazip/unzip.c
similarity index 100%
rename from quazip/quazip/unzip.c
rename to quazip/unzip.c
diff --git a/quazip/quazip/unzip.h b/quazip/unzip.h
similarity index 100%
rename from quazip/quazip/unzip.h
rename to quazip/unzip.h
diff --git a/quazip/quazip/zip.c b/quazip/zip.c
similarity index 100%
rename from quazip/quazip/zip.c
rename to quazip/zip.c
diff --git a/quazip/quazip/zip.h b/quazip/zip.h
similarity index 100%
rename from quazip/quazip/zip.h
rename to quazip/zip.h
diff --git a/quazip/qztest/coverage.sh b/qztest/coverage.sh
similarity index 100%
rename from quazip/qztest/coverage.sh
rename to qztest/coverage.sh
diff --git a/quazip/qztest/qztest.cpp b/qztest/qztest.cpp
similarity index 100%
rename from quazip/qztest/qztest.cpp
rename to qztest/qztest.cpp
diff --git a/quazip/qztest/qztest.h b/qztest/qztest.h
similarity index 100%
rename from quazip/qztest/qztest.h
rename to qztest/qztest.h
diff --git a/quazip/qztest/qztest.pro b/qztest/qztest.pro
similarity index 100%
rename from quazip/qztest/qztest.pro
rename to qztest/qztest.pro
diff --git a/quazip/qztest/qztest.sln b/qztest/qztest.sln
similarity index 100%
rename from quazip/qztest/qztest.sln
rename to qztest/qztest.sln
diff --git a/quazip/qztest/qztest.vcproj b/qztest/qztest.vcproj
similarity index 100%
rename from quazip/qztest/qztest.vcproj
rename to qztest/qztest.vcproj
diff --git a/quazip/qztest/qztest.vcxproj b/qztest/qztest.vcxproj
similarity index 100%
rename from quazip/qztest/qztest.vcxproj
rename to qztest/qztest.vcxproj
diff --git a/quazip/qztest/qztest.vcxproj.filters b/qztest/qztest.vcxproj.filters
similarity index 100%
rename from quazip/qztest/qztest.vcxproj.filters
rename to qztest/qztest.vcxproj.filters
diff --git a/quazip/qztest/run_moc.bat b/qztest/run_moc.bat
similarity index 100%
rename from quazip/qztest/run_moc.bat
rename to qztest/run_moc.bat
diff --git a/quazip/qztest/testjlcompress.cpp b/qztest/testjlcompress.cpp
similarity index 100%
rename from quazip/qztest/testjlcompress.cpp
rename to qztest/testjlcompress.cpp
diff --git a/quazip/qztest/testjlcompress.h b/qztest/testjlcompress.h
similarity index 100%
rename from quazip/qztest/testjlcompress.h
rename to qztest/testjlcompress.h
diff --git a/quazip/qztest/testquachecksum32.cpp b/qztest/testquachecksum32.cpp
similarity index 100%
rename from quazip/qztest/testquachecksum32.cpp
rename to qztest/testquachecksum32.cpp
diff --git a/quazip/qztest/testquachecksum32.h b/qztest/testquachecksum32.h
similarity index 100%
rename from quazip/qztest/testquachecksum32.h
rename to qztest/testquachecksum32.h
diff --git a/quazip/qztest/testquagzipfile.cpp b/qztest/testquagzipfile.cpp
similarity index 100%
rename from quazip/qztest/testquagzipfile.cpp
rename to qztest/testquagzipfile.cpp
diff --git a/quazip/qztest/testquagzipfile.h b/qztest/testquagzipfile.h
similarity index 100%
rename from quazip/qztest/testquagzipfile.h
rename to qztest/testquagzipfile.h
diff --git a/quazip/qztest/testquaziodevice.cpp b/qztest/testquaziodevice.cpp
similarity index 100%
rename from quazip/qztest/testquaziodevice.cpp
rename to qztest/testquaziodevice.cpp
diff --git a/quazip/qztest/testquaziodevice.h b/qztest/testquaziodevice.h
similarity index 100%
rename from quazip/qztest/testquaziodevice.h
rename to qztest/testquaziodevice.h
diff --git a/quazip/qztest/testquazip.cpp b/qztest/testquazip.cpp
similarity index 100%
rename from quazip/qztest/testquazip.cpp
rename to qztest/testquazip.cpp
diff --git a/quazip/qztest/testquazip.h b/qztest/testquazip.h
similarity index 100%
rename from quazip/qztest/testquazip.h
rename to qztest/testquazip.h
diff --git a/quazip/qztest/testquazipdir.cpp b/qztest/testquazipdir.cpp
similarity index 100%
rename from quazip/qztest/testquazipdir.cpp
rename to qztest/testquazipdir.cpp
diff --git a/quazip/qztest/testquazipdir.h b/qztest/testquazipdir.h
similarity index 100%
rename from quazip/qztest/testquazipdir.h
rename to qztest/testquazipdir.h
diff --git a/quazip/qztest/testquazipfile.cpp b/qztest/testquazipfile.cpp
similarity index 100%
rename from quazip/qztest/testquazipfile.cpp
rename to qztest/testquazipfile.cpp
diff --git a/quazip/qztest/testquazipfile.h b/qztest/testquazipfile.h
similarity index 100%
rename from quazip/qztest/testquazipfile.h
rename to qztest/testquazipfile.h
diff --git a/quazip/qztest/testquazipfileinfo.cpp b/qztest/testquazipfileinfo.cpp
similarity index 100%
rename from quazip/qztest/testquazipfileinfo.cpp
rename to qztest/testquazipfileinfo.cpp
diff --git a/quazip/qztest/testquazipfileinfo.h b/qztest/testquazipfileinfo.h
similarity index 100%
rename from quazip/qztest/testquazipfileinfo.h
rename to qztest/testquazipfileinfo.h
diff --git a/quazip/qztest/testquazipnewinfo.cpp b/qztest/testquazipnewinfo.cpp
similarity index 100%
rename from quazip/qztest/testquazipnewinfo.cpp
rename to qztest/testquazipnewinfo.cpp
diff --git a/quazip/qztest/testquazipnewinfo.h b/qztest/testquazipnewinfo.h
similarity index 100%
rename from quazip/qztest/testquazipnewinfo.h
rename to qztest/testquazipnewinfo.h