Reorganise; add installation to CMake files