diff --git a/CMakeLists.txt b/CMakeLists.txt
index 015ea72..0ea3103 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,52 +1,128 @@
 cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
 
+# add project files
+set(HEADER_FILES
+    io/cryptoexception.h
+    io/entry.h
+    io/field.h
+    io/parsingexception.h
+    io/passwordfile.h
+    util/openssl.h
+    util/opensslrandomdevice.h
+)
+set(SRC_FILES
+    io/cryptoexception.cpp
+    io/entry.cpp
+    io/field.cpp
+    io/parsingexception.cpp
+    io/passwordfile.cpp
+    util/openssl.cpp
+    util/opensslrandomdevice.cpp
+)
+
 # meta data
 set(META_PROJECT_NAME passwordfile)
 set(META_APP_NAME "Passwordfile library")
 set(META_APP_AUTHOR "Martchus")
 set(META_APP_URL "https://github.com/${META_APP_AUTHOR}/${META_PROJECT_NAME}")
-set(META APP_DESCRIPTION "C++ library to read/write passwords from/to encrypted files.")
+set(META_APP_DESCRIPTION "C++ library to read/write passwords from/to encrypted files.")
 set(META_VERSION_MAJOR 3)
 set(META_VERSION_MINOR 0)
 set(META_VERSION_PATCH 1)
 
-# define project
-project(${META_PROJECT_NAME})
-
 # stringification of meta data
 set(META_PROJECT_NAME_STR "\"${META_PROJECT_NAME}\"")
 set(META_APP_NAME_STR "\"${META_APP_NAME}\"")
 set(META_APP_AUTHOR_STR "\"${META_APP_AUTHOR}\"")
 set(META_APP_URL_STR "\"${META_APP_URL}\"")
-set(APP_DESCRIPTION_STR "\"${APP_DESCRIPTION}\"")
-set(META_APP_VERSION_STR "\"${META_VERSION_MAJOR}.${META_VERSION_MINOR}.${META_VERSION_PATCH}\"")
+set(META_APP_DESCRIPTION_STR "\"${META_APP_DESCRIPTION}\"")
+set(META_APP_VERSION ${META_VERSION_MAJOR}.${META_VERSION_MINOR}.${META_VERSION_PATCH})
+set(META_APP_VERSION_STR "\"${META_APP_VERSION}\"")
+
+# define project
+project(${META_PROJECT_NAME})
 
 # add configuration header
