diff --git a/default.desktop b/.ci/linux/default.desktop
similarity index 100%
rename from default.desktop
rename to .ci/linux/default.desktop
diff --git a/icon.png b/.ci/linux/icon.png
similarity index 100%
rename from icon.png
rename to .ci/linux/icon.png
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 26057e70b..4c59ed9a5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,48 +31,52 @@ configure_file(version.hpp.in ${CMAKE_BINARY_DIR}/generated/version.hpp)
 
 add_executable(CPEditor
     ${GUI_TYPE}
-    src/main.cc
-    src/mainwindow.cc
-    ui/mainwindow.ui
-    ui/expand.ui
+
     include/mainwindow.hpp
     include/MessageLogger.hpp
     include/SettingsManager.hpp
     include/Compiler.hpp
     include/IO.hpp
+    include/BaseFiles.hpp
     include/UpdateNotifier.hpp
-    src/UpdateNotifier.cpp
-    src/IO.cpp
     include/Runner.hpp
-    src/Runner.cpp
+    include/Formatter.hpp
+    include/expand.hpp
+    include/CompanionServer.hpp
+    include/cftools.hpp
+    include/EditorTheme.hpp
+    include/preferencewindow.hpp
+    include/appwindow.hpp
+    include/DiffViewer.hpp
+
+
+    src/mainwindow.cc
+    src/MessageLogger.cpp
     src/SettingsManager.cpp
+    src/main.cc
     src/Compiler.cpp
-    include/Formatter.hpp
+    src/IO.cpp
+    src/UpdateNotifier.cpp
+    src/Runner.cpp
     src/Formatter.cpp
-    include/BaseFiles.hpp
-    src/MessageLogger.cpp
-    include/expand.hpp
     src/expand.cpp
-    ui/diffviewer.ui
-    include/DiffViewer.hpp
-    src/DiffViewer.cpp
     src/CompanionServer.cpp
-    include/CompanionServer.hpp
-    src/appwindow.cpp
-    include/appwindow.hpp
-    ui/appwindow.ui
-    include/preferencewindow.hpp
+    src/cftools.cpp
+    src/editortheme.cpp
     src/preferencewindow.cpp
+    src/appwindow.cpp
+    src/DiffViewer.cpp
+
+    ui/expand.ui
+    ui/mainwindow.ui
     ui/preferencewindow.ui
-    include/EditorTheme.hpp
-    src/editortheme.cpp
-    include/cftools.hpp
-    src/cftools.cpp
+    ui/appwindow.ui
+    ui/diffviewer.ui
 
     ${CMAKE_BINARY_DIR}/generated/version.hpp
 
     resources/resources.qrc
-    appicon.rc)
+    assets/appicon.rc)
 
 include_directories("third_party/QCodeEditor/include")
 include_directories("include/")
diff --git a/appicon.rc b/assets/appicon.rc
similarity index 100%
rename from appicon.rc
rename to assets/appicon.rc
diff --git a/icon.ico b/assets/icon.ico
similarity index 100%
rename from icon.ico
rename to assets/icon.ico
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 674e6a6ed..3af9f9143 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -9,45 +9,69 @@ trigger:
     include:
     - '*'
 
-pool:
-  vmImage: 'Ubuntu-16.04'
-
-steps:
-- script: git submodule update --init --recursive
-  displayName: 'Fetch third party dependency'
-
-- script: |
-    sudo add-apt-repository ppa:beineri/opt-qt-5.12.0-xenial -y
-    sudo apt-get update -qq
-    sudo apt-get -y install qt512base libgl1-mesa-dev qt512svg qt512imageformats
-    source /opt/qt*/bin/qt*-env.sh
-- task: CMake@1
-  displayName: 'Generate make-files'
-  inputs:
-    cmakeArgs: '.. -DCMAKE_BUILD_TYPE=Release'
-
-
-- script: cd $(Build.SourcesDirectory)/build && make -j 8
-  displayName: 'Make'
-
-- script: |
-    source /opt/qt*/bin/qt*-env.sh
-    cd $(Build.SourcesDirectory)/build
-    wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" 
-    chmod a+x linuxdeployqt*.AppImage
-    export VERSION=`git describe --tags`
-    mv ../default.desktop . && mv ../icon.png .
-    ./linuxdeployqt*.AppImage ./CPEditor -appimage
-  displayName: 'Package to AppImage'
-
-- task: GitHubRelease@1
-  inputs:
-    gitHubConnection: github.com_coder3101
-    repositoryName: '$(Build.Repository.Name)'
-    action: 'create'
-    target: '$(Build.SourceVersion)'
-    title: 'CP Editor'
-    isPreRelease: endsWith(variables['Build.SourceBranch'], 'dev'))
-    assets: $(Build.SourcesDirectory)/build/CP_*
-    changeLogCompareToRelease: 'lastFullRelease'
-    changeLogType: 'commitBased'
+jobs:
+- job:
+  displayName: 'Linux'
+  pool:
+    vmImage: 'Ubuntu-16.04'
+
+  steps:
+  - script: git submodule update --init --recursive
+    displayName: 'Fetch third party dependency'
+
+  - script: |
+      sudo add-apt-repository ppa:beineri/opt-qt-5.12.0-xenial -y
+      sudo apt-get update -qq
+      sudo apt-get -y install qt512base libgl1-mesa-dev qt512svg qt512imageformats
+      source /opt/qt*/bin/qt*-env.sh
+  - task: CMake@1
+    displayName: 'Generate make-files'
+    inputs:
+      cmakeArgs: '.. -DCMAKE_BUILD_TYPE=Release'
+
+
+  - script: cd $(Build.SourcesDirectory)/build && make -j 8
+    displayName: 'Make'
+
+  - script: |
+      source /opt/qt*/bin/qt*-env.sh
+      cd $(Build.SourcesDirectory)/build
+      wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" 
+      chmod a+x linuxdeployqt*.AppImage
+      export VERSION=`git describe --tags`
+      mv ../.ci/linux/default.desktop . && mv ../.ci/linux/icon.png .
+      ./linuxdeployqt*.AppImage ./CPEditor -appimage
+    displayName: 'Package to AppImage'
+
+  - task: GitHubRelease@1
+    inputs:
+      gitHubConnection: github.com_coder3101
+      repositoryName: '$(Build.Repository.Name)'
+      action: 'create'
+      target: '$(Build.SourceVersion)'
+      title: 'CP Editor'
+      isPreRelease: endsWith(variables['Build.SourceBranch'], 'dev'))
+      assets: $(Build.SourcesDirectory)/build/CP_*
+      changeLogCompareToRelease: 'lastFullRelease'
+      changeLogType: 'commitBased'
+
+- job:
+  displayName: 'Windows'
+  pool:
+    vmImage: 'vs2017-win2016'
+  steps:
+  - script: |
+      git submodule update --recursive --init
+    displayName: 'Fetch dependencies'
+
+
+
+  - task: CMake@1
+    inputs:
+      cmakeArgs: '.. $(CMakeArgs) -DCMAKE_BUILD_TYPE=Release'
+
+  - task: MSBuild@1
+    displayName: 'Build solution build/CPEditor.sln'
+    inputs:
+      solution: build/CPEditor.sln
+      msbuildArguments: '/m /p:Configuration=Release'