diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..7a823ee
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "src/maven_core"]
+	path = src/maven_core
+	url = https://github.com/eugenemel/maven_core.git
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..d15b54a
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,42 @@
+matrix:
+  include:
+    - os: linux
+      dist: trusty
+      sudo: required
+      #group: deprecated-2017Q2
+      group: edge
+    - os: osx
+      osx_image: xcode8.3
+
+addons:
+  apt:
+    sources:
+      - sourceline: 'ppa:beineri/opt-qt58-trusty'
+    packages:
+      - qt58-meta-minimal
+      - mesa-common-dev
+      - libgl1-mesa-dev
+      - libsqlite3-dev
+      - libmysqlclient-dev
+      - libssl1.0.0
+      - libssl-dev
+
+before_install:
+  - ./ci/travis/before_install_${TRAVIS_OS_NAME}.sh
+  #- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./ci/travis/brew_install_osx.sh; fi
+  #- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install qt5     ; fi
+
+script:
+  # Add installed Qt path to $PATH
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then source /opt/qt*/bin/qt*-env.sh; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then source qt-5.env; fi
+  # Build and install
+  - qmake -r
+  - make -j2
+  - make INSTALL_ROOT=appdir install
+  # Set VERSION env var
+  - export VERSION=$(src/maven/get_version.sh)
+  # Package deployment artifacts
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./make_dist_linux.sh "src/maven/appdir/bin/maven_dev_${VERSION}"; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./make_dist_osx.sh "src/maven/appdir/bin/Maven.app"; fi
+  - ls -la dist/
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 0000000..149cf01
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,40 @@
+version: 1.0.{build}
+environment:
+  matrix:
+  - COMPILER: msys2
+    PLATFORM: x64
+    MSYS2_ARCH: x86_64
+    MSYS2_DIR: msys64
+    MSYSTEM: MINGW64
+    BIT: 64
+  PATH: 'C:\%MSYS2_DIR%\%MSYSTEM%\bin;C:\%MSYS2_DIR%\usr\bin;%PATH%'
+
+build_script:
+  # Get submodules
+  - git submodule update --init --recursive
+
+  # Not sure why, but seem to have to set path here
+  - SET "PATH=C:\%MSYS2_DIR%\%MSYSTEM%\bin;C:\%MSYS2_DIR%\usr\bin;%PATH%"
+
+  # Install 64-bit QT
+  - bash -lc "pacman -S --needed --noconfirm mingw-w64-x86_64-qt-creator"
+
+  # Install zlib
+  - bash -lc "pacman -S --needed --noconfirm zlib-devel"
+
+  # Install sqlite3
+  - bash -lc "pacman -S --needed --noconfirm mingw64/mingw-w64-x86_64-sqlite3"
+
+  # Build MAVEN
+  - bash -lc "cd $APPVEYOR_BUILD_FOLDER; qmake -r"
+  - bash -lc "cd $APPVEYOR_BUILD_FOLDER; make -j2"
+
+after_build:
+    - SET "PATH=C:\%MSYS2_DIR%\%MSYSTEM%\bin;C:\%MSYS2_DIR%\usr\bin;%PATH%"
+    - src\maven\get_version.bat > version.txt
+    - SET /p VERSION=<version.txt
+    - bash -lc "cd $APPVEYOR_BUILD_FOLDER; ./make_dist_win32.sh src/maven/bin/maven_dev_$VERSION.exe
+
+artifacts:
+    - path: 'dist/maven_*.zip'
+      name: Maven
\ No newline at end of file
diff --git a/build.pro b/build.pro
new file mode 100644
index 0000000..997265c
--- /dev/null
+++ b/build.pro
@@ -0,0 +1,15 @@
+TEMPLATE = subdirs
+CONFIG += ordered qt thread
+SUBDIRS += src/maven_core/libneural \
+		   src/maven_core/libcdfread \
+		   src/maven_core/pugixml/src \
+		   src/maven_core/MSToolkit \
+		   src/maven_core/libmaven \
+		   src/maven
+
+#exists( MSToolkit)  { SUBDIRS += MSToolkit }
+#exists( libmaven ) { SUBDIRS += libmaven }
+#exists( peakdetector ) { SUBDIRS += peakdetector }
+#exists( maven_peakdetector ) { SUBDIRS += maven_peakdetector }
+#exists( maven ) { SUBDIRS += maven }
+#exists( mzLibraryBrowser )  { SUBDIRS += mzLibraryBrowser }
diff --git a/ci/travis/before_install_linux.sh b/ci/travis/before_install_linux.sh
new file mode 100755
index 0000000..3d6c6b2
--- /dev/null
+++ b/ci/travis/before_install_linux.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+echo "Nothing to do before install for linux"
+
+# Clone QTCI to assist with scripted install of QT
+# echo Cloning qtci repository
+# git clone https://github.com/benlau/qtci.git
+# export PATH="$PATH:$PWD/qtci/bin:$PWD/qtci/recipes"
+#
+# echo Downloading Qt
+# INSTALLER=qt-opensource-linux-x64-5.8.0.run
+# ENVFILE=qt-5.8.0.env
+# wget -c https://download.qt.io/archive/qt/5.8/5.8.0/qt-opensource-linux-x64-5.8.0.run
+# echo Installing Qt
+# QT_CI_PACKAGES="qt.58.gcc_64" extract-qt-installer $PWD/$INSTALLER $PWD/Qt
+#
+# echo Create $ENVFILE
+# cat << EOF > $ENVFILE
+# export PATH=$PWD/Qt/5.8/gcc_64/bin:$PATH
+# EOF
+
diff --git a/ci/travis/before_install_osx.sh b/ci/travis/before_install_osx.sh
new file mode 100755
index 0000000..ee028b4
--- /dev/null
+++ b/ci/travis/before_install_osx.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+brew update
+brew install qt5
+brew link qt5 --force
+
+ENVFILE=qt-5.env
+echo Create $ENVFILE
+cat << EOF > $ENVFILE
+export PATH="/usr/local/opt/qt/bin:$PATH"
+export LDFLAGS="-L/usr/local/opt/qt/lib"
+export CPPFLAGS="-I/usr/local/opt/qt/include"
+export PKG_CONFIG_PATH="/usr/local/opt/qt/lib/pkgconfig"
+EOF
diff --git a/make_dist_linux.sh b/make_dist_linux.sh
new file mode 100755
index 0000000..cbc9962
--- /dev/null
+++ b/make_dist_linux.sh
@@ -0,0 +1,76 @@
+#!/bin/bash
+set -e
+
+#Set Script Name variable
+SCRIPT=`basename ${BASH_SOURCE[0]}`
+
+#Set fonts for Help.
+NORM=`tput sgr0`
+BOLD=`tput bold`
+REV=`tput smso`
+
+#Help function
+function HELP {
+    echo -e \\n"${REV}Basic usage:${NORM} ${BOLD}$SCRIPT file.exe${NORM}"\\n
+    echo -e "${REV}-h${NORM}  --Displays this help message. No further functions are performed."\\n
+    echo -e "Example: ${BOLD}$SCRIPT \"bin/maven_dev_20170405\"${NORM}"\\n
+    exit 1
+}
+
+#Check the number of arguments. If none are passed, print help and exit.
+NUMARGS=$#
+if [ $NUMARGS -eq 0 ]; then
+    HELP
+fi
+
+# A POSIX variable
+OPTIND=1         # Reset in case getopts has been used previously in the shell.
+
+# Initialize our own variables:
+
+while getopts "h?f:" opt; do
+    case "$opt" in
+    h|\?)
+        show_help
+        exit 0
+        ;;
+    esac
+done
+
+shift $((OPTIND-1))  #This tells getopts to move on to the next argument.
+
+binpath=$1
+bindir=${binpath%/*}
+binfn="${binpath##*/}"
+distpath="dist"
+
+# TODO Resources must be copied to appdir prior to packaging
+# See: RedTimer example at https://github.com/probonopd/linuxdeployqt/wiki
+#echo "Copying resources to ${apppath}"
+#mkdir -p "${apppath}/Contents/Resources/methods"
+#cp src/maven_core/bin/methods/* "${apppath}/Contents/Resources/methods"
+# TODO Should pathways be in the repo?
+# mkdir "${apppath}/Contents/Resources/pathways"
+# cp bin/pathways/* "${apppath}/Contents/Resources/pathways"
+#mkdir -p "${apppath}/Contents/Resources/scripts"
+#cp src/maven_core/bin/scripts/* "${apppath}/Contents/Resources/scripts"
+
+# Download linuxdeployqt
+echo "Downloading linuxdeployqt"
+wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
+chmod a+x linuxdeployqt*.AppImage
+unset QTDIR; unset QT_PLUGIN_PATH; unset LD_LIBRARY_PATH
+
+echo "Running linuxdeployqt"
+./linuxdeployqt*.AppImage "${binpath}" -bundle-non-qt-libs -verbose=2
+./linuxdeployqt*.AppImage "${binpath}" -appimage -verbose=2
+find "${bindir}" -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq
+#- curl --upload-file ./APPNAME*.AppImage https://transfer.sh/APPNAME-git.$(git rev-parse --short HEAD)-x86_64.AppImage
+ls -la "${binpath}"
+
+echo "Copying AppImage to ${distpath}"
+mkdir -p "${distpath}"
+ls -la
+cp -v "Maven-${VERSION}-x86_64.AppImage" "${distpath}/"
+ls -la "${distpath}"
+
diff --git a/make_dist_osx.sh b/make_dist_osx.sh
new file mode 100755
index 0000000..e53427b
--- /dev/null
+++ b/make_dist_osx.sh
@@ -0,0 +1,73 @@
+#!/bin/bash
+set -e
+
+#Set Script Name variable
+SCRIPT=`basename ${BASH_SOURCE[0]}`
+
+#Set fonts for Help.
+NORM=`tput sgr0`
+BOLD=`tput bold`
+REV=`tput smso`
+
+#Help function
+function HELP {
+    echo -e \\n"${REV}Basic usage:${NORM} ${BOLD}$SCRIPT Maven.app${NORM}"\\n
+    echo -e "${REV}-h${NORM}  --Displays this help message. No further functions are performed."\\n
+    echo -e "Example: ${BOLD}$SCRIPT \"${apppath}\"${NORM}"\\n
+    exit 1
+}
+
+#Check the number of arguments. If none are passed, print help and exit.
+NUMARGS=$#
+if [ $NUMARGS -eq 0 ]; then
+    HELP
+fi
+
+# A POSIX variable
+OPTIND=1         # Reset in case getopts has been used previously in the shell.
+
+# Initialize our own variables:
+
+while getopts "h?f:" opt; do
+    case "$opt" in
+    h|\?)
+        show_help
+        exit 0
+        ;;
+    esac
+done
+
+shift $((OPTIND-1))  #This tells getopts to move on to the next argument.
+
+apppath=$1
+basepath="${apppath%.app}"
+appfn="${apppath##*/}"
+distpath="dist"
+basefn="${appfn%.app}"
+# Get version
+VERSION=$("src/maven/get_version.sh")
+dmgfn="${basefn}_${VERSION}.dmg"
+
+rm -rf "${distpath}"
+mkdir -p "${distpath}"
+
+echo "Copying resources to ${apppath}"
+mkdir -p "${apppath}/Contents/Resources/methods"
+cp src/maven_core/bin/methods/* "${apppath}/Contents/Resources/methods"
+mkdir -p "${apppath}/Contents/Resources/scripts"
+cp src/maven_core/bin/scripts/* "${apppath}/Contents/Resources/scripts"
+# TODO Should pathways be in the repo?
+# mkdir "${apppath}/Contents/Resources/pathways"
+# cp bin/pathways/* "${apppath}/Contents/Resources/pathways"
+# TODO Should these be in the repo?
+# cp bin/*.csv   "${apppath}/Contents/Resources"
+# cp bin/*.model "${apppath}/Contents/Resources"
+
+echo "Running macdeployqt"
+macdeployqt "${apppath}"
+# TODO This doesn't appear to get built, is that correct or are we missing something?
+# macdeployqt "bin/peakdetector.app" -dmg
+
+echo "Making DMG"
+hdiutil create "${distpath}/${dmgfn}" -srcfolder "${apppath}" -ov
+
diff --git a/make_dist_win32.sh b/make_dist_win32.sh
new file mode 100755
index 0000000..0b31b16
--- /dev/null
+++ b/make_dist_win32.sh
@@ -0,0 +1,64 @@
+#!/bin/bash
+set -e
+
+#Set Script Name variable
+SCRIPT=`basename ${BASH_SOURCE[0]}`
+
+#Set fonts for Help.
+NORM=`tput sgr0`
+BOLD=`tput bold`
+REV=`tput smso`
+
+#Help function
+function HELP {
+    echo -e \\n"${REV}Basic usage:${NORM} ${BOLD}$SCRIPT file.exe${NORM}"\\n
+    echo -e "${REV}-h${NORM}  --Displays this help message. No further functions are performed."\\n
+    echo -e "Example: ${BOLD}$SCRIPT \"bin/maven_dev_20170405.exe\"${NORM}"\\n
+    exit 1
+}
+
+#Check the number of arguments. If none are passed, print help and exit.
+NUMARGS=$#
+if [ $NUMARGS -eq 0 ]; then
+    HELP
+fi
+
+# A POSIX variable
+OPTIND=1         # Reset in case getopts has been used previously in the shell.
+
+# Initialize our own variables:
+
+while getopts "h?f:" opt; do
+    case "$opt" in
+    h|\?)
+        show_help
+        exit 0
+        ;;
+    esac
+done
+
+shift $((OPTIND-1))  #This tells getopts to move on to the next argument.
+
+exepath=$1
+exefn="${exepath##*/}"
+distpath="dist/${exefn%.exe}"
+zipfn="${exefn%.exe}.zip"
+
+rm -rf "${distpath}"
+mkdir -p "${distpath}"
+windeployqt.exe "${exepath}" --dir "${distpath}/${b}"
+
+for f in $(ldd "${exepath}" | awk '{print $3}' | grep 'mingw64'); do
+    b=${f##*/}
+    cp -v "${f}" "${distpath}/${b}"
+done
+mkdir -p "${distpath}/methods"
+cp -v src/maven_core/bin/methods/* "${distpath}/methods"
+# mkdir -p "${distpath}/pathways"
+# cp -v bin/pathways/* "${distpath}/pathways"
+mkdir -p "${distpath}/scripts"
+cp -v src/maven_core/bin/scripts/* "${distpath}/scripts"
+cp -v "${exepath}" "${distpath}/"
+
+rm -rf "dist/${zipfn}"
+(cd "${distpath}" && 7z a -tzip "../${zipfn}" *)
diff --git a/maven.pro b/maven.pro
deleted file mode 100644
index b84591e..0000000
--- a/maven.pro
+++ /dev/null
@@ -1,159 +0,0 @@
-include(../libmaven.pri)
-#TEMPLATE = app
-CONFIG += qt thread sql svg console std++14
-QMAKE_STRIP=echo
-#PRECOMPILED_HEADER  = stable.h
-
-#add version information during compilation
-win32 {
-    VERSION = $$system("..\get_version.bat")
-} else {
-    VERSION = $$system("../get_version.sh")
-}
-DEFINES += "MAVEN_VERSION=$$VERSION"
-DEFINES += "PLATFORM=\"$$QMAKE_HOST.os\""
-
-TARGET = maven_dev_$$VERSION
-macx:TARGET=Maven
-
-RC_FILE = mzroll.rc
-RESOURCES +=  mzroll.qrc
-ICON = images/icon.icns
-
-DESTDIR = ../bin
-
-QT += sql xml printsupport opengl
-QT += network
-
-#DEFINES += QT_CORE_LIB QT_DLL QT_NETWORK_LIB QT_SQL_LIB QT_THREAD_LIB
-#INCLUDEPATH +=  /usr/include/qt4/QtXml/ /usr/include/qt/QtSql
-
-INCLUDEPATH += ../libmaven ../maven ../pugixml/src ../libneural ../MSToolkit/include
-LIBS += -L. -L../lib -L../build/lib -L../MSToolkit -lmaven -lpugixml -lneural -lmstoolkitlite -lz
-message($$LIBS)
-
-FORMS = forms/settingsform.ui  \
-		forms/masscalcwidget.ui \
-		forms/isotopeswidget.ui \
-		forms/peakdetectiondialog.ui \
-        forms/comparesamplesdialog.ui \
-        forms/trainingdialog.ui \
-        forms/alignmentdialog.ui \
-        forms/rconsolewidget.ui \
-        forms/clusterdialog.ui \
-        forms/spectramatching.ui \
-        forms/calibrateform.ui \
-        forms/librarydialog.ui \
-
-
-HEADERS +=  stable.h \
-                    globals.h \
-                    mainwindow.h \
-                    tinyplot.h \
-                    plotdock.h \
-                    settingsform.h \
-                    database.h \
-                    classifier.h \
-                    classifierNeuralNet.h \
-                    csvreports.h \
-                    background_peaks_update.h \
-                    isotopeplot.h\
-                    barplot.h \
-                    boxplot.h \
-                    line.h \
-                    point.h \
-                    history.h \
-                    plot_axes.h \
-                    spectrawidget.h\
-                    masscalcgui.h \
-                    isotopeswidget.h \
-                    ligandwidget.h \
-                    eicwidget.h \
-                    peakdetectiondialog.h \
-                    comparesamplesdialog.h \
-                    traindialog.h \
-                    tabledockwidget.h  \
-                    treedockwidget.h  \
-                    heatmap.h  \
-                    note.h  \
-                    suggest.h \
-                    alignmentdialog.h \
-                    scatterplot.h \
-                    gallerywidget.h \
-                    rconsolewidget.h \
-                    highlighter.h \
-                    projectdockwidget.h \
-                    spectramatching.h \
-                    mzfileio.h \
-                    spectralhit.h \
-                    clusterdialog.h \
-                    projectDB.h \
-                    librarydialog.h \
-                    calibratedialog.h
-
-
-SOURCES += mainwindow.cpp  \
-classifier.cpp \
-classifierNeuralNet.cpp \
-database.cpp \
-csvreports.cpp \
- plotdock.cpp \
- treedockwidget.cpp \
- tinyplot.cpp \
- settingsform.cpp \
- background_peaks_update.cpp \
- isotopeplot.cpp \
- barplot.cpp \
- boxplot.cpp \
- point.cpp \
- history.cpp \
- spectrawidget.cpp \
- masscalcgui.cpp \
- isotopeswidget.cpp \
- ligandwidget.cpp \
- main.cpp \
- eicwidget.cpp \
- plot_axes.cpp \
- tabledockwidget.cpp \
- peakdetectiondialog.cpp \
- comparesamplesdialog.cpp \
- traindialog.cpp \
- line.cpp  \
- heatmap.cpp \
- note.cpp  \
- suggest.cpp \
- alignmentdialog.cpp\
- scatterplot.cpp \
- gallerywidget.cpp \
- highlighter.cpp \
- rconsolewidget.cpp \
- clusterdialog.cpp \
- projectdockwidget.cpp \
- spectramatching.cpp \
- mzfileio.cpp \
- projectDB.cpp \
- librarydialog.cpp \
- calibratedialog.cpp
-
-
-sources.files =  $$HEADERS \
-  $$RESOURCES \
-  $$SOURCES \
-  *.doc \
-  *.html \
-  *.pro \
-  images
-sources.path =  ./src
-target.path =  $${INSTALL_PREFIX}/bin
-desktop.path = $${INSTALL_PREFIX}/share/applications
-desktop.files = mzroll.desktop
-
-INSTALLS += target desktop
-
-build_all {
-  !build_pass {
-   CONFIG -=    build_all
-  }
-}
-
-
diff --git a/alignmentdialog.cpp b/src/maven/alignmentdialog.cpp
similarity index 100%
rename from alignmentdialog.cpp
rename to src/maven/alignmentdialog.cpp
diff --git a/alignmentdialog.h b/src/maven/alignmentdialog.h
similarity index 100%
rename from alignmentdialog.h
rename to src/maven/alignmentdialog.h
diff --git a/background_peaks_update.cpp b/src/maven/background_peaks_update.cpp
similarity index 100%
rename from background_peaks_update.cpp
rename to src/maven/background_peaks_update.cpp
diff --git a/background_peaks_update.h b/src/maven/background_peaks_update.h
similarity index 100%
rename from background_peaks_update.h
rename to src/maven/background_peaks_update.h
diff --git a/barplot.cpp b/src/maven/barplot.cpp
similarity index 100%
rename from barplot.cpp
rename to src/maven/barplot.cpp
diff --git a/barplot.h b/src/maven/barplot.h
similarity index 100%
rename from barplot.h
rename to src/maven/barplot.h
diff --git a/boxplot.cpp b/src/maven/boxplot.cpp
similarity index 100%
rename from boxplot.cpp
rename to src/maven/boxplot.cpp
diff --git a/boxplot.h b/src/maven/boxplot.h
similarity index 100%
rename from boxplot.h
rename to src/maven/boxplot.h
diff --git a/calibratedialog.cpp b/src/maven/calibratedialog.cpp
similarity index 100%
rename from calibratedialog.cpp
rename to src/maven/calibratedialog.cpp
diff --git a/calibratedialog.h b/src/maven/calibratedialog.h
similarity index 100%
rename from calibratedialog.h
rename to src/maven/calibratedialog.h
diff --git a/classifier.cpp b/src/maven/classifier.cpp
similarity index 100%
rename from classifier.cpp
rename to src/maven/classifier.cpp
diff --git a/classifier.h b/src/maven/classifier.h
similarity index 100%
rename from classifier.h
rename to src/maven/classifier.h
diff --git a/classifierNeuralNet.cpp b/src/maven/classifierNeuralNet.cpp
similarity index 100%
rename from classifierNeuralNet.cpp
rename to src/maven/classifierNeuralNet.cpp
diff --git a/classifierNeuralNet.h b/src/maven/classifierNeuralNet.h
similarity index 100%
rename from classifierNeuralNet.h
rename to src/maven/classifierNeuralNet.h
diff --git a/clusterdialog.cpp b/src/maven/clusterdialog.cpp
similarity index 100%
rename from clusterdialog.cpp
rename to src/maven/clusterdialog.cpp
diff --git a/clusterdialog.h b/src/maven/clusterdialog.h
similarity index 100%
rename from clusterdialog.h
rename to src/maven/clusterdialog.h
diff --git a/comparesamplesdialog.cpp b/src/maven/comparesamplesdialog.cpp
similarity index 100%
rename from comparesamplesdialog.cpp
rename to src/maven/comparesamplesdialog.cpp
diff --git a/comparesamplesdialog.h b/src/maven/comparesamplesdialog.h
similarity index 100%
rename from comparesamplesdialog.h
rename to src/maven/comparesamplesdialog.h
diff --git a/csvreports.cpp b/src/maven/csvreports.cpp
similarity index 100%
rename from csvreports.cpp
rename to src/maven/csvreports.cpp
diff --git a/csvreports.h b/src/maven/csvreports.h
similarity index 100%
rename from csvreports.h
rename to src/maven/csvreports.h
diff --git a/database.cpp b/src/maven/database.cpp
similarity index 100%
rename from database.cpp
rename to src/maven/database.cpp
diff --git a/database.h b/src/maven/database.h
similarity index 100%
rename from database.h
rename to src/maven/database.h
diff --git a/eicwidget.cpp b/src/maven/eicwidget.cpp
similarity index 100%
rename from eicwidget.cpp
rename to src/maven/eicwidget.cpp
diff --git a/eicwidget.h b/src/maven/eicwidget.h
similarity index 100%
rename from eicwidget.h
rename to src/maven/eicwidget.h
diff --git a/forms/adductwidget.ui b/src/maven/forms/adductwidget.ui
similarity index 100%
rename from forms/adductwidget.ui
rename to src/maven/forms/adductwidget.ui
diff --git a/forms/alignmentdialog.ui b/src/maven/forms/alignmentdialog.ui
similarity index 100%
rename from forms/alignmentdialog.ui
rename to src/maven/forms/alignmentdialog.ui
diff --git a/forms/calibrateform.ui b/src/maven/forms/calibrateform.ui
similarity index 100%
rename from forms/calibrateform.ui
rename to src/maven/forms/calibrateform.ui
diff --git a/forms/clusterdialog.ui b/src/maven/forms/clusterdialog.ui
similarity index 100%
rename from forms/clusterdialog.ui
rename to src/maven/forms/clusterdialog.ui
diff --git a/forms/comparesamplesdialog.ui b/src/maven/forms/comparesamplesdialog.ui
similarity index 100%
rename from forms/comparesamplesdialog.ui
rename to src/maven/forms/comparesamplesdialog.ui
diff --git a/forms/covariantswidget.ui b/src/maven/forms/covariantswidget.ui
similarity index 100%
rename from forms/covariantswidget.ui
rename to src/maven/forms/covariantswidget.ui
diff --git a/forms/isotopeswidget.ui b/src/maven/forms/isotopeswidget.ui
similarity index 100%
rename from forms/isotopeswidget.ui
rename to src/maven/forms/isotopeswidget.ui
diff --git a/forms/librarydialog.ui b/src/maven/forms/librarydialog.ui
similarity index 100%
rename from forms/librarydialog.ui
rename to src/maven/forms/librarydialog.ui
diff --git a/forms/masscalcwidget.ui b/src/maven/forms/masscalcwidget.ui
similarity index 100%
rename from forms/masscalcwidget.ui
rename to src/maven/forms/masscalcwidget.ui
diff --git a/forms/noteswidget.ui b/src/maven/forms/noteswidget.ui
similarity index 100%
rename from forms/noteswidget.ui
rename to src/maven/forms/noteswidget.ui
diff --git a/forms/peakdetectiondialog.ui b/src/maven/forms/peakdetectiondialog.ui
similarity index 100%
rename from forms/peakdetectiondialog.ui
rename to src/maven/forms/peakdetectiondialog.ui
diff --git a/forms/rconsolewidget.ui b/src/maven/forms/rconsolewidget.ui
similarity index 100%
rename from forms/rconsolewidget.ui
rename to src/maven/forms/rconsolewidget.ui
diff --git a/forms/settingsform.ui b/src/maven/forms/settingsform.ui
similarity index 100%
rename from forms/settingsform.ui
rename to src/maven/forms/settingsform.ui
diff --git a/forms/spectramatching.ui b/src/maven/forms/spectramatching.ui
similarity index 100%
rename from forms/spectramatching.ui
rename to src/maven/forms/spectramatching.ui
diff --git a/forms/trainingdialog.ui b/src/maven/forms/trainingdialog.ui
similarity index 100%
rename from forms/trainingdialog.ui
rename to src/maven/forms/trainingdialog.ui
diff --git a/gallerywidget.cpp b/src/maven/gallerywidget.cpp
similarity index 100%
rename from gallerywidget.cpp
rename to src/maven/gallerywidget.cpp
diff --git a/gallerywidget.h b/src/maven/gallerywidget.h
similarity index 100%
rename from gallerywidget.h
rename to src/maven/gallerywidget.h
diff --git a/src/maven/get_version.bat b/src/maven/get_version.bat
new file mode 100644
index 0000000..99f0de3
--- /dev/null
+++ b/src/maven/get_version.bat
@@ -0,0 +1,3 @@
+@echo off
+SET CURRENT_DATE=%date:~10,4%%date:~4,2%%date:~7,2%
+echo %CURRENT_DATE%
\ No newline at end of file
diff --git a/src/maven/get_version.sh b/src/maven/get_version.sh
new file mode 100755
index 0000000..b4da069
--- /dev/null
+++ b/src/maven/get_version.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+date +%Y%m%d
\ No newline at end of file
diff --git a/globals.h b/src/maven/globals.h
similarity index 100%
rename from globals.h
rename to src/maven/globals.h
diff --git a/heatmap.cpp b/src/maven/heatmap.cpp
similarity index 100%
rename from heatmap.cpp
rename to src/maven/heatmap.cpp
diff --git a/heatmap.h b/src/maven/heatmap.h
similarity index 100%
rename from heatmap.h
rename to src/maven/heatmap.h
diff --git a/highlighter.cpp b/src/maven/highlighter.cpp
similarity index 100%
rename from highlighter.cpp
rename to src/maven/highlighter.cpp
diff --git a/highlighter.h b/src/maven/highlighter.h
similarity index 100%
rename from highlighter.h
rename to src/maven/highlighter.h
diff --git a/history.cpp b/src/maven/history.cpp
similarity index 100%
rename from history.cpp
rename to src/maven/history.cpp
diff --git a/history.h b/src/maven/history.h
similarity index 100%
rename from history.h
rename to src/maven/history.h
diff --git a/images/PDF.png b/src/maven/images/PDF.png
similarity index 100%
rename from images/PDF.png
rename to src/maven/images/PDF.png
diff --git a/images/R.png b/src/maven/images/R.png
similarity index 100%
rename from images/R.png
rename to src/maven/images/R.png
diff --git a/images/autofocus.png b/src/maven/images/autofocus.png
similarity index 100%
rename from images/autofocus.png
rename to src/maven/images/autofocus.png
diff --git a/images/autofocus.svg b/src/maven/images/autofocus.svg
similarity index 100%
rename from images/autofocus.svg
rename to src/maven/images/autofocus.svg
diff --git a/images/averageSpectra.png b/src/maven/images/averageSpectra.png
similarity index 100%
rename from images/averageSpectra.png
rename to src/maven/images/averageSpectra.png
diff --git a/images/bad.png b/src/maven/images/bad.png
similarity index 100%
rename from images/bad.png
rename to src/maven/images/bad.png
diff --git a/images/bookmark.png b/src/maven/images/bookmark.png
similarity index 100%
rename from images/bookmark.png
rename to src/maven/images/bookmark.png
diff --git a/images/bug.png b/src/maven/images/bug.png
similarity index 100%
rename from images/bug.png
rename to src/maven/images/bug.png
diff --git a/images/cluster.png b/src/maven/images/cluster.png
similarity index 100%
rename from images/cluster.png
rename to src/maven/images/cluster.png
diff --git a/images/colorfill.png b/src/maven/images/colorfill.png
similarity index 100%
rename from images/colorfill.png
rename to src/maven/images/colorfill.png
diff --git a/images/compound.png b/src/maven/images/compound.png
similarity index 100%
rename from images/compound.png
rename to src/maven/images/compound.png
diff --git a/images/contrast.png b/src/maven/images/contrast.png
similarity index 100%
rename from images/contrast.png
rename to src/maven/images/contrast.png
diff --git a/images/copyCSV.png b/src/maven/images/copyCSV.png
similarity index 100%
rename from images/copyCSV.png
rename to src/maven/images/copyCSV.png
diff --git a/images/copyPNG.png b/src/maven/images/copyPNG.png
similarity index 100%
rename from images/copyPNG.png
rename to src/maven/images/copyPNG.png
diff --git a/images/covariants.png b/src/maven/images/covariants.png
similarity index 100%
rename from images/covariants.png
rename to src/maven/images/covariants.png
diff --git a/images/dbsearch.png b/src/maven/images/dbsearch.png
similarity index 100%
rename from images/dbsearch.png
rename to src/maven/images/dbsearch.png
diff --git a/images/delete.png b/src/maven/images/delete.png
similarity index 100%
rename from images/delete.png
rename to src/maven/images/delete.png
diff --git a/images/export.png b/src/maven/images/export.png
similarity index 100%
rename from images/export.png
rename to src/maven/images/export.png
diff --git a/images/exportcsv.png b/src/maven/images/exportcsv.png
similarity index 100%
rename from images/exportcsv.png
rename to src/maven/images/exportcsv.png
diff --git a/images/exportpdf.png b/src/maven/images/exportpdf.png
similarity index 100%
rename from images/exportpdf.png
rename to src/maven/images/exportpdf.png
diff --git a/images/exportpng.png b/src/maven/images/exportpng.png
similarity index 100%
rename from images/exportpng.png
rename to src/maven/images/exportpng.png
diff --git a/images/exportxml.png b/src/maven/images/exportxml.png
similarity index 100%
rename from images/exportxml.png
rename to src/maven/images/exportxml.png
diff --git a/images/featuredetect.png b/src/maven/images/featuredetect.png
similarity index 100%
rename from images/featuredetect.png
rename to src/maven/images/featuredetect.png
diff --git a/images/filenew.png b/src/maven/images/filenew.png
similarity index 100%
rename from images/filenew.png
rename to src/maven/images/filenew.png
diff --git a/images/fileopen.png b/src/maven/images/fileopen.png
similarity index 100%
rename from images/fileopen.png
rename to src/maven/images/fileopen.png
diff --git a/images/fileprint.png b/src/maven/images/fileprint.png
similarity index 100%
rename from images/fileprint.png
rename to src/maven/images/fileprint.png
diff --git a/images/filesave.png b/src/maven/images/filesave.png
similarity index 100%
rename from images/filesave.png
rename to src/maven/images/filesave.png
diff --git a/images/filter.png b/src/maven/images/filter.png
similarity index 100%
rename from images/filter.png
rename to src/maven/images/filter.png
diff --git a/images/findcompound.png b/src/maven/images/findcompound.png
similarity index 100%
rename from images/findcompound.png
rename to src/maven/images/findcompound.png
diff --git a/images/flip.png b/src/maven/images/flip.png
similarity index 100%
rename from images/flip.png
rename to src/maven/images/flip.png
diff --git a/images/flowerplot.png b/src/maven/images/flowerplot.png
similarity index 100%
rename from images/flowerplot.png
rename to src/maven/images/flowerplot.png
diff --git a/images/gallery.png b/src/maven/images/gallery.png
similarity index 100%
rename from images/gallery.png
rename to src/maven/images/gallery.png
diff --git a/images/good.png b/src/maven/images/good.png
similarity index 100%
rename from images/good.png
rename to src/maven/images/good.png
diff --git a/images/heatmap.png b/src/maven/images/heatmap.png
similarity index 100%
rename from images/heatmap.png
rename to src/maven/images/heatmap.png
diff --git a/images/hide.png b/src/maven/images/hide.png
similarity index 100%
rename from images/hide.png
rename to src/maven/images/hide.png
diff --git a/images/icon.icns b/src/maven/images/icon.icns
similarity index 100%
rename from images/icon.icns
rename to src/maven/images/icon.icns
diff --git a/images/icon.png b/src/maven/images/icon.png
similarity index 100%
rename from images/icon.png
rename to src/maven/images/icon.png
diff --git a/images/icons.svg b/src/maven/images/icons.svg
similarity index 100%
rename from images/icons.svg
rename to src/maven/images/icons.svg
diff --git a/images/integrateArea.png b/src/maven/images/integrateArea.png
similarity index 100%
rename from images/integrateArea.png
rename to src/maven/images/integrateArea.png
diff --git a/images/isotope.png b/src/maven/images/isotope.png
similarity index 100%
rename from images/isotope.png
rename to src/maven/images/isotope.png
diff --git a/images/last.png b/src/maven/images/last.png
similarity index 100%
rename from images/last.png
rename to src/maven/images/last.png
diff --git a/images/librarymanager.png b/src/maven/images/librarymanager.png
similarity index 100%
rename from images/librarymanager.png
rename to src/maven/images/librarymanager.png
diff --git a/images/link.png b/src/maven/images/link.png
similarity index 100%
rename from images/link.png
rename to src/maven/images/link.png
diff --git a/images/logo1.svg b/src/maven/images/logo1.svg
similarity index 100%
rename from images/logo1.svg
rename to src/maven/images/logo1.svg
diff --git a/images/markbad.png b/src/maven/images/markbad.png
similarity index 100%
rename from images/markbad.png
rename to src/maven/images/markbad.png
diff --git a/images/markgood.png b/src/maven/images/markgood.png
similarity index 100%
rename from images/markgood.png
rename to src/maven/images/markgood.png
diff --git a/images/molecule.png b/src/maven/images/molecule.png
similarity index 100%
rename from images/molecule.png
rename to src/maven/images/molecule.png
diff --git a/images/negative_ion.png b/src/maven/images/negative_ion.png
similarity index 100%
rename from images/negative_ion.png
rename to src/maven/images/negative_ion.png
diff --git a/images/newicons.svg b/src/maven/images/newicons.svg
similarity index 100%
rename from images/newicons.svg
rename to src/maven/images/newicons.svg
diff --git a/images/next.png b/src/maven/images/next.png
similarity index 100%
rename from images/next.png
rename to src/maven/images/next.png
diff --git a/images/note.png b/src/maven/images/note.png
similarity index 100%
rename from images/note.png
rename to src/maven/images/note.png
diff --git a/images/pathway.png b/src/maven/images/pathway.png
similarity index 100%
rename from images/pathway.png
rename to src/maven/images/pathway.png
diff --git a/images/peakgroup.png b/src/maven/images/peakgroup.png
similarity index 100%
rename from images/peakgroup.png
rename to src/maven/images/peakgroup.png
diff --git a/images/positive_ion.png b/src/maven/images/positive_ion.png
similarity index 100%
rename from images/positive_ion.png
rename to src/maven/images/positive_ion.png
diff --git a/images/qqq.png b/src/maven/images/qqq.png
similarity index 100%
rename from images/qqq.png
rename to src/maven/images/qqq.png
diff --git a/images/refresh.png b/src/maven/images/refresh.png
similarity index 100%
rename from images/refresh.png
rename to src/maven/images/refresh.png
diff --git a/images/resetzoom.png b/src/maven/images/resetzoom.png
similarity index 100%
rename from images/resetzoom.png
rename to src/maven/images/resetzoom.png
diff --git a/images/resetzoom2.png b/src/maven/images/resetzoom2.png
similarity index 100%
rename from images/resetzoom2.png
rename to src/maven/images/resetzoom2.png
diff --git a/images/samples.png b/src/maven/images/samples.png
similarity index 100%
rename from images/samples.png
rename to src/maven/images/samples.png
diff --git a/images/scatterplot.png b/src/maven/images/scatterplot.png
similarity index 100%
rename from images/scatterplot.png
rename to src/maven/images/scatterplot.png
diff --git a/images/settings.png b/src/maven/images/settings.png
similarity index 100%
rename from images/settings.png
rename to src/maven/images/settings.png
diff --git a/images/showbookmarks.png b/src/maven/images/showbookmarks.png
similarity index 100%
rename from images/showbookmarks.png
rename to src/maven/images/showbookmarks.png
diff --git a/images/spectra.png b/src/maven/images/spectra.png
similarity index 100%
rename from images/spectra.png
rename to src/maven/images/spectra.png
diff --git a/images/spectra_search.png b/src/maven/images/spectra_search.png
similarity index 100%
rename from images/spectra_search.png
rename to src/maven/images/spectra_search.png
diff --git a/images/splash.png b/src/maven/images/splash.png
similarity index 100%
rename from images/splash.png
rename to src/maven/images/splash.png
diff --git a/images/spreadsheet.png b/src/maven/images/spreadsheet.png
similarity index 100%
rename from images/spreadsheet.png
rename to src/maven/images/spreadsheet.png
diff --git a/images/textcenter.png b/src/maven/images/textcenter.png
similarity index 100%
rename from images/textcenter.png
rename to src/maven/images/textcenter.png
diff --git a/images/tic.png b/src/maven/images/tic.png
similarity index 100%
rename from images/tic.png
rename to src/maven/images/tic.png
diff --git a/images/train.png b/src/maven/images/train.png
similarity index 100%
rename from images/train.png
rename to src/maven/images/train.png
diff --git a/images/unknown_ion.png b/src/maven/images/unknown_ion.png
similarity index 100%
rename from images/unknown_ion.png
rename to src/maven/images/unknown_ion.png
diff --git a/images/zoomInEdge.png b/src/maven/images/zoomInEdge.png
similarity index 100%
rename from images/zoomInEdge.png
rename to src/maven/images/zoomInEdge.png
diff --git a/images/zoomInNode.png b/src/maven/images/zoomInNode.png
similarity index 100%
rename from images/zoomInNode.png
rename to src/maven/images/zoomInNode.png
diff --git a/images/zoomInText.png b/src/maven/images/zoomInText.png
similarity index 100%
rename from images/zoomInText.png
rename to src/maven/images/zoomInText.png
diff --git a/images/zoomOutEdge.png b/src/maven/images/zoomOutEdge.png
similarity index 100%
rename from images/zoomOutEdge.png
rename to src/maven/images/zoomOutEdge.png
diff --git a/images/zoomOutNode.png b/src/maven/images/zoomOutNode.png
similarity index 100%
rename from images/zoomOutNode.png
rename to src/maven/images/zoomOutNode.png
diff --git a/images/zoomOutText.png b/src/maven/images/zoomOutText.png
similarity index 100%
rename from images/zoomOutText.png
rename to src/maven/images/zoomOutText.png
diff --git a/images/zoomin.png b/src/maven/images/zoomin.png
similarity index 100%
rename from images/zoomin.png
rename to src/maven/images/zoomin.png
diff --git a/images/zoomout.png b/src/maven/images/zoomout.png
similarity index 100%
rename from images/zoomout.png
rename to src/maven/images/zoomout.png
diff --git a/isotopeplot.cpp b/src/maven/isotopeplot.cpp
similarity index 100%
rename from isotopeplot.cpp
rename to src/maven/isotopeplot.cpp
diff --git a/isotopeplot.h b/src/maven/isotopeplot.h
similarity index 100%
rename from isotopeplot.h
rename to src/maven/isotopeplot.h
diff --git a/isotopeswidget.cpp b/src/maven/isotopeswidget.cpp
similarity index 100%
rename from isotopeswidget.cpp
rename to src/maven/isotopeswidget.cpp
diff --git a/isotopeswidget.h b/src/maven/isotopeswidget.h
similarity index 100%
rename from isotopeswidget.h
rename to src/maven/isotopeswidget.h
diff --git a/librarydialog.cpp b/src/maven/librarydialog.cpp
similarity index 100%
rename from librarydialog.cpp
rename to src/maven/librarydialog.cpp
diff --git a/librarydialog.h b/src/maven/librarydialog.h
similarity index 100%
rename from librarydialog.h
rename to src/maven/librarydialog.h
diff --git a/ligandwidget.cpp b/src/maven/ligandwidget.cpp
similarity index 100%
rename from ligandwidget.cpp
rename to src/maven/ligandwidget.cpp
diff --git a/ligandwidget.h b/src/maven/ligandwidget.h
similarity index 100%
rename from ligandwidget.h
rename to src/maven/ligandwidget.h
diff --git a/line.cpp b/src/maven/line.cpp
similarity index 100%
rename from line.cpp
rename to src/maven/line.cpp
diff --git a/line.h b/src/maven/line.h
similarity index 100%
rename from line.h
rename to src/maven/line.h
diff --git a/main.cpp b/src/maven/main.cpp
similarity index 100%
rename from main.cpp
rename to src/maven/main.cpp
diff --git a/mainwindow.cpp b/src/maven/mainwindow.cpp
similarity index 100%
rename from mainwindow.cpp
rename to src/maven/mainwindow.cpp
diff --git a/mainwindow.h b/src/maven/mainwindow.h
similarity index 100%
rename from mainwindow.h
rename to src/maven/mainwindow.h
diff --git a/masscalcgui.cpp b/src/maven/masscalcgui.cpp
similarity index 100%
rename from masscalcgui.cpp
rename to src/maven/masscalcgui.cpp
diff --git a/masscalcgui.h b/src/maven/masscalcgui.h
similarity index 100%
rename from masscalcgui.h
rename to src/maven/masscalcgui.h
diff --git a/mzroll.desktop b/src/maven/maven.desktop
similarity index 100%
rename from mzroll.desktop
rename to src/maven/maven.desktop
diff --git a/src/maven/maven.pro b/src/maven/maven.pro
new file mode 100644
index 0000000..eeb797b
--- /dev/null
+++ b/src/maven/maven.pro
@@ -0,0 +1,159 @@
+include(../maven_core/libmaven.pri)
+TEMPLATE = app
+CONFIG += qt thread sql svg console std++14
+QMAKE_STRIP=echo
+#PRECOMPILED_HEADER  = stable.h
+
+#add version information during compilation
+win32 {
+    VERSION = $$system(".\get_version.bat")
+} else {
+    VERSION = $$system("./get_version.sh")
+}
+DEFINES += "MAVEN_VERSION=$$VERSION"
+DEFINES += "PLATFORM=\"$$QMAKE_HOST.os\""
+
+TARGET = maven_dev_$$VERSION
+macx:TARGET=Maven
+
+RC_FILE = mzroll.rc
+RESOURCES +=  mzroll.qrc
+ICON = images/icon.icns
+
+DESTDIR = bin
+
+QT += sql xml printsupport opengl
+QT += network
+
+#DEFINES += QT_CORE_LIB QT_DLL QT_NETWORK_LIB QT_SQL_LIB QT_THREAD_LIB
+#INCLUDEPATH +=  /usr/include/qt4/QtXml/ /usr/include/qt/QtSql
+
+INCLUDEPATH += ../maven_core/libmaven src ../maven_core/pugixml/src ../maven_core/libneural ../maven_core/MSToolkit/include
+LIBS += -L. -L../maven_core/lib -L../maven_core/build/lib -L../maven_core/MSToolkit -lmaven -lpugixml -lneural -lmstoolkitlite -lz
+message($$LIBS)
+
+FORMS = forms/settingsform.ui  \
+		forms/masscalcwidget.ui \
+		forms/isotopeswidget.ui \
+		forms/peakdetectiondialog.ui \
+        forms/comparesamplesdialog.ui \
+        forms/trainingdialog.ui \
+        forms/alignmentdialog.ui \
+        forms/rconsolewidget.ui \
+        forms/clusterdialog.ui \
+        forms/spectramatching.ui \
+        forms/calibrateform.ui \
+        forms/librarydialog.ui \
+
+
+HEADERS +=  stable.h \
+            globals.h \
+            mainwindow.h \
+            tinyplot.h \
+            plotdock.h \
+            settingsform.h \
+            database.h \
+            classifier.h \
+            classifierNeuralNet.h \
+            csvreports.h \
+            background_peaks_update.h \
+            isotopeplot.h\
+            barplot.h \
+            boxplot.h \
+            line.h \
+            point.h \
+            history.h \
+            plot_axes.h \
+            spectrawidget.h\
+            masscalcgui.h \
+            isotopeswidget.h \
+            ligandwidget.h \
+            eicwidget.h \
+            peakdetectiondialog.h \
+            comparesamplesdialog.h \
+            traindialog.h \
+            tabledockwidget.h  \
+            treedockwidget.h  \
+            heatmap.h  \
+            note.h  \
+            suggest.h \
+            alignmentdialog.h \
+            scatterplot.h \
+            gallerywidget.h \
+            rconsolewidget.h \
+            highlighter.h \
+            projectdockwidget.h \
+            spectramatching.h \
+            mzfileio.h \
+            spectralhit.h \
+            clusterdialog.h \
+            projectDB.h \
+            librarydialog.h \
+            calibratedialog.h
+
+
+SOURCES +=  mainwindow.cpp  \
+            classifier.cpp \
+            classifierNeuralNet.cpp \
+            database.cpp \
+            csvreports.cpp \
+            plotdock.cpp \
+            treedockwidget.cpp \
+            tinyplot.cpp \
+            settingsform.cpp \
+            background_peaks_update.cpp \
+            isotopeplot.cpp \
+            barplot.cpp \
+            boxplot.cpp \
+            point.cpp \
+            history.cpp \
+            spectrawidget.cpp \
+            masscalcgui.cpp \
+            isotopeswidget.cpp \
+            ligandwidget.cpp \
+            main.cpp \
+            eicwidget.cpp \
+            plot_axes.cpp \
+            tabledockwidget.cpp \
+            peakdetectiondialog.cpp \
+            comparesamplesdialog.cpp \
+            traindialog.cpp \
+            line.cpp  \
+            heatmap.cpp \
+            note.cpp  \
+            suggest.cpp \
+            alignmentdialog.cpp\
+            scatterplot.cpp \
+            gallerywidget.cpp \
+            highlighter.cpp \
+            rconsolewidget.cpp \
+            clusterdialog.cpp \
+            projectdockwidget.cpp \
+            spectramatching.cpp \
+            mzfileio.cpp \
+            projectDB.cpp \
+            librarydialog.cpp \
+            calibratedialog.cpp
+
+
+sources.files =  $$HEADERS \
+  $$RESOURCES \
+  $$SOURCES \
+  *.doc \
+  *.html \
+  *.pro \
+  images
+sources.path =  ./src
+target.path =  $${INSTALL_PREFIX}/bin
+desktop.path = $${INSTALL_PREFIX}/share/applications
+desktop.files = maven.desktop
+
+INSTALLS += target desktop
+
+build_all {
+  !build_pass {
+   CONFIG -=    build_all
+  }
+}
+
+
diff --git a/mzfileio.cpp b/src/maven/mzfileio.cpp
similarity index 100%
rename from mzfileio.cpp
rename to src/maven/mzfileio.cpp
diff --git a/mzfileio.h b/src/maven/mzfileio.h
similarity index 100%
rename from mzfileio.h
rename to src/maven/mzfileio.h
diff --git a/mzroll.ico b/src/maven/mzroll.ico
similarity index 100%
rename from mzroll.ico
rename to src/maven/mzroll.ico
diff --git a/mzroll.qrc b/src/maven/mzroll.qrc
similarity index 100%
rename from mzroll.qrc
rename to src/maven/mzroll.qrc
diff --git a/mzroll.rc b/src/maven/mzroll.rc
similarity index 100%
rename from mzroll.rc
rename to src/maven/mzroll.rc
diff --git a/note.cpp b/src/maven/note.cpp
similarity index 100%
rename from note.cpp
rename to src/maven/note.cpp
diff --git a/note.h b/src/maven/note.h
similarity index 100%
rename from note.h
rename to src/maven/note.h
diff --git a/numeric_treewidgetitem.h b/src/maven/numeric_treewidgetitem.h
similarity index 100%
rename from numeric_treewidgetitem.h
rename to src/maven/numeric_treewidgetitem.h
diff --git a/peakdetectiondialog.cpp b/src/maven/peakdetectiondialog.cpp
similarity index 100%
rename from peakdetectiondialog.cpp
rename to src/maven/peakdetectiondialog.cpp
diff --git a/peakdetectiondialog.h b/src/maven/peakdetectiondialog.h
similarity index 100%
rename from peakdetectiondialog.h
rename to src/maven/peakdetectiondialog.h
diff --git a/plot_axes.cpp b/src/maven/plot_axes.cpp
similarity index 100%
rename from plot_axes.cpp
rename to src/maven/plot_axes.cpp
diff --git a/plot_axes.h b/src/maven/plot_axes.h
similarity index 100%
rename from plot_axes.h
rename to src/maven/plot_axes.h
diff --git a/plotdock.cpp b/src/maven/plotdock.cpp
similarity index 100%
rename from plotdock.cpp
rename to src/maven/plotdock.cpp
diff --git a/plotdock.h b/src/maven/plotdock.h
similarity index 100%
rename from plotdock.h
rename to src/maven/plotdock.h
diff --git a/point.cpp b/src/maven/point.cpp
similarity index 100%
rename from point.cpp
rename to src/maven/point.cpp
diff --git a/point.h b/src/maven/point.h
similarity index 100%
rename from point.h
rename to src/maven/point.h
diff --git a/projectDB.cpp b/src/maven/projectDB.cpp
similarity index 100%
rename from projectDB.cpp
rename to src/maven/projectDB.cpp
diff --git a/projectDB.h b/src/maven/projectDB.h
similarity index 100%
rename from projectDB.h
rename to src/maven/projectDB.h
diff --git a/projectdockwidget.cpp b/src/maven/projectdockwidget.cpp
similarity index 100%
rename from projectdockwidget.cpp
rename to src/maven/projectdockwidget.cpp
diff --git a/projectdockwidget.h b/src/maven/projectdockwidget.h
similarity index 100%
rename from projectdockwidget.h
rename to src/maven/projectdockwidget.h
diff --git a/rconsolewidget.cpp b/src/maven/rconsolewidget.cpp
similarity index 100%
rename from rconsolewidget.cpp
rename to src/maven/rconsolewidget.cpp
diff --git a/rconsolewidget.h b/src/maven/rconsolewidget.h
similarity index 100%
rename from rconsolewidget.h
rename to src/maven/rconsolewidget.h
diff --git a/scatterplot.cpp b/src/maven/scatterplot.cpp
similarity index 100%
rename from scatterplot.cpp
rename to src/maven/scatterplot.cpp
diff --git a/scatterplot.h b/src/maven/scatterplot.h
similarity index 100%
rename from scatterplot.h
rename to src/maven/scatterplot.h
diff --git a/settingsform.cpp b/src/maven/settingsform.cpp
similarity index 100%
rename from settingsform.cpp
rename to src/maven/settingsform.cpp
diff --git a/settingsform.h b/src/maven/settingsform.h
similarity index 100%
rename from settingsform.h
rename to src/maven/settingsform.h
diff --git a/spectralhit.h b/src/maven/spectralhit.h
similarity index 100%
rename from spectralhit.h
rename to src/maven/spectralhit.h
diff --git a/spectramatching.cpp b/src/maven/spectramatching.cpp
similarity index 100%
rename from spectramatching.cpp
rename to src/maven/spectramatching.cpp
diff --git a/spectramatching.h b/src/maven/spectramatching.h
similarity index 100%
rename from spectramatching.h
rename to src/maven/spectramatching.h
diff --git a/spectrawidget.cpp b/src/maven/spectrawidget.cpp
similarity index 100%
rename from spectrawidget.cpp
rename to src/maven/spectrawidget.cpp
diff --git a/spectrawidget.h b/src/maven/spectrawidget.h
similarity index 100%
rename from spectrawidget.h
rename to src/maven/spectrawidget.h
diff --git a/stable.h b/src/maven/stable.h
similarity index 100%
rename from stable.h
rename to src/maven/stable.h
diff --git a/suggest.cpp b/src/maven/suggest.cpp
similarity index 100%
rename from suggest.cpp
rename to src/maven/suggest.cpp
diff --git a/suggest.h b/src/maven/suggest.h
similarity index 100%
rename from suggest.h
rename to src/maven/suggest.h
diff --git a/tabledockwidget.cpp b/src/maven/tabledockwidget.cpp
similarity index 100%
rename from tabledockwidget.cpp
rename to src/maven/tabledockwidget.cpp
diff --git a/tabledockwidget.h b/src/maven/tabledockwidget.h
similarity index 100%
rename from tabledockwidget.h
rename to src/maven/tabledockwidget.h
diff --git a/test.cpp b/src/maven/test.cpp
similarity index 100%
rename from test.cpp
rename to src/maven/test.cpp
diff --git a/tinyplot.cpp b/src/maven/tinyplot.cpp
similarity index 100%
rename from tinyplot.cpp
rename to src/maven/tinyplot.cpp
diff --git a/tinyplot.h b/src/maven/tinyplot.h
similarity index 100%
rename from tinyplot.h
rename to src/maven/tinyplot.h
diff --git a/traindialog.cpp b/src/maven/traindialog.cpp
similarity index 100%
rename from traindialog.cpp
rename to src/maven/traindialog.cpp
diff --git a/traindialog.h b/src/maven/traindialog.h
similarity index 100%
rename from traindialog.h
rename to src/maven/traindialog.h
diff --git a/treedockwidget.cpp b/src/maven/treedockwidget.cpp
similarity index 100%
rename from treedockwidget.cpp
rename to src/maven/treedockwidget.cpp
diff --git a/treedockwidget.h b/src/maven/treedockwidget.h
similarity index 100%
rename from treedockwidget.h
rename to src/maven/treedockwidget.h
diff --git a/src/maven_core b/src/maven_core
new file mode 160000
index 0000000..d0ff60a
--- /dev/null
+++ b/src/maven_core
@@ -0,0 +1 @@
+Subproject commit d0ff60a52c91b6b82349a2fe4e3a6b5fe22519ca