-configure_file (
-  "${PROJECT_SOURCE_DIR}/config.h.in"
-  "${PROJECT_BINARY_DIR}/config.h"
+configure_file(
+    "${PROJECT_SOURCE_DIR}/resources/config.h.in"
+    "${PROJECT_BINARY_DIR}/resources/config.h"
 )
 include_directories("${PROJECT_BINARY_DIR}")
 
-# add source and header files
-file(GLOB_RECURSE SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cpp" "*.c")
-file(GLOB_RECURSE HEADER_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.h")
+# add windows resource file
+if(MINGW)
+    # creation windows icon from png with ffmpeg if available
+    find_program(FFMPEG_BIN ffmpeg avconv)
+    if(FFMPEG_BIN)
+        set(PNG_ICON_PATH "${PROJECT_SOURCE_DIR}/resources/icons/hicolor/128x128/apps/${META_PROJECT_NAME}.png")
+        if(EXISTS ${PNG_ICON_PATH})
+            set(WINDOWS_ICON_PATH "${PROJECT_BINARY_DIR}/${META_PROJECT_NAME}.ico")
+            set(WINDOWS_ICON_RC_ENTRY "IDI_ICON1   ICON    DISCARDABLE \"${WINDOWS_ICON_PATH}\"")
+            add_custom_command(
+                OUTPUT "${WINDOWS_ICON_PATH}"
+                COMMAND ${FFMPEG_BIN} -y -i "${PNG_ICON_PATH}" -vf crop=iw-20:ih-20:10:10,scale=64:64 "${WINDOWS_ICON_PATH}"
+            )
+        endif()
+    endif(FFMPEG_BIN)
+    # create windows rc file from template
+    set(WINDOWS_EXT "dll")
+    configure_file(
+        "${PROJECT_SOURCE_DIR}/resources/windows.rc.in"
+        "${PROJECT_BINARY_DIR}/resources/windows.rc"
+    )
+    # set windres as resource compiler
+    set(RES_FILES "${PROJECT_BINARY_DIR}/resources/windows.rc")
+    set(CMAKE_RC_COMPILER_INIT windres)
+    set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <FLAGS> -O coff <DEFINES> -i <SOURCE> -o <OBJECT>")
+    enable_language(RC)
+endif(MINGW)
+
+# remove library prefix when building with mingw-w64 (just for consistancy with qmake)
+if(MINGW)
+    set(CMAKE_SHARED_LIBRARY_PREFIX "")
+endif(MINGW)
 
 # executable and linking
-add_library(${META_PROJECT_NAME} SHARED ${HEADER_FILES} ${SRC_FILES})
+add_library(${META_PROJECT_NAME} SHARED ${HEADER_FILES} ${SRC_FILES} ${RES_FILES} ${WINDOWS_ICON_PATH})
 target_link_libraries(${META_PROJECT_NAME} c++utilities z crypto)
-set_target_properties(${META_PROJECT_NAME} PROPERTIES VERSION ${META_VERSION_MAJOR}.${META_VERSION_MINOR}.${META_VERSION_PATCH} SOVERSION ${META_VERSION_MAJOR})
-
-# enable C++11
-set_property(TARGET ${META_PROJECT_NAME} PROPERTY CXX_STANDARD 11)
+set_target_properties(${META_PROJECT_NAME} PROPERTIES
+    VERSION ${META_VERSION_MAJOR}.${META_VERSION_MINOR}.${META_VERSION_PATCH}
+    SOVERSION ${META_VERSION_MAJOR}
+    CXX_STANDARD 11
+)
 
 # add install target
 install(TARGETS ${META_PROJECT_NAME}
     RUNTIME DESTINATION bin
+    COMPONENT binary
     LIBRARY DESTINATION lib
+    COMPONENT binary
     ARCHIVE DESTINATION lib
+    COMPONENT binary
 )
 foreach(HEADER_FILE ${HEADER_FILES})
     get_filename_component(HEADER_DIR ${HEADER_FILE} DIRECTORY)
-    install(FILES ${HEADER_FILE} DESTINATION include/${META_PROJECT_NAME}/${HEADER_DIR})
+    install(
+        FILES ${HEADER_FILE}
+        DESTINATION include/${META_PROJECT_NAME}/${HEADER_DIR}
+        COMPONENT header
+    )
 endforeach()
+add_custom_target(install-binary
+    DEPENDS ${META_PROJECT_NAME}
+    COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=binary -P "${CMAKE_BINARY_DIR}/cmake_install.cmake"
+)
+add_custom_target(install-header
+    DEPENDS ${META_PROJECT_NAME}
+    COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=header -P "${CMAKE_BINARY_DIR}/cmake_install.cmake"
+)
+add_custom_target(install-mingw-w64
+    DEPENDS install-binary install-header
+)
+add_custom_target(install-binary-strip
+    DEPENDS ${META_PROJECT_NAME}
+    COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_DO_STRIP=1 -DCMAKE_INSTALL_COMPONENT=binary -P "${CMAKE_BINARY_DIR}/cmake_install.cmake"
+)
+add_custom_target(install-mingw-w64-strip
+    DEPENDS install-binary-strip install-header
+)
diff --git a/config.h.in b/config.h.in
deleted file mode 100644
index 2f9ca46..0000000
--- a/config.h.in
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef APP_METADATA_AVAIL
-#define APP_METADATA_AVAIL
-#define PROJECT_NAME @META_PROJECT_NAME_STR@
-#define APP_NAME @META_APP_NAME_STR@
-#define APP_VERSION @META_APP_VERSION_STR@
-#define APP_AUTHOR @META_APP_AUTHOR_STR@
-#define APP_URL @META_APP_URL_STR@
-#define APP_DESCRIPTION @META_APP_DESCRIPTION_STR@
-#endif // APP_METADATA_AVAIL
diff --git a/general.pri b/general.pri
index 6e654cd..7072941 100644
--- a/general.pri
+++ b/general.pri
@@ -1,28 +1,12 @@
-#dirs
+# specify build directories for moc, object and rcc files
 MOC_DIR = ./moc
 OBJECTS_DIR = ./obj
 RCC_DIR = ./res
-# compiler flags
+
+# compiler flags: enable C++11
 QMAKE_CXXFLAGS += -std=c++11
 QMAKE_LFLAGS += -std=c++11
-# prefix
-targetprefix = $$(TARGET_PREFIX)
-message("Using target prefix \"$${targetprefix}\".")
-# print install root
-message("Using install root \"$$(INSTALL_ROOT)\".")
-# target
-CONFIG(debug, debug|release) {
-    TARGET = $${targetprefix}$${projectname}d
-} else {
-    TARGET = $${targetprefix}$${projectname}
-}
-# add defines
-DEFINES += "APP_METADATA_AVAIL"
-DEFINES += "'PROJECT_NAME=\"$${projectname}\"'"
-DEFINES += "'APP_NAME=\"$${appname}\"'"
-DEFINES += "'APP_AUTHOR=\"$${appauthor}\"'"
-DEFINES += "'APP_URL=\"$${appurl}\"'"
-DEFINES += "'APP_VERSION=\"$${VERSION}\"'"
+
 # variables to check target architecture
 win32-g++:QMAKE_TARGET.arch = $$QMAKE_HOST.arch
 win32-g++-32:QMAKE_TARGET.arch = x86
@@ -30,7 +14,30 @@ win32-g++-64:QMAKE_TARGET.arch = x86_64
 linux-g++:QMAKE_TARGET.arch = $$QMAKE_HOST.arch
 linux-g++-32:QMAKE_TARGET.arch = x86
 linux-g++-64:QMAKE_TARGET.arch = x86_64
-# configuration
+
+# determine and print target prefix
+targetprefix = $$(TARGET_PREFIX)
+message("Using target prefix \"$${targetprefix}\".")
+
+# print install root
+message("Using install root \"$$(INSTALL_ROOT)\".")
+
+# set target
+CONFIG(debug, debug|release) {
+    TARGET = $${targetprefix}$${projectname}d
+} else {
+    TARGET = $${targetprefix}$${projectname}
+}
+
+# add defines for meta data
+DEFINES += "APP_METADATA_AVAIL"
+DEFINES += "'PROJECT_NAME=\"$${projectname}\"'"
+DEFINES += "'APP_NAME=\"$${appname}\"'"
+DEFINES += "'APP_AUTHOR=\"$${appauthor}\"'"
+DEFINES += "'APP_URL=\"$${appurl}\"'"
+DEFINES += "'APP_VERSION=\"$${VERSION}\"'"
+
+# configure Qt modules and defines
 mobile {
     DEFINES += CONFIG_MOBILE
 } else:desktop {
@@ -61,7 +68,7 @@ no-gui {
 }
 guiqtquick {
     message("Configured for Qt Quick GUI support.")
-    greaterThan(QT_MAJOR_VERSION, 4): QT += quick
+    QT += quick
     CONFIG(debug, debug|release) {
         CONFIG += qml_debug
     }
@@ -69,11 +76,12 @@ guiqtquick {
 }
 guiqtwidgets {
     message("Configured for Qt widgets GUI support.")
-    greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+    QT += widgets
     DEFINES += GUI_QTWIDGETS
     DEFINES += MODEL_UNDO_SUPPORT
 }
-# Windows stuff: configuration for cross compliation with mingw-w64
+
+# configuration for cross compliation with mingw-w64
 win32 {
     QMAKE_TARGET_PRODUCT = "$${appname}"
     QMAKE_TARGET_COPYRIGHT = "by $${appauthor}"
diff --git a/passwordfile.pro b/passwordfile.pro
index aab03c9..8a178c8 100644
--- a/passwordfile.pro
+++ b/passwordfile.pro
@@ -37,7 +37,9 @@ HEADERS  += aes/aes.h \
 
 OTHER_FILES += \
     README.md \
-    LICENSE
+    LICENSE \
+    CMakeLists.txt \
+    config.h.in
 
 # libs and includepath
 CONFIG(debug, debug|release) {