diff --git a/.gitignore b/.gitignore
index 12e1af62..d2ffae00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ umltest.status
/build
/cmake
/.idea
+*~
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7f..00000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/CMakeLists.txt~ b/CMakeLists.txt~
deleted file mode 100644
index 3a0c8a4a..00000000
--- a/CMakeLists.txt~
+++ /dev/null
@@ -1,165 +0,0 @@
-<<<<<<< HEAD
-# Earlier cmake versions generate .deb packages for which the package manager says they're bad quality
-# and asks the user whether they really want to install it. Cmake 3.3 fixes this.
-CMAKE_MINIMUM_REQUIRED(VERSION 3.3)
-
-INCLUDE(messmer/cmake/tools)
-INCLUDE(messmer/gitversion/cmake)
-
-SETUP_GOOGLETEST()
-
-# Actually create targets: EXEcutables and libraries.
-ADD_BII_TARGETS()
-
-ACTIVATE_CPP14()
-
-ADD_BOOST(program_options chrono)
-
-ADD_DEFINITIONS(-D_FILE_OFFSET_BITS=64)
-
-GIT_VERSION_INIT()
-
-ENABLE_STYLE_WARNINGS()
-
-SET_TARGET_PROPERTIES(${BII_src_main_TARGET} PROPERTIES OUTPUT_NAME cryfs)
-
-# Fix debfiles permissions. Unfortunately, git doesn't store file permissions.
-# When installing the .deb package and these files have the wrong permissions, the package manager complains.
-EXECUTE_PROCESS(COMMAND /bin/bash -c "chmod 0755 ${CMAKE_CURRENT_SOURCE_DIR}/debfiles/*")
-
-INSTALL(TARGETS ${BII_src_main_TARGET}
- DESTINATION bin
- CONFIGURATIONS Release)
-
-SET(CPACK_GENERATOR TGZ DEB RPM)
-SET(CPACK_PACKAGE_NAME "cryfs")
-SET(CPACK_PACKAGE_VERSION "${GITVERSION_VERSION_STRING}")
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Encrypt your files and store them in the cloud.")
-SET(CPACK_PACKAGE_DESCRIPTION "CryFS encrypts your files, so you can safely store them anywhere. It works well together with cloud services like Dropbox, iCloud, OneDrive and others.")
-SET(CPACK_PACKAGE_CONTACT "Sebastian Messmer ")
-SET(CPACK_PACKAGE_VENDOR "Sebastian Messmer")
-SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
-SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}")
-IF(WIN32 AND NOT UNIX)
- # There is a bug in NSI that does not handle full unix paths properly. Make
- # sure there is at least one set of four (4) backlasshes.
- #SET(CPACK_PACKAGE_ICON "${CMake_SOURCE_DIR}/Utilities/Release\\\\InstallIcon.bmp")
- #SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\cryfs.exe")
- #SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} CryFS")
- #SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\www.cryfs.org")
- #SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\www.cryfs.org")
- #SET(CPACK_NSIS_CONTACT "messmer@cryfs.org")
- #SET(CPACK_NSIS_MODIFY_PATH ON)
-ELSE(WIN32 AND NOT UNIX)
- SET(CPACK_STRIP_FILES "bin/cryfs")
- SET(CPACK_SOURCE_STRIP_FILES "")
-ENDIF(WIN32 AND NOT UNIX)
-SET(CPACK_PACKAGE_EXECUTABLES "cryfs" "CryFS")
-SET(CPACK_DEBIAN_PACKAGE_SECTION "utils")
-SET(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
-SET(CPACK_DEBIAN_PACKAGE_RECOMMENDS "fuse")
-
-SET(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://www.cryfs.org")
-SET(CPACK_RPM_PACKAGE_LICENSE "LGPLv3")
-SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/debfiles/postinst;${CMAKE_CURRENT_SOURCE_DIR}/debfiles/postrm")
-
-INCLUDE(CPack)
-
-# You can safely delete lines from here...
-
-###############################################################################
-# REFERENCE #
-###############################################################################
-#
-# This CMakeLists.txt file helps defining your block building and compiling
-# To learn more about the CMake use with biicode, visit http://docs.biicode.com/c++.html
-#
-# ----------------------------------------------------
-# NEW FEATURE! Include cmake files from remote blocks:
-# -----------------------------------------------------
-# Now you can handle cmake dependencies alike you do with c/c++:
-#
-# INCLUDE(user/block/myrecipe) # include myrecipe.cmake from remote user/block
-#
-# > EXAMPLE: Include our recipes and activate C++11 in your block (http://www.biicode.com/biicode/cmake)
-#
-# INCLUDE(biicode/cmake/tools) # Include tools.cmake file from "cmake" block from the "biicode" user
-# ACTIVATE_CPP11(INTERFACE ${BII_BLOCK_TARGET})
-#
-# Remember to run "bii find" to download out cmake tools file
-#
-# ---------------------
-# INIT_BIICODE_BLOCK()
-# ---------------------
-# This function creates several helper variables as ${BII_BLOCK_NAME} and ${BII_BLOCK_USER}
-# Also it loads variables from the cmake/bii_user_block_vars.cmake
-# ${BII_LIB_SRC} File list to create the library
-# ${BII_LIB_TYPE} Empty (default, STATIC most casess) STATIC or SHARED
-# ${BII_LIB_DEPS} Dependencies to other libraries (user2_block2, user3_blockX)
-# ${BII_LIB_SYSTEM_HEADERS} System linking requirements as windows.h, pthread.h, etc
-#
-# You can use or modify them here, for example, to add or remove files from targets based on OS
-# Or use typical cmake configurations done BEFORE defining targets. Examples:
-# ADD_DEFINITIONS(-DFOO)
-# FIND_PACKAGE(OpenGL QUIET)
-# You can add INCLUDE_DIRECTORIES here too
-#
-# ---------------------
-# ADD_BIICODE_TARGETS()
-# ---------------------
-#
-# This function creates the following variables:
-# ${BII_BLOCK_TARGET} Interface (no files) target for convenient configuration of all
-# targets in this block, as the rest of targets always depend on it
-# has name in the form "user_block_interface"
-# ${BII_LIB_TARGET} Target library name, usually in the form "user_block". May not exist
-# if BII_LIB_SRC is empty
-# ${BII_BLOCK_TARGETS} List of all targets defined in this block
-# ${BII_BLOCK_EXES} List of executables targets defined in this block
-# ${BII_exe_name_TARGET}: Executable target (e.g. ${BII_main_TARGET}. You can also use
-# directly the name of the executable target (e.g. user_block_main)
-#
-# > EXAMPLE: Add include directories to all targets of this block
-#
-# TARGET_INCLUDE_DIRECTORIES(${BII_BLOCK_TARGET} INTERFACE myincludedir)
-#
-# You can add private include directories to the Lib (if existing)
-#
-# > EXAMPLE: Link with pthread:
-#
-# TARGET_LINK_LIBRARIES(${BII_BLOCK_TARGET} INTERFACE pthread)
-# or link against library:
-# TARGET_LINK_LIBRARIES(${BII_LIB_TARGET} PUBLIC pthread)
-# or directly use the library target name:
-# TARGET_LINK_LIBRARIES(user_block PUBLIC pthread)
-#
-# NOTE: This can be also done adding pthread to ${BII_LIB_DEPS}
-# BEFORE calling ADD_BIICODE_TARGETS()
-#
-# > EXAMPLE: how to activate C++11
-#
-# IF(APPLE)
-# TARGET_COMPILE_OPTIONS(${BII_BLOCK_TARGET} INTERFACE "-std=c++11 -stdlib=libc++")
-# ELSEIF (WIN32 OR UNIX)
-# TARGET_COMPILE_OPTIONS(${BII_BLOCK_TARGET} INTERFACE "-std=c++11")
-# ENDIF(APPLE)
-#
-# > EXAMPLE: Set properties to target
-#
-# SET_TARGET_PROPERTIES(${BII_BLOCK_TARGET} PROPERTIES COMPILE_DEFINITIONS "IOV_MAX=255")
-#
-
-
-=======
-# Earlier cmake versions generate .deb packages for which the package manager says they're bad quality
-# and asks the user whether they really want to install it. Cmake 3.3 fixes this.
-cmake_minimum_required(VERSION 3.3)
-
-include(utils.cmake)
-
-require_gcc_version(4.8)
-
-add_subdirectory(vendor)
-add_subdirectory(src)
-add_subdirectory(test)
->>>>>>> cpu/cmake