diff --git a/src/style.txt b/doc/user/style.txt
similarity index 100%
rename from src/style.txt
rename to doc/user/style.txt
diff --git a/src/ANT.cpp b/src/ANT/ANT.cpp
similarity index 100%
rename from src/ANT.cpp
rename to src/ANT/ANT.cpp
diff --git a/src/ANT.h b/src/ANT/ANT.h
similarity index 100%
rename from src/ANT.h
rename to src/ANT/ANT.h
diff --git a/src/ANTChannel.cpp b/src/ANT/ANTChannel.cpp
similarity index 100%
rename from src/ANTChannel.cpp
rename to src/ANT/ANTChannel.cpp
diff --git a/src/ANTChannel.h b/src/ANT/ANTChannel.h
similarity index 100%
rename from src/ANTChannel.h
rename to src/ANT/ANTChannel.h
diff --git a/src/ANTLogger.cpp b/src/ANT/ANTLogger.cpp
similarity index 100%
rename from src/ANTLogger.cpp
rename to src/ANT/ANTLogger.cpp
diff --git a/src/ANTLogger.h b/src/ANT/ANTLogger.h
similarity index 100%
rename from src/ANTLogger.h
rename to src/ANT/ANTLogger.h
diff --git a/src/ANTMessage.cpp b/src/ANT/ANTMessage.cpp
similarity index 100%
rename from src/ANTMessage.cpp
rename to src/ANT/ANTMessage.cpp
diff --git a/src/ANTMessage.h b/src/ANT/ANTMessage.h
similarity index 100%
rename from src/ANTMessage.h
rename to src/ANT/ANTMessage.h
diff --git a/src/ANTMessages.h b/src/ANT/ANTMessages.h
similarity index 100%
rename from src/ANTMessages.h
rename to src/ANT/ANTMessages.h
diff --git a/src/ANTlocalController.cpp b/src/ANT/ANTlocalController.cpp
similarity index 100%
rename from src/ANTlocalController.cpp
rename to src/ANT/ANTlocalController.cpp
diff --git a/src/ANTlocalController.h b/src/ANT/ANTlocalController.h
similarity index 100%
rename from src/ANTlocalController.h
rename to src/ANT/ANTlocalController.h
diff --git a/src/Aerolab.cpp b/src/Charts/Aerolab.cpp
similarity index 100%
rename from src/Aerolab.cpp
rename to src/Charts/Aerolab.cpp
diff --git a/src/Aerolab.h b/src/Charts/Aerolab.h
similarity index 100%
rename from src/Aerolab.h
rename to src/Charts/Aerolab.h
diff --git a/src/AerolabWindow.cpp b/src/Charts/AerolabWindow.cpp
similarity index 100%
rename from src/AerolabWindow.cpp
rename to src/Charts/AerolabWindow.cpp
diff --git a/src/AerolabWindow.h b/src/Charts/AerolabWindow.h
similarity index 100%
rename from src/AerolabWindow.h
rename to src/Charts/AerolabWindow.h
diff --git a/src/AllPlot.cpp b/src/Charts/AllPlot.cpp
similarity index 100%
rename from src/AllPlot.cpp
rename to src/Charts/AllPlot.cpp
diff --git a/src/AllPlot.h b/src/Charts/AllPlot.h
similarity index 100%
rename from src/AllPlot.h
rename to src/Charts/AllPlot.h
diff --git a/src/AllPlotInterval.cpp b/src/Charts/AllPlotInterval.cpp
similarity index 100%
rename from src/AllPlotInterval.cpp
rename to src/Charts/AllPlotInterval.cpp
diff --git a/src/AllPlotInterval.h b/src/Charts/AllPlotInterval.h
similarity index 100%
rename from src/AllPlotInterval.h
rename to src/Charts/AllPlotInterval.h
diff --git a/src/AllPlotSlopeCurve.cpp b/src/Charts/AllPlotSlopeCurve.cpp
similarity index 100%
rename from src/AllPlotSlopeCurve.cpp
rename to src/Charts/AllPlotSlopeCurve.cpp
diff --git a/src/AllPlotSlopeCurve.h b/src/Charts/AllPlotSlopeCurve.h
similarity index 100%
rename from src/AllPlotSlopeCurve.h
rename to src/Charts/AllPlotSlopeCurve.h
diff --git a/src/AllPlotWindow.cpp b/src/Charts/AllPlotWindow.cpp
similarity index 100%
rename from src/AllPlotWindow.cpp
rename to src/Charts/AllPlotWindow.cpp
diff --git a/src/AllPlotWindow.h b/src/Charts/AllPlotWindow.h
similarity index 100%
rename from src/AllPlotWindow.h
rename to src/Charts/AllPlotWindow.h
diff --git a/src/BingMap.cpp b/src/Charts/BingMap.cpp
similarity index 100%
rename from src/BingMap.cpp
rename to src/Charts/BingMap.cpp
diff --git a/src/BingMap.h b/src/Charts/BingMap.h
similarity index 100%
rename from src/BingMap.h
rename to src/Charts/BingMap.h
diff --git a/src/BlankState.cpp b/src/Charts/BlankState.cpp
similarity index 100%
rename from src/BlankState.cpp
rename to src/Charts/BlankState.cpp
diff --git a/src/BlankState.h b/src/Charts/BlankState.h
similarity index 100%
rename from src/BlankState.h
rename to src/Charts/BlankState.h
diff --git a/src/CPPlot.cpp b/src/Charts/CPPlot.cpp
similarity index 100%
rename from src/CPPlot.cpp
rename to src/Charts/CPPlot.cpp
diff --git a/src/CPPlot.h b/src/Charts/CPPlot.h
similarity index 100%
rename from src/CPPlot.h
rename to src/Charts/CPPlot.h
diff --git a/src/ChartBar.cpp b/src/Charts/ChartBar.cpp
similarity index 100%
rename from src/ChartBar.cpp
rename to src/Charts/ChartBar.cpp
diff --git a/src/ChartBar.h b/src/Charts/ChartBar.h
similarity index 100%
rename from src/ChartBar.h
rename to src/Charts/ChartBar.h
diff --git a/src/ChartSettings.cpp b/src/Charts/ChartSettings.cpp
similarity index 100%
rename from src/ChartSettings.cpp
rename to src/Charts/ChartSettings.cpp
diff --git a/src/ChartSettings.h b/src/Charts/ChartSettings.h
similarity index 100%
rename from src/ChartSettings.h
rename to src/Charts/ChartSettings.h
diff --git a/src/CpPlotCurve.cpp b/src/Charts/CpPlotCurve.cpp
similarity index 100%
rename from src/CpPlotCurve.cpp
rename to src/Charts/CpPlotCurve.cpp
diff --git a/src/CpPlotCurve.h b/src/Charts/CpPlotCurve.h
similarity index 100%
rename from src/CpPlotCurve.h
rename to src/Charts/CpPlotCurve.h
diff --git a/src/CriticalPowerWindow.cpp b/src/Charts/CriticalPowerWindow.cpp
similarity index 100%
rename from src/CriticalPowerWindow.cpp
rename to src/Charts/CriticalPowerWindow.cpp
diff --git a/src/CriticalPowerWindow.h b/src/Charts/CriticalPowerWindow.h
similarity index 100%
rename from src/CriticalPowerWindow.h
rename to src/Charts/CriticalPowerWindow.h
diff --git a/src/DaysScaleDraw.h b/src/Charts/DaysScaleDraw.h
similarity index 100%
rename from src/DaysScaleDraw.h
rename to src/Charts/DaysScaleDraw.h
diff --git a/src/DiaryWindow.cpp b/src/Charts/DiaryWindow.cpp
similarity index 100%
rename from src/DiaryWindow.cpp
rename to src/Charts/DiaryWindow.cpp
diff --git a/src/DiaryWindow.h b/src/Charts/DiaryWindow.h
similarity index 100%
rename from src/DiaryWindow.h
rename to src/Charts/DiaryWindow.h
diff --git a/src/GcOverlayWidget.cpp b/src/Charts/GcOverlayWidget.cpp
similarity index 100%
rename from src/GcOverlayWidget.cpp
rename to src/Charts/GcOverlayWidget.cpp
diff --git a/src/GcOverlayWidget.h b/src/Charts/GcOverlayWidget.h
similarity index 100%
rename from src/GcOverlayWidget.h
rename to src/Charts/GcOverlayWidget.h
diff --git a/src/GcPane.cpp b/src/Charts/GcPane.cpp
similarity index 100%
rename from src/GcPane.cpp
rename to src/Charts/GcPane.cpp
diff --git a/src/GcPane.h b/src/Charts/GcPane.h
similarity index 100%
rename from src/GcPane.h
rename to src/Charts/GcPane.h
diff --git a/src/GoldenCheetah.cpp b/src/Charts/GoldenCheetah.cpp
similarity index 100%
rename from src/GoldenCheetah.cpp
rename to src/Charts/GoldenCheetah.cpp
diff --git a/src/GoldenCheetah.h b/src/Charts/GoldenCheetah.h
similarity index 100%
rename from src/GoldenCheetah.h
rename to src/Charts/GoldenCheetah.h
diff --git a/src/GoogleMapControl.cpp b/src/Charts/GoogleMapControl.cpp
similarity index 100%
rename from src/GoogleMapControl.cpp
rename to src/Charts/GoogleMapControl.cpp
diff --git a/src/GoogleMapControl.h b/src/Charts/GoogleMapControl.h
similarity index 100%
rename from src/GoogleMapControl.h
rename to src/Charts/GoogleMapControl.h
diff --git a/src/HistogramWindow.cpp b/src/Charts/HistogramWindow.cpp
similarity index 100%
rename from src/HistogramWindow.cpp
rename to src/Charts/HistogramWindow.cpp
diff --git a/src/HistogramWindow.h b/src/Charts/HistogramWindow.h
similarity index 100%
rename from src/HistogramWindow.h
rename to src/Charts/HistogramWindow.h
diff --git a/src/HomeWindow.cpp b/src/Charts/HomeWindow.cpp
similarity index 100%
rename from src/HomeWindow.cpp
rename to src/Charts/HomeWindow.cpp
diff --git a/src/HomeWindow.h b/src/Charts/HomeWindow.h
similarity index 100%
rename from src/HomeWindow.h
rename to src/Charts/HomeWindow.h
diff --git a/src/HrPwPlot.cpp b/src/Charts/HrPwPlot.cpp
similarity index 100%
rename from src/HrPwPlot.cpp
rename to src/Charts/HrPwPlot.cpp
diff --git a/src/HrPwPlot.h b/src/Charts/HrPwPlot.h
similarity index 100%
rename from src/HrPwPlot.h
rename to src/Charts/HrPwPlot.h
diff --git a/src/HrPwWindow.cpp b/src/Charts/HrPwWindow.cpp
similarity index 100%
rename from src/HrPwWindow.cpp
rename to src/Charts/HrPwWindow.cpp
diff --git a/src/HrPwWindow.h b/src/Charts/HrPwWindow.h
similarity index 100%
rename from src/HrPwWindow.h
rename to src/Charts/HrPwWindow.h
diff --git a/src/IndendPlotMarker.cpp b/src/Charts/IndendPlotMarker.cpp
similarity index 100%
rename from src/IndendPlotMarker.cpp
rename to src/Charts/IndendPlotMarker.cpp
diff --git a/src/IndendPlotMarker.h b/src/Charts/IndendPlotMarker.h
similarity index 100%
rename from src/IndendPlotMarker.h
rename to src/Charts/IndendPlotMarker.h
diff --git a/src/IntervalSummaryWindow.cpp b/src/Charts/IntervalSummaryWindow.cpp
similarity index 100%
rename from src/IntervalSummaryWindow.cpp
rename to src/Charts/IntervalSummaryWindow.cpp
diff --git a/src/IntervalSummaryWindow.h b/src/Charts/IntervalSummaryWindow.h
similarity index 100%
rename from src/IntervalSummaryWindow.h
rename to src/Charts/IntervalSummaryWindow.h
diff --git a/src/LTMCanvasPicker.cpp b/src/Charts/LTMCanvasPicker.cpp
similarity index 100%
rename from src/LTMCanvasPicker.cpp
rename to src/Charts/LTMCanvasPicker.cpp
diff --git a/src/LTMCanvasPicker.h b/src/Charts/LTMCanvasPicker.h
similarity index 100%
rename from src/LTMCanvasPicker.h
rename to src/Charts/LTMCanvasPicker.h
diff --git a/src/LTMChartParser.cpp b/src/Charts/LTMChartParser.cpp
similarity index 100%
rename from src/LTMChartParser.cpp
rename to src/Charts/LTMChartParser.cpp
diff --git a/src/LTMChartParser.h b/src/Charts/LTMChartParser.h
similarity index 100%
rename from src/LTMChartParser.h
rename to src/Charts/LTMChartParser.h
diff --git a/src/LTMOutliers.cpp b/src/Charts/LTMOutliers.cpp
similarity index 100%
rename from src/LTMOutliers.cpp
rename to src/Charts/LTMOutliers.cpp
diff --git a/src/LTMOutliers.h b/src/Charts/LTMOutliers.h
similarity index 100%
rename from src/LTMOutliers.h
rename to src/Charts/LTMOutliers.h
diff --git a/src/LTMPlot.cpp b/src/Charts/LTMPlot.cpp
similarity index 100%
rename from src/LTMPlot.cpp
rename to src/Charts/LTMPlot.cpp
diff --git a/src/LTMPlot.h b/src/Charts/LTMPlot.h
similarity index 100%
rename from src/LTMPlot.h
rename to src/Charts/LTMPlot.h
diff --git a/src/LTMPopup.cpp b/src/Charts/LTMPopup.cpp
similarity index 100%
rename from src/LTMPopup.cpp
rename to src/Charts/LTMPopup.cpp
diff --git a/src/LTMPopup.h b/src/Charts/LTMPopup.h
similarity index 100%
rename from src/LTMPopup.h
rename to src/Charts/LTMPopup.h
diff --git a/src/LTMSettings.cpp b/src/Charts/LTMSettings.cpp
similarity index 100%
rename from src/LTMSettings.cpp
rename to src/Charts/LTMSettings.cpp
diff --git a/src/LTMSettings.h b/src/Charts/LTMSettings.h
similarity index 100%
rename from src/LTMSettings.h
rename to src/Charts/LTMSettings.h
diff --git a/src/LTMSidebar.cpp b/src/Charts/LTMSidebar.cpp
similarity index 100%
rename from src/LTMSidebar.cpp
rename to src/Charts/LTMSidebar.cpp
diff --git a/src/LTMSidebar.h b/src/Charts/LTMSidebar.h
similarity index 100%
rename from src/LTMSidebar.h
rename to src/Charts/LTMSidebar.h
diff --git a/src/LTMTool.cpp b/src/Charts/LTMTool.cpp
similarity index 100%
rename from src/LTMTool.cpp
rename to src/Charts/LTMTool.cpp
diff --git a/src/LTMTool.h b/src/Charts/LTMTool.h
similarity index 100%
rename from src/LTMTool.h
rename to src/Charts/LTMTool.h
diff --git a/src/LTMTrend.cpp b/src/Charts/LTMTrend.cpp
similarity index 100%
rename from src/LTMTrend.cpp
rename to src/Charts/LTMTrend.cpp
diff --git a/src/LTMTrend.h b/src/Charts/LTMTrend.h
similarity index 100%
rename from src/LTMTrend.h
rename to src/Charts/LTMTrend.h
diff --git a/src/LTMTrend2.h b/src/Charts/LTMTrend2.h
similarity index 100%
rename from src/LTMTrend2.h
rename to src/Charts/LTMTrend2.h
diff --git a/src/LTMWindow.cpp b/src/Charts/LTMWindow.cpp
similarity index 100%
rename from src/LTMWindow.cpp
rename to src/Charts/LTMWindow.cpp
diff --git a/src/LTMWindow.h b/src/Charts/LTMWindow.h
similarity index 100%
rename from src/LTMWindow.h
rename to src/Charts/LTMWindow.h
diff --git a/src/LogTimeScaleDraw.cpp b/src/Charts/LogTimeScaleDraw.cpp
similarity index 100%
rename from src/LogTimeScaleDraw.cpp
rename to src/Charts/LogTimeScaleDraw.cpp
diff --git a/src/LogTimeScaleDraw.h b/src/Charts/LogTimeScaleDraw.h
similarity index 100%
rename from src/LogTimeScaleDraw.h
rename to src/Charts/LogTimeScaleDraw.h
diff --git a/src/MUPlot.cpp b/src/Charts/MUPlot.cpp
similarity index 100%
rename from src/MUPlot.cpp
rename to src/Charts/MUPlot.cpp
diff --git a/src/MUPlot.h b/src/Charts/MUPlot.h
similarity index 100%
rename from src/MUPlot.h
rename to src/Charts/MUPlot.h
diff --git a/src/MUPool.h b/src/Charts/MUPool.h
similarity index 100%
rename from src/MUPool.h
rename to src/Charts/MUPool.h
diff --git a/src/MUWidget.cpp b/src/Charts/MUWidget.cpp
similarity index 100%
rename from src/MUWidget.cpp
rename to src/Charts/MUWidget.cpp
diff --git a/src/MUWidget.h b/src/Charts/MUWidget.h
similarity index 100%
rename from src/MUWidget.h
rename to src/Charts/MUWidget.h
diff --git a/src/MetadataWindow.cpp b/src/Charts/MetadataWindow.cpp
similarity index 100%
rename from src/MetadataWindow.cpp
rename to src/Charts/MetadataWindow.cpp
diff --git a/src/MetadataWindow.h b/src/Charts/MetadataWindow.h
similarity index 100%
rename from src/MetadataWindow.h
rename to src/Charts/MetadataWindow.h
diff --git a/src/ModelPlot.cpp b/src/Charts/ModelPlot.cpp
similarity index 100%
rename from src/ModelPlot.cpp
rename to src/Charts/ModelPlot.cpp
diff --git a/src/ModelPlot.h b/src/Charts/ModelPlot.h
similarity index 100%
rename from src/ModelPlot.h
rename to src/Charts/ModelPlot.h
diff --git a/src/ModelWindow.cpp b/src/Charts/ModelWindow.cpp
similarity index 100%
rename from src/ModelWindow.cpp
rename to src/Charts/ModelWindow.cpp
diff --git a/src/ModelWindow.h b/src/Charts/ModelWindow.h
similarity index 100%
rename from src/ModelWindow.h
rename to src/Charts/ModelWindow.h
diff --git a/src/PfPvPlot.cpp b/src/Charts/PfPvPlot.cpp
similarity index 100%
rename from src/PfPvPlot.cpp
rename to src/Charts/PfPvPlot.cpp
diff --git a/src/PfPvPlot.h b/src/Charts/PfPvPlot.h
similarity index 100%
rename from src/PfPvPlot.h
rename to src/Charts/PfPvPlot.h
diff --git a/src/PfPvWindow.cpp b/src/Charts/PfPvWindow.cpp
similarity index 100%
rename from src/PfPvWindow.cpp
rename to src/Charts/PfPvWindow.cpp
diff --git a/src/PfPvWindow.h b/src/Charts/PfPvWindow.h
similarity index 100%
rename from src/PfPvWindow.h
rename to src/Charts/PfPvWindow.h
diff --git a/src/PowerHist.cpp b/src/Charts/PowerHist.cpp
similarity index 100%
rename from src/PowerHist.cpp
rename to src/Charts/PowerHist.cpp
diff --git a/src/PowerHist.h b/src/Charts/PowerHist.h
similarity index 100%
rename from src/PowerHist.h
rename to src/Charts/PowerHist.h
diff --git a/src/QtMacVideoWindow.h b/src/Charts/QtMacVideoWindow.h
similarity index 100%
rename from src/QtMacVideoWindow.h
rename to src/Charts/QtMacVideoWindow.h
diff --git a/src/ReferenceLineDialog.cpp b/src/Charts/ReferenceLineDialog.cpp
similarity index 100%
rename from src/ReferenceLineDialog.cpp
rename to src/Charts/ReferenceLineDialog.cpp
diff --git a/src/ReferenceLineDialog.h b/src/Charts/ReferenceLineDialog.h
similarity index 100%
rename from src/ReferenceLineDialog.h
rename to src/Charts/ReferenceLineDialog.h
diff --git a/src/RideEditor.cpp b/src/Charts/RideEditor.cpp
similarity index 100%
rename from src/RideEditor.cpp
rename to src/Charts/RideEditor.cpp
diff --git a/src/RideEditor.h b/src/Charts/RideEditor.h
similarity index 100%
rename from src/RideEditor.h
rename to src/Charts/RideEditor.h
diff --git a/src/RideSummaryWindow.cpp b/src/Charts/RideSummaryWindow.cpp
similarity index 100%
rename from src/RideSummaryWindow.cpp
rename to src/Charts/RideSummaryWindow.cpp
diff --git a/src/RideSummaryWindow.h b/src/Charts/RideSummaryWindow.h
similarity index 100%
rename from src/RideSummaryWindow.h
rename to src/Charts/RideSummaryWindow.h
diff --git a/src/RideWindow.cpp b/src/Charts/RideWindow.cpp
similarity index 100%
rename from src/RideWindow.cpp
rename to src/Charts/RideWindow.cpp
diff --git a/src/RideWindow.h b/src/Charts/RideWindow.h
similarity index 100%
rename from src/RideWindow.h
rename to src/Charts/RideWindow.h
diff --git a/src/RouteWindow.cpp b/src/Charts/RouteWindow.cpp
similarity index 100%
rename from src/RouteWindow.cpp
rename to src/Charts/RouteWindow.cpp
diff --git a/src/RouteWindow.h b/src/Charts/RouteWindow.h
similarity index 100%
rename from src/RouteWindow.h
rename to src/Charts/RouteWindow.h
diff --git a/src/ScatterPlot.cpp b/src/Charts/ScatterPlot.cpp
similarity index 100%
rename from src/ScatterPlot.cpp
rename to src/Charts/ScatterPlot.cpp
diff --git a/src/ScatterPlot.h b/src/Charts/ScatterPlot.h
similarity index 100%
rename from src/ScatterPlot.h
rename to src/Charts/ScatterPlot.h
diff --git a/src/ScatterWindow.cpp b/src/Charts/ScatterWindow.cpp
similarity index 100%
rename from src/ScatterWindow.cpp
rename to src/Charts/ScatterWindow.cpp
diff --git a/src/ScatterWindow.h b/src/Charts/ScatterWindow.h
similarity index 100%
rename from src/ScatterWindow.h
rename to src/Charts/ScatterWindow.h
diff --git a/src/SmallPlot.cpp b/src/Charts/SmallPlot.cpp
similarity index 100%
rename from src/SmallPlot.cpp
rename to src/Charts/SmallPlot.cpp
diff --git a/src/SmallPlot.h b/src/Charts/SmallPlot.h
similarity index 100%
rename from src/SmallPlot.h
rename to src/Charts/SmallPlot.h
diff --git a/src/SummaryWindow.cpp b/src/Charts/SummaryWindow.cpp
similarity index 100%
rename from src/SummaryWindow.cpp
rename to src/Charts/SummaryWindow.cpp
diff --git a/src/SummaryWindow.h b/src/Charts/SummaryWindow.h
similarity index 100%
rename from src/SummaryWindow.h
rename to src/Charts/SummaryWindow.h
diff --git a/src/TreeMapPlot.cpp b/src/Charts/TreeMapPlot.cpp
similarity index 100%
rename from src/TreeMapPlot.cpp
rename to src/Charts/TreeMapPlot.cpp
diff --git a/src/TreeMapPlot.h b/src/Charts/TreeMapPlot.h
similarity index 100%
rename from src/TreeMapPlot.h
rename to src/Charts/TreeMapPlot.h
diff --git a/src/TreeMapWindow.cpp b/src/Charts/TreeMapWindow.cpp
similarity index 100%
rename from src/TreeMapWindow.cpp
rename to src/Charts/TreeMapWindow.cpp
diff --git a/src/TreeMapWindow.h b/src/Charts/TreeMapWindow.h
similarity index 100%
rename from src/TreeMapWindow.h
rename to src/Charts/TreeMapWindow.h
diff --git a/src/ZoneScaleDraw.h b/src/Charts/ZoneScaleDraw.h
similarity index 100%
rename from src/ZoneScaleDraw.h
rename to src/Charts/ZoneScaleDraw.h
diff --git a/src/CalDAV.cpp b/src/Cloud/CalDAV.cpp
similarity index 100%
rename from src/CalDAV.cpp
rename to src/Cloud/CalDAV.cpp
diff --git a/src/CalDAV.h b/src/Cloud/CalDAV.h
similarity index 100%
rename from src/CalDAV.h
rename to src/Cloud/CalDAV.h
diff --git a/src/CalendarDownload.cpp b/src/Cloud/CalendarDownload.cpp
similarity index 100%
rename from src/CalendarDownload.cpp
rename to src/Cloud/CalendarDownload.cpp
diff --git a/src/CalendarDownload.h b/src/Cloud/CalendarDownload.h
similarity index 100%
rename from src/CalendarDownload.h
rename to src/Cloud/CalendarDownload.h
diff --git a/src/CloudDBChart.cpp b/src/Cloud/CloudDBChart.cpp
similarity index 100%
rename from src/CloudDBChart.cpp
rename to src/Cloud/CloudDBChart.cpp
diff --git a/src/CloudDBChart.h b/src/Cloud/CloudDBChart.h
similarity index 100%
rename from src/CloudDBChart.h
rename to src/Cloud/CloudDBChart.h
diff --git a/src/CloudDBCommon.cpp b/src/Cloud/CloudDBCommon.cpp
similarity index 100%
rename from src/CloudDBCommon.cpp
rename to src/Cloud/CloudDBCommon.cpp
diff --git a/src/CloudDBCommon.h b/src/Cloud/CloudDBCommon.h
similarity index 100%
rename from src/CloudDBCommon.h
rename to src/Cloud/CloudDBCommon.h
diff --git a/src/CloudDBCurator.cpp b/src/Cloud/CloudDBCurator.cpp
similarity index 100%
rename from src/CloudDBCurator.cpp
rename to src/Cloud/CloudDBCurator.cpp
diff --git a/src/CloudDBCurator.h b/src/Cloud/CloudDBCurator.h
similarity index 100%
rename from src/CloudDBCurator.h
rename to src/Cloud/CloudDBCurator.h
diff --git a/src/CloudDBStatus.cpp b/src/Cloud/CloudDBStatus.cpp
similarity index 100%
rename from src/CloudDBStatus.cpp
rename to src/Cloud/CloudDBStatus.cpp
diff --git a/src/CloudDBStatus.h b/src/Cloud/CloudDBStatus.h
similarity index 100%
rename from src/CloudDBStatus.h
rename to src/Cloud/CloudDBStatus.h
diff --git a/src/Dropbox.cpp b/src/Cloud/Dropbox.cpp
similarity index 100%
rename from src/Dropbox.cpp
rename to src/Cloud/Dropbox.cpp
diff --git a/src/Dropbox.h b/src/Cloud/Dropbox.h
similarity index 100%
rename from src/Dropbox.h
rename to src/Cloud/Dropbox.h
diff --git a/src/FileStore.cpp b/src/Cloud/FileStore.cpp
similarity index 100%
rename from src/FileStore.cpp
rename to src/Cloud/FileStore.cpp
diff --git a/src/FileStore.h b/src/Cloud/FileStore.h
similarity index 100%
rename from src/FileStore.h
rename to src/Cloud/FileStore.h
diff --git a/src/GoogleDrive.cpp b/src/Cloud/GoogleDrive.cpp
similarity index 100%
rename from src/GoogleDrive.cpp
rename to src/Cloud/GoogleDrive.cpp
diff --git a/src/GoogleDrive.h b/src/Cloud/GoogleDrive.h
similarity index 100%
rename from src/GoogleDrive.h
rename to src/Cloud/GoogleDrive.h
diff --git a/src/LocalFileStore.cpp b/src/Cloud/LocalFileStore.cpp
similarity index 100%
rename from src/LocalFileStore.cpp
rename to src/Cloud/LocalFileStore.cpp
diff --git a/src/LocalFileStore.h b/src/Cloud/LocalFileStore.h
similarity index 100%
rename from src/LocalFileStore.h
rename to src/Cloud/LocalFileStore.h
diff --git a/src/OAuthDialog.cpp b/src/Cloud/OAuthDialog.cpp
similarity index 100%
rename from src/OAuthDialog.cpp
rename to src/Cloud/OAuthDialog.cpp
diff --git a/src/OAuthDialog.h b/src/Cloud/OAuthDialog.h
similarity index 100%
rename from src/OAuthDialog.h
rename to src/Cloud/OAuthDialog.h
diff --git a/src/ShareDialog.cpp b/src/Cloud/ShareDialog.cpp
similarity index 100%
rename from src/ShareDialog.cpp
rename to src/Cloud/ShareDialog.cpp
diff --git a/src/ShareDialog.h b/src/Cloud/ShareDialog.h
similarity index 100%
rename from src/ShareDialog.h
rename to src/Cloud/ShareDialog.h
diff --git a/src/SportPlusHealthUploader.cpp b/src/Cloud/SportPlusHealthUploader.cpp
similarity index 100%
rename from src/SportPlusHealthUploader.cpp
rename to src/Cloud/SportPlusHealthUploader.cpp
diff --git a/src/SportPlusHealthUploader.h b/src/Cloud/SportPlusHealthUploader.h
similarity index 100%
rename from src/SportPlusHealthUploader.h
rename to src/Cloud/SportPlusHealthUploader.h
diff --git a/src/TPDownload.cpp b/src/Cloud/TPDownload.cpp
similarity index 100%
rename from src/TPDownload.cpp
rename to src/Cloud/TPDownload.cpp
diff --git a/src/TPDownload.h b/src/Cloud/TPDownload.h
similarity index 100%
rename from src/TPDownload.h
rename to src/Cloud/TPDownload.h
diff --git a/src/TPDownloadDialog.cpp b/src/Cloud/TPDownloadDialog.cpp
similarity index 100%
rename from src/TPDownloadDialog.cpp
rename to src/Cloud/TPDownloadDialog.cpp
diff --git a/src/TPDownloadDialog.h b/src/Cloud/TPDownloadDialog.h
similarity index 100%
rename from src/TPDownloadDialog.h
rename to src/Cloud/TPDownloadDialog.h
diff --git a/src/TPUpload.cpp b/src/Cloud/TPUpload.cpp
similarity index 100%
rename from src/TPUpload.cpp
rename to src/Cloud/TPUpload.cpp
diff --git a/src/TPUpload.h b/src/Cloud/TPUpload.h
similarity index 100%
rename from src/TPUpload.h
rename to src/Cloud/TPUpload.h
diff --git a/src/TPUploadDialog.cpp b/src/Cloud/TPUploadDialog.cpp
similarity index 100%
rename from src/TPUploadDialog.cpp
rename to src/Cloud/TPUploadDialog.cpp
diff --git a/src/TPUploadDialog.h b/src/Cloud/TPUploadDialog.h
similarity index 100%
rename from src/TPUploadDialog.h
rename to src/Cloud/TPUploadDialog.h
diff --git a/src/TrainingstagebuchUploader.cpp b/src/Cloud/TrainingstagebuchUploader.cpp
similarity index 100%
rename from src/TrainingstagebuchUploader.cpp
rename to src/Cloud/TrainingstagebuchUploader.cpp
diff --git a/src/TrainingstagebuchUploader.h b/src/Cloud/TrainingstagebuchUploader.h
similarity index 100%
rename from src/TrainingstagebuchUploader.h
rename to src/Cloud/TrainingstagebuchUploader.h
diff --git a/src/TwitterDialog.cpp b/src/Cloud/TwitterDialog.cpp
similarity index 100%
rename from src/TwitterDialog.cpp
rename to src/Cloud/TwitterDialog.cpp
diff --git a/src/TwitterDialog.h b/src/Cloud/TwitterDialog.h
similarity index 100%
rename from src/TwitterDialog.h
rename to src/Cloud/TwitterDialog.h
diff --git a/src/VeloHeroUploader.cpp b/src/Cloud/VeloHeroUploader.cpp
similarity index 100%
rename from src/VeloHeroUploader.cpp
rename to src/Cloud/VeloHeroUploader.cpp
diff --git a/src/VeloHeroUploader.h b/src/Cloud/VeloHeroUploader.h
similarity index 100%
rename from src/VeloHeroUploader.h
rename to src/Cloud/VeloHeroUploader.h
diff --git a/src/WithingsDownload.cpp b/src/Cloud/WithingsDownload.cpp
similarity index 100%
rename from src/WithingsDownload.cpp
rename to src/Cloud/WithingsDownload.cpp
diff --git a/src/WithingsDownload.h b/src/Cloud/WithingsDownload.h
similarity index 100%
rename from src/WithingsDownload.h
rename to src/Cloud/WithingsDownload.h
diff --git a/src/WithingsParser.h b/src/Cloud/WithingsParser.h
similarity index 100%
rename from src/WithingsParser.h
rename to src/Cloud/WithingsParser.h
diff --git a/src/WithingsParser.l b/src/Cloud/WithingsParser.l
similarity index 100%
rename from src/WithingsParser.l
rename to src/Cloud/WithingsParser.l
diff --git a/src/WithingsParser.y b/src/Cloud/WithingsParser.y
similarity index 100%
rename from src/WithingsParser.y
rename to src/Cloud/WithingsParser.y
diff --git a/src/APIWebService.cpp b/src/Core/APIWebService.cpp
similarity index 100%
rename from src/APIWebService.cpp
rename to src/Core/APIWebService.cpp
diff --git a/src/APIWebService.h b/src/Core/APIWebService.h
similarity index 100%
rename from src/APIWebService.h
rename to src/Core/APIWebService.h
diff --git a/src/Athlete.cpp b/src/Core/Athlete.cpp
similarity index 100%
rename from src/Athlete.cpp
rename to src/Core/Athlete.cpp
diff --git a/src/Athlete.h b/src/Core/Athlete.h
similarity index 100%
rename from src/Athlete.h
rename to src/Core/Athlete.h
diff --git a/src/Context.cpp b/src/Core/Context.cpp
similarity index 100%
rename from src/Context.cpp
rename to src/Core/Context.cpp
diff --git a/src/Context.h b/src/Core/Context.h
similarity index 100%
rename from src/Context.h
rename to src/Core/Context.h
diff --git a/src/DataFilter.cpp b/src/Core/DataFilter.cpp
similarity index 100%
rename from src/DataFilter.cpp
rename to src/Core/DataFilter.cpp
diff --git a/src/DataFilter.h b/src/Core/DataFilter.h
similarity index 100%
rename from src/DataFilter.h
rename to src/Core/DataFilter.h
diff --git a/src/DataFilter.l b/src/Core/DataFilter.l
similarity index 100%
rename from src/DataFilter.l
rename to src/Core/DataFilter.l
diff --git a/src/DataFilter.y b/src/Core/DataFilter.y
similarity index 100%
rename from src/DataFilter.y
rename to src/Core/DataFilter.y
diff --git a/src/FreeSearch.cpp b/src/Core/FreeSearch.cpp
similarity index 100%
rename from src/FreeSearch.cpp
rename to src/Core/FreeSearch.cpp
diff --git a/src/FreeSearch.h b/src/Core/FreeSearch.h
similarity index 100%
rename from src/FreeSearch.h
rename to src/Core/FreeSearch.h
diff --git a/src/GcCalendarModel.h b/src/Core/GcCalendarModel.h
similarity index 100%
rename from src/GcCalendarModel.h
rename to src/Core/GcCalendarModel.h
diff --git a/src/GcUpgrade.cpp b/src/Core/GcUpgrade.cpp
similarity index 100%
rename from src/GcUpgrade.cpp
rename to src/Core/GcUpgrade.cpp
diff --git a/src/GcUpgrade.h b/src/Core/GcUpgrade.h
similarity index 100%
rename from src/GcUpgrade.h
rename to src/Core/GcUpgrade.h
diff --git a/src/ICalendar.cpp b/src/Core/ICalendar.cpp
similarity index 100%
rename from src/ICalendar.cpp
rename to src/Core/ICalendar.cpp
diff --git a/src/ICalendar.h b/src/Core/ICalendar.h
similarity index 100%
rename from src/ICalendar.h
rename to src/Core/ICalendar.h
diff --git a/src/IdleTimer.cpp b/src/Core/IdleTimer.cpp
similarity index 100%
rename from src/IdleTimer.cpp
rename to src/Core/IdleTimer.cpp
diff --git a/src/IdleTimer.h b/src/Core/IdleTimer.h
similarity index 100%
rename from src/IdleTimer.h
rename to src/Core/IdleTimer.h
diff --git a/src/IntervalItem.cpp b/src/Core/IntervalItem.cpp
similarity index 100%
rename from src/IntervalItem.cpp
rename to src/Core/IntervalItem.cpp
diff --git a/src/IntervalItem.h b/src/Core/IntervalItem.h
similarity index 100%
rename from src/IntervalItem.h
rename to src/Core/IntervalItem.h
diff --git a/src/NamedSearch.cpp b/src/Core/NamedSearch.cpp
similarity index 100%
rename from src/NamedSearch.cpp
rename to src/Core/NamedSearch.cpp
diff --git a/src/NamedSearch.h b/src/Core/NamedSearch.h
similarity index 100%
rename from src/NamedSearch.h
rename to src/Core/NamedSearch.h
diff --git a/src/RideDB.h b/src/Core/RideDB.h
similarity index 100%
rename from src/RideDB.h
rename to src/Core/RideDB.h
diff --git a/src/RideDB.l b/src/Core/RideDB.l
similarity index 100%
rename from src/RideDB.l
rename to src/Core/RideDB.l
diff --git a/src/RideDB.y b/src/Core/RideDB.y
similarity index 100%
rename from src/RideDB.y
rename to src/Core/RideDB.y
diff --git a/src/RideItem.cpp b/src/Core/RideItem.cpp
similarity index 100%
rename from src/RideItem.cpp
rename to src/Core/RideItem.cpp
diff --git a/src/RideItem.h b/src/Core/RideItem.h
similarity index 100%
rename from src/RideItem.h
rename to src/Core/RideItem.h
diff --git a/src/Route.cpp b/src/Core/Route.cpp
similarity index 100%
rename from src/Route.cpp
rename to src/Core/Route.cpp
diff --git a/src/Route.h b/src/Core/Route.h
similarity index 100%
rename from src/Route.h
rename to src/Core/Route.h
diff --git a/src/RouteItem.cpp b/src/Core/RouteItem.cpp
similarity index 100%
rename from src/RouteItem.cpp
rename to src/Core/RouteItem.cpp
diff --git a/src/RouteItem.h b/src/Core/RouteItem.h
similarity index 100%
rename from src/RouteItem.h
rename to src/Core/RouteItem.h
diff --git a/src/RouteParser.cpp b/src/Core/RouteParser.cpp
similarity index 100%
rename from src/RouteParser.cpp
rename to src/Core/RouteParser.cpp
diff --git a/src/RouteParser.h b/src/Core/RouteParser.h
similarity index 100%
rename from src/RouteParser.h
rename to src/Core/RouteParser.h
diff --git a/src/Season.cpp b/src/Core/Season.cpp
similarity index 100%
rename from src/Season.cpp
rename to src/Core/Season.cpp
diff --git a/src/Season.h b/src/Core/Season.h
similarity index 100%
rename from src/Season.h
rename to src/Core/Season.h
diff --git a/src/SeasonParser.cpp b/src/Core/SeasonParser.cpp
similarity index 100%
rename from src/SeasonParser.cpp
rename to src/Core/SeasonParser.cpp
diff --git a/src/SeasonParser.h b/src/Core/SeasonParser.h
similarity index 100%
rename from src/SeasonParser.h
rename to src/Core/SeasonParser.h
diff --git a/src/Secrets.h b/src/Core/Secrets.h
similarity index 100%
rename from src/Secrets.h
rename to src/Core/Secrets.h
diff --git a/src/Settings.cpp b/src/Core/Settings.cpp
similarity index 100%
rename from src/Settings.cpp
rename to src/Core/Settings.cpp
diff --git a/src/Settings.h b/src/Core/Settings.h
similarity index 100%
rename from src/Settings.h
rename to src/Core/Settings.h
diff --git a/src/Specification.cpp b/src/Core/Specification.cpp
similarity index 100%
rename from src/Specification.cpp
rename to src/Core/Specification.cpp
diff --git a/src/Specification.h b/src/Core/Specification.h
similarity index 100%
rename from src/Specification.h
rename to src/Core/Specification.h
diff --git a/src/TimeUtils.cpp b/src/Core/TimeUtils.cpp
similarity index 100%
rename from src/TimeUtils.cpp
rename to src/Core/TimeUtils.cpp
diff --git a/src/TimeUtils.h b/src/Core/TimeUtils.h
similarity index 100%
rename from src/TimeUtils.h
rename to src/Core/TimeUtils.h
diff --git a/src/Units.cpp b/src/Core/Units.cpp
similarity index 100%
rename from src/Units.cpp
rename to src/Core/Units.cpp
diff --git a/src/Units.h b/src/Core/Units.h
similarity index 100%
rename from src/Units.h
rename to src/Core/Units.h
diff --git a/src/UserData.cpp b/src/Core/UserData.cpp
similarity index 100%
rename from src/UserData.cpp
rename to src/Core/UserData.cpp
diff --git a/src/UserData.h b/src/Core/UserData.h
similarity index 100%
rename from src/UserData.h
rename to src/Core/UserData.h
diff --git a/src/Utils.cpp b/src/Core/Utils.cpp
similarity index 100%
rename from src/Utils.cpp
rename to src/Core/Utils.cpp
diff --git a/src/Utils.h b/src/Core/Utils.h
similarity index 100%
rename from src/Utils.h
rename to src/Core/Utils.h
diff --git a/src/main.cpp b/src/Core/main.cpp
similarity index 100%
rename from src/main.cpp
rename to src/Core/main.cpp
diff --git a/src/AthleteBackup.cpp b/src/FileIO/AthleteBackup.cpp
similarity index 100%
rename from src/AthleteBackup.cpp
rename to src/FileIO/AthleteBackup.cpp
diff --git a/src/AthleteBackup.h b/src/FileIO/AthleteBackup.h
similarity index 100%
rename from src/AthleteBackup.h
rename to src/FileIO/AthleteBackup.h
diff --git a/src/BatchExportDialog.cpp b/src/FileIO/BatchExportDialog.cpp
similarity index 100%
rename from src/BatchExportDialog.cpp
rename to src/FileIO/BatchExportDialog.cpp
diff --git a/src/BatchExportDialog.h b/src/FileIO/BatchExportDialog.h
similarity index 100%
rename from src/BatchExportDialog.h
rename to src/FileIO/BatchExportDialog.h
diff --git a/src/Bin2RideFile.cpp b/src/FileIO/Bin2RideFile.cpp
similarity index 100%
rename from src/Bin2RideFile.cpp
rename to src/FileIO/Bin2RideFile.cpp
diff --git a/src/Bin2RideFile.h b/src/FileIO/Bin2RideFile.h
similarity index 100%
rename from src/Bin2RideFile.h
rename to src/FileIO/Bin2RideFile.h
diff --git a/src/BinRideFile.cpp b/src/FileIO/BinRideFile.cpp
similarity index 100%
rename from src/BinRideFile.cpp
rename to src/FileIO/BinRideFile.cpp
diff --git a/src/BinRideFile.h b/src/FileIO/BinRideFile.h
similarity index 100%
rename from src/BinRideFile.h
rename to src/FileIO/BinRideFile.h
diff --git a/src/CommPort.cpp b/src/FileIO/CommPort.cpp
similarity index 100%
rename from src/CommPort.cpp
rename to src/FileIO/CommPort.cpp
diff --git a/src/CommPort.h b/src/FileIO/CommPort.h
similarity index 100%
rename from src/CommPort.h
rename to src/FileIO/CommPort.h
diff --git a/src/Computrainer3dpFile.cpp b/src/FileIO/Computrainer3dpFile.cpp
similarity index 100%
rename from src/Computrainer3dpFile.cpp
rename to src/FileIO/Computrainer3dpFile.cpp
diff --git a/src/Computrainer3dpFile.h b/src/FileIO/Computrainer3dpFile.h
similarity index 100%
rename from src/Computrainer3dpFile.h
rename to src/FileIO/Computrainer3dpFile.h
diff --git a/src/CsvRideFile.cpp b/src/FileIO/CsvRideFile.cpp
similarity index 100%
rename from src/CsvRideFile.cpp
rename to src/FileIO/CsvRideFile.cpp
diff --git a/src/CsvRideFile.h b/src/FileIO/CsvRideFile.h
similarity index 100%
rename from src/CsvRideFile.h
rename to src/FileIO/CsvRideFile.h
diff --git a/src/D2XX.cpp b/src/FileIO/D2XX.cpp
similarity index 100%
rename from src/D2XX.cpp
rename to src/FileIO/D2XX.cpp
diff --git a/src/D2XX.h b/src/FileIO/D2XX.h
similarity index 100%
rename from src/D2XX.h
rename to src/FileIO/D2XX.h
diff --git a/src/DataProcessor.cpp b/src/FileIO/DataProcessor.cpp
similarity index 100%
rename from src/DataProcessor.cpp
rename to src/FileIO/DataProcessor.cpp
diff --git a/src/DataProcessor.h b/src/FileIO/DataProcessor.h
similarity index 100%
rename from src/DataProcessor.h
rename to src/FileIO/DataProcessor.h
diff --git a/src/Device.cpp b/src/FileIO/Device.cpp
similarity index 100%
rename from src/Device.cpp
rename to src/FileIO/Device.cpp
diff --git a/src/Device.h b/src/FileIO/Device.h
similarity index 100%
rename from src/Device.h
rename to src/FileIO/Device.h
diff --git a/src/DownloadRideDialog.cpp b/src/FileIO/DownloadRideDialog.cpp
similarity index 100%
rename from src/DownloadRideDialog.cpp
rename to src/FileIO/DownloadRideDialog.cpp
diff --git a/src/DownloadRideDialog.h b/src/FileIO/DownloadRideDialog.h
similarity index 100%
rename from src/DownloadRideDialog.h
rename to src/FileIO/DownloadRideDialog.h
diff --git a/src/FitRideFile.cpp b/src/FileIO/FitRideFile.cpp
similarity index 100%
rename from src/FitRideFile.cpp
rename to src/FileIO/FitRideFile.cpp
diff --git a/src/FitRideFile.h b/src/FileIO/FitRideFile.h
similarity index 100%
rename from src/FitRideFile.h
rename to src/FileIO/FitRideFile.h
diff --git a/src/FitlogParser.cpp b/src/FileIO/FitlogParser.cpp
similarity index 100%
rename from src/FitlogParser.cpp
rename to src/FileIO/FitlogParser.cpp
diff --git a/src/FitlogParser.h b/src/FileIO/FitlogParser.h
similarity index 100%
rename from src/FitlogParser.h
rename to src/FileIO/FitlogParser.h
diff --git a/src/FitlogRideFile.cpp b/src/FileIO/FitlogRideFile.cpp
similarity index 100%
rename from src/FitlogRideFile.cpp
rename to src/FileIO/FitlogRideFile.cpp
diff --git a/src/FitlogRideFile.h b/src/FileIO/FitlogRideFile.h
similarity index 100%
rename from src/FitlogRideFile.h
rename to src/FileIO/FitlogRideFile.h
diff --git a/src/FixDeriveDistance.cpp b/src/FileIO/FixDeriveDistance.cpp
similarity index 100%
rename from src/FixDeriveDistance.cpp
rename to src/FileIO/FixDeriveDistance.cpp
diff --git a/src/FixDerivePower.cpp b/src/FileIO/FixDerivePower.cpp
similarity index 100%
rename from src/FixDerivePower.cpp
rename to src/FileIO/FixDerivePower.cpp
diff --git a/src/FixDeriveTorque.cpp b/src/FileIO/FixDeriveTorque.cpp
similarity index 100%
rename from src/FixDeriveTorque.cpp
rename to src/FileIO/FixDeriveTorque.cpp
diff --git a/src/FixElevation.cpp b/src/FileIO/FixElevation.cpp
similarity index 100%
rename from src/FixElevation.cpp
rename to src/FileIO/FixElevation.cpp
diff --git a/src/FixFreewheeling.cpp b/src/FileIO/FixFreewheeling.cpp
similarity index 100%
rename from src/FixFreewheeling.cpp
rename to src/FileIO/FixFreewheeling.cpp
diff --git a/src/FixGPS.cpp b/src/FileIO/FixGPS.cpp
similarity index 100%
rename from src/FixGPS.cpp
rename to src/FileIO/FixGPS.cpp
diff --git a/src/FixGaps.cpp b/src/FileIO/FixGaps.cpp
similarity index 100%
rename from src/FixGaps.cpp
rename to src/FileIO/FixGaps.cpp
diff --git a/src/FixHRSpikes.cpp b/src/FileIO/FixHRSpikes.cpp
similarity index 100%
rename from src/FixHRSpikes.cpp
rename to src/FileIO/FixHRSpikes.cpp
diff --git a/src/FixMoxy.cpp b/src/FileIO/FixMoxy.cpp
similarity index 100%
rename from src/FixMoxy.cpp
rename to src/FileIO/FixMoxy.cpp
diff --git a/src/FixPower.cpp b/src/FileIO/FixPower.cpp
similarity index 100%
rename from src/FixPower.cpp
rename to src/FileIO/FixPower.cpp
diff --git a/src/FixSmO2.cpp b/src/FileIO/FixSmO2.cpp
similarity index 100%
rename from src/FixSmO2.cpp
rename to src/FileIO/FixSmO2.cpp
diff --git a/src/FixSpeed.cpp b/src/FileIO/FixSpeed.cpp
similarity index 100%
rename from src/FixSpeed.cpp
rename to src/FileIO/FixSpeed.cpp
diff --git a/src/FixSpikes.cpp b/src/FileIO/FixSpikes.cpp
similarity index 100%
rename from src/FixSpikes.cpp
rename to src/FileIO/FixSpikes.cpp
diff --git a/src/FixTorque.cpp b/src/FileIO/FixTorque.cpp
similarity index 100%
rename from src/FixTorque.cpp
rename to src/FileIO/FixTorque.cpp
diff --git a/src/GcRideFile.cpp b/src/FileIO/GcRideFile.cpp
similarity index 100%
rename from src/GcRideFile.cpp
rename to src/FileIO/GcRideFile.cpp
diff --git a/src/GcRideFile.h b/src/FileIO/GcRideFile.h
similarity index 100%
rename from src/GcRideFile.h
rename to src/FileIO/GcRideFile.h
diff --git a/src/GpxParser.cpp b/src/FileIO/GpxParser.cpp
similarity index 100%
rename from src/GpxParser.cpp
rename to src/FileIO/GpxParser.cpp
diff --git a/src/GpxParser.h b/src/FileIO/GpxParser.h
similarity index 100%
rename from src/GpxParser.h
rename to src/FileIO/GpxParser.h
diff --git a/src/GpxRideFile.cpp b/src/FileIO/GpxRideFile.cpp
similarity index 100%
rename from src/GpxRideFile.cpp
rename to src/FileIO/GpxRideFile.cpp
diff --git a/src/GpxRideFile.h b/src/FileIO/GpxRideFile.h
similarity index 100%
rename from src/GpxRideFile.h
rename to src/FileIO/GpxRideFile.h
diff --git a/src/JouleDevice.cpp b/src/FileIO/JouleDevice.cpp
similarity index 100%
rename from src/JouleDevice.cpp
rename to src/FileIO/JouleDevice.cpp
diff --git a/src/JouleDevice.h b/src/FileIO/JouleDevice.h
similarity index 100%
rename from src/JouleDevice.h
rename to src/FileIO/JouleDevice.h
diff --git a/src/JsonRideFile.h b/src/FileIO/JsonRideFile.h
similarity index 100%
rename from src/JsonRideFile.h
rename to src/FileIO/JsonRideFile.h
diff --git a/src/JsonRideFile.l b/src/FileIO/JsonRideFile.l
similarity index 100%
rename from src/JsonRideFile.l
rename to src/FileIO/JsonRideFile.l
diff --git a/src/JsonRideFile.y b/src/FileIO/JsonRideFile.y
similarity index 100%
rename from src/JsonRideFile.y
rename to src/FileIO/JsonRideFile.y
diff --git a/src/KmlRideFile.cpp b/src/FileIO/KmlRideFile.cpp
similarity index 100%
rename from src/KmlRideFile.cpp
rename to src/FileIO/KmlRideFile.cpp
diff --git a/src/KmlRideFile.h b/src/FileIO/KmlRideFile.h
similarity index 100%
rename from src/KmlRideFile.h
rename to src/FileIO/KmlRideFile.h
diff --git a/src/LapsEditor.cpp b/src/FileIO/LapsEditor.cpp
similarity index 100%
rename from src/LapsEditor.cpp
rename to src/FileIO/LapsEditor.cpp
diff --git a/src/LapsEditor.h b/src/FileIO/LapsEditor.h
similarity index 100%
rename from src/LapsEditor.h
rename to src/FileIO/LapsEditor.h
diff --git a/src/MacroDevice.cpp b/src/FileIO/MacroDevice.cpp
similarity index 100%
rename from src/MacroDevice.cpp
rename to src/FileIO/MacroDevice.cpp
diff --git a/src/MacroDevice.h b/src/FileIO/MacroDevice.h
similarity index 100%
rename from src/MacroDevice.h
rename to src/FileIO/MacroDevice.h
diff --git a/src/ManualRideDialog.cpp b/src/FileIO/ManualRideDialog.cpp
similarity index 100%
rename from src/ManualRideDialog.cpp
rename to src/FileIO/ManualRideDialog.cpp
diff --git a/src/ManualRideDialog.h b/src/FileIO/ManualRideDialog.h
similarity index 100%
rename from src/ManualRideDialog.h
rename to src/FileIO/ManualRideDialog.h
diff --git a/src/ManualRideFile.cpp b/src/FileIO/ManualRideFile.cpp
similarity index 100%
rename from src/ManualRideFile.cpp
rename to src/FileIO/ManualRideFile.cpp
diff --git a/src/ManualRideFile.h b/src/FileIO/ManualRideFile.h
similarity index 100%
rename from src/ManualRideFile.h
rename to src/FileIO/ManualRideFile.h
diff --git a/src/MergeActivityWizard.cpp b/src/FileIO/MergeActivityWizard.cpp
similarity index 100%
rename from src/MergeActivityWizard.cpp
rename to src/FileIO/MergeActivityWizard.cpp
diff --git a/src/MergeActivityWizard.h b/src/FileIO/MergeActivityWizard.h
similarity index 100%
rename from src/MergeActivityWizard.h
rename to src/FileIO/MergeActivityWizard.h
diff --git a/src/MoxyDevice.cpp b/src/FileIO/MoxyDevice.cpp
similarity index 100%
rename from src/MoxyDevice.cpp
rename to src/FileIO/MoxyDevice.cpp
diff --git a/src/MoxyDevice.h b/src/FileIO/MoxyDevice.h
similarity index 100%
rename from src/MoxyDevice.h
rename to src/FileIO/MoxyDevice.h
diff --git a/src/PolarRideFile.cpp b/src/FileIO/PolarRideFile.cpp
similarity index 100%
rename from src/PolarRideFile.cpp
rename to src/FileIO/PolarRideFile.cpp
diff --git a/src/PolarRideFile.h b/src/FileIO/PolarRideFile.h
similarity index 100%
rename from src/PolarRideFile.h
rename to src/FileIO/PolarRideFile.h
diff --git a/src/PowerTapDevice.cpp b/src/FileIO/PowerTapDevice.cpp
similarity index 100%
rename from src/PowerTapDevice.cpp
rename to src/FileIO/PowerTapDevice.cpp
diff --git a/src/PowerTapDevice.h b/src/FileIO/PowerTapDevice.h
similarity index 100%
rename from src/PowerTapDevice.h
rename to src/FileIO/PowerTapDevice.h
diff --git a/src/PowerTapUtil.cpp b/src/FileIO/PowerTapUtil.cpp
similarity index 100%
rename from src/PowerTapUtil.cpp
rename to src/FileIO/PowerTapUtil.cpp
diff --git a/src/PowerTapUtil.h b/src/FileIO/PowerTapUtil.h
similarity index 100%
rename from src/PowerTapUtil.h
rename to src/FileIO/PowerTapUtil.h
diff --git a/src/PwxRideFile.cpp b/src/FileIO/PwxRideFile.cpp
similarity index 100%
rename from src/PwxRideFile.cpp
rename to src/FileIO/PwxRideFile.cpp
diff --git a/src/PwxRideFile.h b/src/FileIO/PwxRideFile.h
similarity index 100%
rename from src/PwxRideFile.h
rename to src/FileIO/PwxRideFile.h
diff --git a/src/QuarqParser.cpp b/src/FileIO/QuarqParser.cpp
similarity index 100%
rename from src/QuarqParser.cpp
rename to src/FileIO/QuarqParser.cpp
diff --git a/src/QuarqParser.h b/src/FileIO/QuarqParser.h
similarity index 100%
rename from src/QuarqParser.h
rename to src/FileIO/QuarqParser.h
diff --git a/src/QuarqRideFile.cpp b/src/FileIO/QuarqRideFile.cpp
similarity index 100%
rename from src/QuarqRideFile.cpp
rename to src/FileIO/QuarqRideFile.cpp
diff --git a/src/QuarqRideFile.h b/src/FileIO/QuarqRideFile.h
similarity index 100%
rename from src/QuarqRideFile.h
rename to src/FileIO/QuarqRideFile.h
diff --git a/src/RawRideFile.cpp b/src/FileIO/RawRideFile.cpp
similarity index 100%
rename from src/RawRideFile.cpp
rename to src/FileIO/RawRideFile.cpp
diff --git a/src/RawRideFile.h b/src/FileIO/RawRideFile.h
similarity index 100%
rename from src/RawRideFile.h
rename to src/FileIO/RawRideFile.h
diff --git a/src/RideAutoImportConfig.cpp b/src/FileIO/RideAutoImportConfig.cpp
similarity index 100%
rename from src/RideAutoImportConfig.cpp
rename to src/FileIO/RideAutoImportConfig.cpp
diff --git a/src/RideAutoImportConfig.h b/src/FileIO/RideAutoImportConfig.h
similarity index 100%
rename from src/RideAutoImportConfig.h
rename to src/FileIO/RideAutoImportConfig.h
diff --git a/src/RideCache.cpp b/src/FileIO/RideCache.cpp
similarity index 100%
rename from src/RideCache.cpp
rename to src/FileIO/RideCache.cpp
diff --git a/src/RideCache.h b/src/FileIO/RideCache.h
similarity index 100%
rename from src/RideCache.h
rename to src/FileIO/RideCache.h
diff --git a/src/RideCacheModel.cpp b/src/FileIO/RideCacheModel.cpp
similarity index 100%
rename from src/RideCacheModel.cpp
rename to src/FileIO/RideCacheModel.cpp
diff --git a/src/RideCacheModel.h b/src/FileIO/RideCacheModel.h
similarity index 100%
rename from src/RideCacheModel.h
rename to src/FileIO/RideCacheModel.h
diff --git a/src/RideFile.cpp b/src/FileIO/RideFile.cpp
similarity index 100%
rename from src/RideFile.cpp
rename to src/FileIO/RideFile.cpp
diff --git a/src/RideFile.h b/src/FileIO/RideFile.h
similarity index 100%
rename from src/RideFile.h
rename to src/FileIO/RideFile.h
diff --git a/src/RideFileCache.cpp b/src/FileIO/RideFileCache.cpp
similarity index 100%
rename from src/RideFileCache.cpp
rename to src/FileIO/RideFileCache.cpp
diff --git a/src/RideFileCache.h b/src/FileIO/RideFileCache.h
similarity index 100%
rename from src/RideFileCache.h
rename to src/FileIO/RideFileCache.h
diff --git a/src/RideFileCommand.cpp b/src/FileIO/RideFileCommand.cpp
similarity index 100%
rename from src/RideFileCommand.cpp
rename to src/FileIO/RideFileCommand.cpp
diff --git a/src/RideFileCommand.h b/src/FileIO/RideFileCommand.h
similarity index 100%
rename from src/RideFileCommand.h
rename to src/FileIO/RideFileCommand.h
diff --git a/src/RideFileTableModel.cpp b/src/FileIO/RideFileTableModel.cpp
similarity index 100%
rename from src/RideFileTableModel.cpp
rename to src/FileIO/RideFileTableModel.cpp
diff --git a/src/RideFileTableModel.h b/src/FileIO/RideFileTableModel.h
similarity index 100%
rename from src/RideFileTableModel.h
rename to src/FileIO/RideFileTableModel.h
diff --git a/src/RideImportWizard.cpp b/src/FileIO/RideImportWizard.cpp
similarity index 100%
rename from src/RideImportWizard.cpp
rename to src/FileIO/RideImportWizard.cpp
diff --git a/src/RideImportWizard.h b/src/FileIO/RideImportWizard.h
similarity index 100%
rename from src/RideImportWizard.h
rename to src/FileIO/RideImportWizard.h
diff --git a/src/Serial.cpp b/src/FileIO/Serial.cpp
similarity index 100%
rename from src/Serial.cpp
rename to src/FileIO/Serial.cpp
diff --git a/src/Serial.h b/src/FileIO/Serial.h
similarity index 100%
rename from src/Serial.h
rename to src/FileIO/Serial.h
diff --git a/src/SlfParser.cpp b/src/FileIO/SlfParser.cpp
similarity index 100%
rename from src/SlfParser.cpp
rename to src/FileIO/SlfParser.cpp
diff --git a/src/SlfParser.h b/src/FileIO/SlfParser.h
similarity index 100%
rename from src/SlfParser.h
rename to src/FileIO/SlfParser.h
diff --git a/src/SlfRideFile.cpp b/src/FileIO/SlfRideFile.cpp
similarity index 100%
rename from src/SlfRideFile.cpp
rename to src/FileIO/SlfRideFile.cpp
diff --git a/src/SlfRideFile.h b/src/FileIO/SlfRideFile.h
similarity index 100%
rename from src/SlfRideFile.h
rename to src/FileIO/SlfRideFile.h
diff --git a/src/SmfParser.cpp b/src/FileIO/SmfParser.cpp
similarity index 100%
rename from src/SmfParser.cpp
rename to src/FileIO/SmfParser.cpp
diff --git a/src/SmfParser.h b/src/FileIO/SmfParser.h
similarity index 100%
rename from src/SmfParser.h
rename to src/FileIO/SmfParser.h
diff --git a/src/SmfRideFile.cpp b/src/FileIO/SmfRideFile.cpp
similarity index 100%
rename from src/SmfRideFile.cpp
rename to src/FileIO/SmfRideFile.cpp
diff --git a/src/SmfRideFile.h b/src/FileIO/SmfRideFile.h
similarity index 100%
rename from src/SmfRideFile.h
rename to src/FileIO/SmfRideFile.h
diff --git a/src/SmlParser.cpp b/src/FileIO/SmlParser.cpp
similarity index 100%
rename from src/SmlParser.cpp
rename to src/FileIO/SmlParser.cpp
diff --git a/src/SmlParser.h b/src/FileIO/SmlParser.h
similarity index 100%
rename from src/SmlParser.h
rename to src/FileIO/SmlParser.h
diff --git a/src/SmlRideFile.cpp b/src/FileIO/SmlRideFile.cpp
similarity index 100%
rename from src/SmlRideFile.cpp
rename to src/FileIO/SmlRideFile.cpp
diff --git a/src/SmlRideFile.h b/src/FileIO/SmlRideFile.h
similarity index 100%
rename from src/SmlRideFile.h
rename to src/FileIO/SmlRideFile.h
diff --git a/src/SplitActivityWizard.cpp b/src/FileIO/SplitActivityWizard.cpp
similarity index 100%
rename from src/SplitActivityWizard.cpp
rename to src/FileIO/SplitActivityWizard.cpp
diff --git a/src/SplitActivityWizard.h b/src/FileIO/SplitActivityWizard.h
similarity index 100%
rename from src/SplitActivityWizard.h
rename to src/FileIO/SplitActivityWizard.h
diff --git a/src/SrdRideFile.cpp b/src/FileIO/SrdRideFile.cpp
similarity index 100%
rename from src/SrdRideFile.cpp
rename to src/FileIO/SrdRideFile.cpp
diff --git a/src/SrdRideFile.h b/src/FileIO/SrdRideFile.h
similarity index 100%
rename from src/SrdRideFile.h
rename to src/FileIO/SrdRideFile.h
diff --git a/src/SrmDevice.cpp b/src/FileIO/SrmDevice.cpp
similarity index 100%
rename from src/SrmDevice.cpp
rename to src/FileIO/SrmDevice.cpp
diff --git a/src/SrmDevice.h b/src/FileIO/SrmDevice.h
similarity index 100%
rename from src/SrmDevice.h
rename to src/FileIO/SrmDevice.h
diff --git a/src/SrmRideFile.cpp b/src/FileIO/SrmRideFile.cpp
similarity index 100%
rename from src/SrmRideFile.cpp
rename to src/FileIO/SrmRideFile.cpp
diff --git a/src/SrmRideFile.h b/src/FileIO/SrmRideFile.h
similarity index 100%
rename from src/SrmRideFile.h
rename to src/FileIO/SrmRideFile.h
diff --git a/src/SyncRideFile.cpp b/src/FileIO/SyncRideFile.cpp
similarity index 100%
rename from src/SyncRideFile.cpp
rename to src/FileIO/SyncRideFile.cpp
diff --git a/src/SyncRideFile.h b/src/FileIO/SyncRideFile.h
similarity index 100%
rename from src/SyncRideFile.h
rename to src/FileIO/SyncRideFile.h
diff --git a/src/TacxCafRideFile.cpp b/src/FileIO/TacxCafRideFile.cpp
similarity index 100%
rename from src/TacxCafRideFile.cpp
rename to src/FileIO/TacxCafRideFile.cpp
diff --git a/src/TcxParser.cpp b/src/FileIO/TcxParser.cpp
similarity index 100%
rename from src/TcxParser.cpp
rename to src/FileIO/TcxParser.cpp
diff --git a/src/TcxParser.h b/src/FileIO/TcxParser.h
similarity index 100%
rename from src/TcxParser.h
rename to src/FileIO/TcxParser.h
diff --git a/src/TcxRideFile.cpp b/src/FileIO/TcxRideFile.cpp
similarity index 100%
rename from src/TcxRideFile.cpp
rename to src/FileIO/TcxRideFile.cpp
diff --git a/src/TcxRideFile.h b/src/FileIO/TcxRideFile.h
similarity index 100%
rename from src/TcxRideFile.h
rename to src/FileIO/TcxRideFile.h
diff --git a/src/TxtRideFile.cpp b/src/FileIO/TxtRideFile.cpp
similarity index 100%
rename from src/TxtRideFile.cpp
rename to src/FileIO/TxtRideFile.cpp
diff --git a/src/TxtRideFile.h b/src/FileIO/TxtRideFile.h
similarity index 100%
rename from src/TxtRideFile.h
rename to src/FileIO/TxtRideFile.h
diff --git a/src/WkoRideFile.cpp b/src/FileIO/WkoRideFile.cpp
similarity index 100%
rename from src/WkoRideFile.cpp
rename to src/FileIO/WkoRideFile.cpp
diff --git a/src/WkoRideFile.h b/src/FileIO/WkoRideFile.h
similarity index 100%
rename from src/WkoRideFile.h
rename to src/FileIO/WkoRideFile.h
diff --git a/src/AboutDialog.cpp b/src/Gui/AboutDialog.cpp
similarity index 100%
rename from src/AboutDialog.cpp
rename to src/Gui/AboutDialog.cpp
diff --git a/src/AboutDialog.h b/src/Gui/AboutDialog.h
similarity index 100%
rename from src/AboutDialog.h
rename to src/Gui/AboutDialog.h
diff --git a/src/AddIntervalDialog.cpp b/src/Gui/AddIntervalDialog.cpp
similarity index 100%
rename from src/AddIntervalDialog.cpp
rename to src/Gui/AddIntervalDialog.cpp
diff --git a/src/AddIntervalDialog.h b/src/Gui/AddIntervalDialog.h
similarity index 100%
rename from src/AddIntervalDialog.h
rename to src/Gui/AddIntervalDialog.h
diff --git a/src/AnalysisSidebar.cpp b/src/Gui/AnalysisSidebar.cpp
similarity index 100%
rename from src/AnalysisSidebar.cpp
rename to src/Gui/AnalysisSidebar.cpp
diff --git a/src/AnalysisSidebar.h b/src/Gui/AnalysisSidebar.h
similarity index 100%
rename from src/AnalysisSidebar.h
rename to src/Gui/AnalysisSidebar.h
diff --git a/src/ChooseCyclistDialog.cpp b/src/Gui/ChooseCyclistDialog.cpp
similarity index 100%
rename from src/ChooseCyclistDialog.cpp
rename to src/Gui/ChooseCyclistDialog.cpp
diff --git a/src/ChooseCyclistDialog.h b/src/Gui/ChooseCyclistDialog.h
similarity index 100%
rename from src/ChooseCyclistDialog.h
rename to src/Gui/ChooseCyclistDialog.h
diff --git a/src/ColorButton.cpp b/src/Gui/ColorButton.cpp
similarity index 100%
rename from src/ColorButton.cpp
rename to src/Gui/ColorButton.cpp
diff --git a/src/ColorButton.h b/src/Gui/ColorButton.h
similarity index 100%
rename from src/ColorButton.h
rename to src/Gui/ColorButton.h
diff --git a/src/Colors.cpp b/src/Gui/Colors.cpp
similarity index 100%
rename from src/Colors.cpp
rename to src/Gui/Colors.cpp
diff --git a/src/Colors.h b/src/Gui/Colors.h
similarity index 100%
rename from src/Colors.h
rename to src/Gui/Colors.h
diff --git a/src/CompareDateRange.cpp b/src/Gui/CompareDateRange.cpp
similarity index 100%
rename from src/CompareDateRange.cpp
rename to src/Gui/CompareDateRange.cpp
diff --git a/src/CompareDateRange.h b/src/Gui/CompareDateRange.h
similarity index 100%
rename from src/CompareDateRange.h
rename to src/Gui/CompareDateRange.h
diff --git a/src/CompareInterval.cpp b/src/Gui/CompareInterval.cpp
similarity index 100%
rename from src/CompareInterval.cpp
rename to src/Gui/CompareInterval.cpp
diff --git a/src/CompareInterval.h b/src/Gui/CompareInterval.h
similarity index 100%
rename from src/CompareInterval.h
rename to src/Gui/CompareInterval.h
diff --git a/src/ComparePane.cpp b/src/Gui/ComparePane.cpp
similarity index 100%
rename from src/ComparePane.cpp
rename to src/Gui/ComparePane.cpp
diff --git a/src/ComparePane.h b/src/Gui/ComparePane.h
similarity index 100%
rename from src/ComparePane.h
rename to src/Gui/ComparePane.h
diff --git a/src/ConfigDialog.cpp b/src/Gui/ConfigDialog.cpp
similarity index 100%
rename from src/ConfigDialog.cpp
rename to src/Gui/ConfigDialog.cpp
diff --git a/src/ConfigDialog.h b/src/Gui/ConfigDialog.h
similarity index 100%
rename from src/ConfigDialog.h
rename to src/Gui/ConfigDialog.h
diff --git a/src/DiarySidebar.cpp b/src/Gui/DiarySidebar.cpp
similarity index 100%
rename from src/DiarySidebar.cpp
rename to src/Gui/DiarySidebar.cpp
diff --git a/src/DiarySidebar.h b/src/Gui/DiarySidebar.h
similarity index 100%
rename from src/DiarySidebar.h
rename to src/Gui/DiarySidebar.h
diff --git a/src/DragBar.cpp b/src/Gui/DragBar.cpp
similarity index 100%
rename from src/DragBar.cpp
rename to src/Gui/DragBar.cpp
diff --git a/src/DragBar.h b/src/Gui/DragBar.h
similarity index 100%
rename from src/DragBar.h
rename to src/Gui/DragBar.h
diff --git a/src/GProgressDialog.cpp b/src/Gui/GProgressDialog.cpp
similarity index 100%
rename from src/GProgressDialog.cpp
rename to src/Gui/GProgressDialog.cpp
diff --git a/src/GProgressDialog.h b/src/Gui/GProgressDialog.h
similarity index 100%
rename from src/GProgressDialog.h
rename to src/Gui/GProgressDialog.h
diff --git a/src/GcCrashDialog.cpp b/src/Gui/GcCrashDialog.cpp
similarity index 100%
rename from src/GcCrashDialog.cpp
rename to src/Gui/GcCrashDialog.cpp
diff --git a/src/GcCrashDialog.h b/src/Gui/GcCrashDialog.h
similarity index 100%
rename from src/GcCrashDialog.h
rename to src/Gui/GcCrashDialog.h
diff --git a/src/GcScopeBar.cpp b/src/Gui/GcScopeBar.cpp
similarity index 100%
rename from src/GcScopeBar.cpp
rename to src/Gui/GcScopeBar.cpp
diff --git a/src/GcScopeBar.h b/src/Gui/GcScopeBar.h
similarity index 100%
rename from src/GcScopeBar.h
rename to src/Gui/GcScopeBar.h
diff --git a/src/GcSideBarItem.cpp b/src/Gui/GcSideBarItem.cpp
similarity index 100%
rename from src/GcSideBarItem.cpp
rename to src/Gui/GcSideBarItem.cpp
diff --git a/src/GcSideBarItem.h b/src/Gui/GcSideBarItem.h
similarity index 100%
rename from src/GcSideBarItem.h
rename to src/Gui/GcSideBarItem.h
diff --git a/src/GcToolBar.cpp b/src/Gui/GcToolBar.cpp
similarity index 100%
rename from src/GcToolBar.cpp
rename to src/Gui/GcToolBar.cpp
diff --git a/src/GcToolBar.h b/src/Gui/GcToolBar.h
similarity index 100%
rename from src/GcToolBar.h
rename to src/Gui/GcToolBar.h
diff --git a/src/GcWindowLayout.cpp b/src/Gui/GcWindowLayout.cpp
similarity index 100%
rename from src/GcWindowLayout.cpp
rename to src/Gui/GcWindowLayout.cpp
diff --git a/src/GcWindowLayout.h b/src/Gui/GcWindowLayout.h
similarity index 100%
rename from src/GcWindowLayout.h
rename to src/Gui/GcWindowLayout.h
diff --git a/src/GcWindowRegistry.cpp b/src/Gui/GcWindowRegistry.cpp
similarity index 100%
rename from src/GcWindowRegistry.cpp
rename to src/Gui/GcWindowRegistry.cpp
diff --git a/src/GcWindowRegistry.h b/src/Gui/GcWindowRegistry.h
similarity index 100%
rename from src/GcWindowRegistry.h
rename to src/Gui/GcWindowRegistry.h
diff --git a/src/GenerateHeatMapDialog.cpp b/src/Gui/GenerateHeatMapDialog.cpp
similarity index 100%
rename from src/GenerateHeatMapDialog.cpp
rename to src/Gui/GenerateHeatMapDialog.cpp
diff --git a/src/GenerateHeatMapDialog.h b/src/Gui/GenerateHeatMapDialog.h
similarity index 100%
rename from src/GenerateHeatMapDialog.h
rename to src/Gui/GenerateHeatMapDialog.h
diff --git a/src/HelpWhatsThis.cpp b/src/Gui/HelpWhatsThis.cpp
similarity index 100%
rename from src/HelpWhatsThis.cpp
rename to src/Gui/HelpWhatsThis.cpp
diff --git a/src/HelpWhatsThis.h b/src/Gui/HelpWhatsThis.h
similarity index 100%
rename from src/HelpWhatsThis.h
rename to src/Gui/HelpWhatsThis.h
diff --git a/src/HelpWindow.cpp b/src/Gui/HelpWindow.cpp
similarity index 100%
rename from src/HelpWindow.cpp
rename to src/Gui/HelpWindow.cpp
diff --git a/src/HelpWindow.h b/src/Gui/HelpWindow.h
similarity index 100%
rename from src/HelpWindow.h
rename to src/Gui/HelpWindow.h
diff --git a/src/IntervalTreeView.cpp b/src/Gui/IntervalTreeView.cpp
similarity index 100%
rename from src/IntervalTreeView.cpp
rename to src/Gui/IntervalTreeView.cpp
diff --git a/src/IntervalTreeView.h b/src/Gui/IntervalTreeView.h
similarity index 100%
rename from src/IntervalTreeView.h
rename to src/Gui/IntervalTreeView.h
diff --git a/src/MainWindow.cpp b/src/Gui/MainWindow.cpp
similarity index 100%
rename from src/MainWindow.cpp
rename to src/Gui/MainWindow.cpp
diff --git a/src/MainWindow.h b/src/Gui/MainWindow.h
similarity index 100%
rename from src/MainWindow.h
rename to src/Gui/MainWindow.h
diff --git a/src/NewCyclistDialog.cpp b/src/Gui/NewCyclistDialog.cpp
similarity index 100%
rename from src/NewCyclistDialog.cpp
rename to src/Gui/NewCyclistDialog.cpp
diff --git a/src/NewCyclistDialog.h b/src/Gui/NewCyclistDialog.h
similarity index 100%
rename from src/NewCyclistDialog.h
rename to src/Gui/NewCyclistDialog.h
diff --git a/src/Pages.cpp b/src/Gui/Pages.cpp
similarity index 100%
rename from src/Pages.cpp
rename to src/Gui/Pages.cpp
diff --git a/src/Pages.h b/src/Gui/Pages.h
similarity index 100%
rename from src/Pages.h
rename to src/Gui/Pages.h
diff --git a/src/QTFullScreen.cpp b/src/Gui/QTFullScreen.cpp
similarity index 100%
rename from src/QTFullScreen.cpp
rename to src/Gui/QTFullScreen.cpp
diff --git a/src/QTFullScreen.h b/src/Gui/QTFullScreen.h
similarity index 100%
rename from src/QTFullScreen.h
rename to src/Gui/QTFullScreen.h
diff --git a/src/QtMacButton.h b/src/Gui/QtMacButton.h
similarity index 100%
rename from src/QtMacButton.h
rename to src/Gui/QtMacButton.h
diff --git a/src/QtMacButton.mm b/src/Gui/QtMacButton.mm
similarity index 100%
rename from src/QtMacButton.mm
rename to src/Gui/QtMacButton.mm
diff --git a/src/QtMacSegmentedButton.h b/src/Gui/QtMacSegmentedButton.h
similarity index 100%
rename from src/QtMacSegmentedButton.h
rename to src/Gui/QtMacSegmentedButton.h
diff --git a/src/QtMacSegmentedButton.mm b/src/Gui/QtMacSegmentedButton.mm
similarity index 100%
rename from src/QtMacSegmentedButton.mm
rename to src/Gui/QtMacSegmentedButton.mm
diff --git a/src/QtMacVideoWindow.mm b/src/Gui/QtMacVideoWindow.mm
similarity index 100%
rename from src/QtMacVideoWindow.mm
rename to src/Gui/QtMacVideoWindow.mm
diff --git a/src/RideNavigator.cpp b/src/Gui/RideNavigator.cpp
similarity index 100%
rename from src/RideNavigator.cpp
rename to src/Gui/RideNavigator.cpp
diff --git a/src/RideNavigator.h b/src/Gui/RideNavigator.h
similarity index 100%
rename from src/RideNavigator.h
rename to src/Gui/RideNavigator.h
diff --git a/src/RideNavigatorProxy.h b/src/Gui/RideNavigatorProxy.h
similarity index 100%
rename from src/RideNavigatorProxy.h
rename to src/Gui/RideNavigatorProxy.h
diff --git a/src/SaveDialogs.cpp b/src/Gui/SaveDialogs.cpp
similarity index 100%
rename from src/SaveDialogs.cpp
rename to src/Gui/SaveDialogs.cpp
diff --git a/src/SaveDialogs.h b/src/Gui/SaveDialogs.h
similarity index 100%
rename from src/SaveDialogs.h
rename to src/Gui/SaveDialogs.h
diff --git a/src/SearchBox.cpp b/src/Gui/SearchBox.cpp
similarity index 100%
rename from src/SearchBox.cpp
rename to src/Gui/SearchBox.cpp
diff --git a/src/SearchBox.h b/src/Gui/SearchBox.h
similarity index 100%
rename from src/SearchBox.h
rename to src/Gui/SearchBox.h
diff --git a/src/SearchFilterBox.cpp b/src/Gui/SearchFilterBox.cpp
similarity index 100%
rename from src/SearchFilterBox.cpp
rename to src/Gui/SearchFilterBox.cpp
diff --git a/src/SearchFilterBox.h b/src/Gui/SearchFilterBox.h
similarity index 100%
rename from src/SearchFilterBox.h
rename to src/Gui/SearchFilterBox.h
diff --git a/src/Tab.cpp b/src/Gui/Tab.cpp
similarity index 100%
rename from src/Tab.cpp
rename to src/Gui/Tab.cpp
diff --git a/src/Tab.h b/src/Gui/Tab.h
similarity index 100%
rename from src/Tab.h
rename to src/Gui/Tab.h
diff --git a/src/TabView.cpp b/src/Gui/TabView.cpp
similarity index 100%
rename from src/TabView.cpp
rename to src/Gui/TabView.cpp
diff --git a/src/TabView.h b/src/Gui/TabView.h
similarity index 100%
rename from src/TabView.h
rename to src/Gui/TabView.h
diff --git a/src/ToolsDialog.cpp b/src/Gui/ToolsDialog.cpp
similarity index 100%
rename from src/ToolsDialog.cpp
rename to src/Gui/ToolsDialog.cpp
diff --git a/src/ToolsDialog.h b/src/Gui/ToolsDialog.h
similarity index 100%
rename from src/ToolsDialog.h
rename to src/Gui/ToolsDialog.h
diff --git a/src/ToolsRhoEstimator.cpp b/src/Gui/ToolsRhoEstimator.cpp
similarity index 100%
rename from src/ToolsRhoEstimator.cpp
rename to src/Gui/ToolsRhoEstimator.cpp
diff --git a/src/ToolsRhoEstimator.h b/src/Gui/ToolsRhoEstimator.h
similarity index 100%
rename from src/ToolsRhoEstimator.h
rename to src/Gui/ToolsRhoEstimator.h
diff --git a/src/Views.cpp b/src/Gui/Views.cpp
similarity index 100%
rename from src/Views.cpp
rename to src/Gui/Views.cpp
diff --git a/src/Views.h b/src/Gui/Views.h
similarity index 100%
rename from src/Views.h
rename to src/Gui/Views.h
diff --git a/src/AerobicDecoupling.cpp b/src/Metrics/AerobicDecoupling.cpp
similarity index 100%
rename from src/AerobicDecoupling.cpp
rename to src/Metrics/AerobicDecoupling.cpp
diff --git a/src/BasicRideMetrics.cpp b/src/Metrics/BasicRideMetrics.cpp
similarity index 100%
rename from src/BasicRideMetrics.cpp
rename to src/Metrics/BasicRideMetrics.cpp
diff --git a/src/BestIntervalDialog.cpp b/src/Metrics/BestIntervalDialog.cpp
similarity index 100%
rename from src/BestIntervalDialog.cpp
rename to src/Metrics/BestIntervalDialog.cpp
diff --git a/src/BestIntervalDialog.h b/src/Metrics/BestIntervalDialog.h
similarity index 100%
rename from src/BestIntervalDialog.h
rename to src/Metrics/BestIntervalDialog.h
diff --git a/src/BikeScore.cpp b/src/Metrics/BikeScore.cpp
similarity index 100%
rename from src/BikeScore.cpp
rename to src/Metrics/BikeScore.cpp
diff --git a/src/Coggan.cpp b/src/Metrics/Coggan.cpp
similarity index 100%
rename from src/Coggan.cpp
rename to src/Metrics/Coggan.cpp
diff --git a/src/DanielsPoints.cpp b/src/Metrics/DanielsPoints.cpp
similarity index 100%
rename from src/DanielsPoints.cpp
rename to src/Metrics/DanielsPoints.cpp
diff --git a/src/EditUserMetricDialog.cpp b/src/Metrics/EditUserMetricDialog.cpp
similarity index 100%
rename from src/EditUserMetricDialog.cpp
rename to src/Metrics/EditUserMetricDialog.cpp
diff --git a/src/ExtendedCriticalPower.cpp b/src/Metrics/ExtendedCriticalPower.cpp
similarity index 100%
rename from src/ExtendedCriticalPower.cpp
rename to src/Metrics/ExtendedCriticalPower.cpp
diff --git a/src/ExtendedCriticalPower.h b/src/Metrics/ExtendedCriticalPower.h
similarity index 100%
rename from src/ExtendedCriticalPower.h
rename to src/Metrics/ExtendedCriticalPower.h
diff --git a/src/GOVSS.cpp b/src/Metrics/GOVSS.cpp
similarity index 100%
rename from src/GOVSS.cpp
rename to src/Metrics/GOVSS.cpp
diff --git a/src/HrTimeInZone.cpp b/src/Metrics/HrTimeInZone.cpp
similarity index 100%
rename from src/HrTimeInZone.cpp
rename to src/Metrics/HrTimeInZone.cpp
diff --git a/src/HrZones.cpp b/src/Metrics/HrZones.cpp
similarity index 100%
rename from src/HrZones.cpp
rename to src/Metrics/HrZones.cpp
diff --git a/src/HrZones.h b/src/Metrics/HrZones.h
similarity index 100%
rename from src/HrZones.h
rename to src/Metrics/HrZones.h
diff --git a/src/LeftRightBalance.cpp b/src/Metrics/LeftRightBalance.cpp
similarity index 100%
rename from src/LeftRightBalance.cpp
rename to src/Metrics/LeftRightBalance.cpp
diff --git a/src/PDModel.cpp b/src/Metrics/PDModel.cpp
similarity index 100%
rename from src/PDModel.cpp
rename to src/Metrics/PDModel.cpp
diff --git a/src/PDModel.h b/src/Metrics/PDModel.h
similarity index 100%
rename from src/PDModel.h
rename to src/Metrics/PDModel.h
diff --git a/src/PMCData.cpp b/src/Metrics/PMCData.cpp
similarity index 100%
rename from src/PMCData.cpp
rename to src/Metrics/PMCData.cpp
diff --git a/src/PMCData.h b/src/Metrics/PMCData.h
similarity index 100%
rename from src/PMCData.h
rename to src/Metrics/PMCData.h
diff --git a/src/PaceTimeInZone.cpp b/src/Metrics/PaceTimeInZone.cpp
similarity index 100%
rename from src/PaceTimeInZone.cpp
rename to src/Metrics/PaceTimeInZone.cpp
diff --git a/src/PaceZones.cpp b/src/Metrics/PaceZones.cpp
similarity index 100%
rename from src/PaceZones.cpp
rename to src/Metrics/PaceZones.cpp
diff --git a/src/PaceZones.h b/src/Metrics/PaceZones.h
similarity index 100%
rename from src/PaceZones.h
rename to src/Metrics/PaceZones.h
diff --git a/src/PeakPace.cpp b/src/Metrics/PeakPace.cpp
similarity index 100%
rename from src/PeakPace.cpp
rename to src/Metrics/PeakPace.cpp
diff --git a/src/PeakPower.cpp b/src/Metrics/PeakPower.cpp
similarity index 100%
rename from src/PeakPower.cpp
rename to src/Metrics/PeakPower.cpp
diff --git a/src/RideMetadata.cpp b/src/Metrics/RideMetadata.cpp
similarity index 100%
rename from src/RideMetadata.cpp
rename to src/Metrics/RideMetadata.cpp
diff --git a/src/RideMetadata.h b/src/Metrics/RideMetadata.h
similarity index 100%
rename from src/RideMetadata.h
rename to src/Metrics/RideMetadata.h
diff --git a/src/RideMetric.cpp b/src/Metrics/RideMetric.cpp
similarity index 100%
rename from src/RideMetric.cpp
rename to src/Metrics/RideMetric.cpp
diff --git a/src/RideMetric.h b/src/Metrics/RideMetric.h
similarity index 100%
rename from src/RideMetric.h
rename to src/Metrics/RideMetric.h
diff --git a/src/SpecialFields.cpp b/src/Metrics/SpecialFields.cpp
similarity index 100%
rename from src/SpecialFields.cpp
rename to src/Metrics/SpecialFields.cpp
diff --git a/src/SpecialFields.h b/src/Metrics/SpecialFields.h
similarity index 100%
rename from src/SpecialFields.h
rename to src/Metrics/SpecialFields.h
diff --git a/src/Statistic.cpp b/src/Metrics/Statistic.cpp
similarity index 100%
rename from src/Statistic.cpp
rename to src/Metrics/Statistic.cpp
diff --git a/src/Statistic.h b/src/Metrics/Statistic.h
similarity index 100%
rename from src/Statistic.h
rename to src/Metrics/Statistic.h
diff --git a/src/SustainMetric.cpp b/src/Metrics/SustainMetric.cpp
similarity index 100%
rename from src/SustainMetric.cpp
rename to src/Metrics/SustainMetric.cpp
diff --git a/src/SwimScore.cpp b/src/Metrics/SwimScore.cpp
similarity index 100%
rename from src/SwimScore.cpp
rename to src/Metrics/SwimScore.cpp
diff --git a/src/TRIMPPoints.cpp b/src/Metrics/TRIMPPoints.cpp
similarity index 100%
rename from src/TRIMPPoints.cpp
rename to src/Metrics/TRIMPPoints.cpp
diff --git a/src/TimeInZone.cpp b/src/Metrics/TimeInZone.cpp
similarity index 100%
rename from src/TimeInZone.cpp
rename to src/Metrics/TimeInZone.cpp
diff --git a/src/UserMetric.cpp b/src/Metrics/UserMetric.cpp
similarity index 100%
rename from src/UserMetric.cpp
rename to src/Metrics/UserMetric.cpp
diff --git a/src/UserMetricParser.cpp b/src/Metrics/UserMetricParser.cpp
similarity index 100%
rename from src/UserMetricParser.cpp
rename to src/Metrics/UserMetricParser.cpp
diff --git a/src/UserMetricParser.h b/src/Metrics/UserMetricParser.h
similarity index 100%
rename from src/UserMetricParser.h
rename to src/Metrics/UserMetricParser.h
diff --git a/src/UserMetricSettings.h b/src/Metrics/UserMetricSettings.h
similarity index 100%
rename from src/UserMetricSettings.h
rename to src/Metrics/UserMetricSettings.h
diff --git a/src/VDOT.cpp b/src/Metrics/VDOT.cpp
similarity index 100%
rename from src/VDOT.cpp
rename to src/Metrics/VDOT.cpp
diff --git a/src/VDOTCalculator.cpp b/src/Metrics/VDOTCalculator.cpp
similarity index 100%
rename from src/VDOTCalculator.cpp
rename to src/Metrics/VDOTCalculator.cpp
diff --git a/src/VDOTCalculator.h b/src/Metrics/VDOTCalculator.h
similarity index 100%
rename from src/VDOTCalculator.h
rename to src/Metrics/VDOTCalculator.h
diff --git a/src/WPrime.cpp b/src/Metrics/WPrime.cpp
similarity index 100%
rename from src/WPrime.cpp
rename to src/Metrics/WPrime.cpp
diff --git a/src/WPrime.h b/src/Metrics/WPrime.h
similarity index 100%
rename from src/WPrime.h
rename to src/Metrics/WPrime.h
diff --git a/src/WattsPerKilogram.cpp b/src/Metrics/WattsPerKilogram.cpp
similarity index 100%
rename from src/WattsPerKilogram.cpp
rename to src/Metrics/WattsPerKilogram.cpp
diff --git a/src/Zones.cpp b/src/Metrics/Zones.cpp
similarity index 100%
rename from src/Zones.cpp
rename to src/Metrics/Zones.cpp
diff --git a/src/Zones.h b/src/Metrics/Zones.h
similarity index 100%
rename from src/Zones.h
rename to src/Metrics/Zones.h
diff --git a/src/aBikeScore.cpp b/src/Metrics/aBikeScore.cpp
similarity index 100%
rename from src/aBikeScore.cpp
rename to src/Metrics/aBikeScore.cpp
diff --git a/src/aCoggan.cpp b/src/Metrics/aCoggan.cpp
similarity index 100%
rename from src/aCoggan.cpp
rename to src/Metrics/aCoggan.cpp
diff --git a/src/RideWindow.qrc b/src/Resources/RideWindow.qrc
similarity index 100%
rename from src/RideWindow.qrc
rename to src/Resources/RideWindow.qrc
diff --git a/src/application.qrc b/src/Resources/application.qrc
similarity index 99%
rename from src/application.qrc
rename to src/Resources/application.qrc
index 500b320f2..d566f7b47 100644
--- a/src/application.qrc
+++ b/src/Resources/application.qrc
@@ -1,6 +1,6 @@
 <RCC>
     <qresource prefix="/">
-        <file>gcconfig.pri</file>
+        <file>../gcconfig.pri</file>
         <file>webservice/httpserver.ini</file>
         <file>images/devices/garminusb.png</file>
         <file>images/devices/computrainer.png</file>
diff --git a/src/html/ltm-summary.html b/src/Resources/html/ltm-summary.html
similarity index 100%
rename from src/html/ltm-summary.html
rename to src/Resources/html/ltm-summary.html
diff --git a/src/images/IconAltitude.png b/src/Resources/images/IconAltitude.png
similarity index 100%
rename from src/images/IconAltitude.png
rename to src/Resources/images/IconAltitude.png
diff --git a/src/images/IconBike.png b/src/Resources/images/IconBike.png
similarity index 100%
rename from src/images/IconBike.png
rename to src/Resources/images/IconBike.png
diff --git a/src/images/IconCadence.png b/src/Resources/images/IconCadence.png
similarity index 100%
rename from src/images/IconCadence.png
rename to src/Resources/images/IconCadence.png
diff --git a/src/images/IconGPS.png b/src/Resources/images/IconGPS.png
similarity index 100%
rename from src/images/IconGPS.png
rename to src/Resources/images/IconGPS.png
diff --git a/src/images/IconHR.png b/src/Resources/images/IconHR.png
similarity index 100%
rename from src/images/IconHR.png
rename to src/Resources/images/IconHR.png
diff --git a/src/images/IconPower.png b/src/Resources/images/IconPower.png
similarity index 100%
rename from src/images/IconPower.png
rename to src/Resources/images/IconPower.png
diff --git a/src/images/IconRun.png b/src/Resources/images/IconRun.png
similarity index 100%
rename from src/images/IconRun.png
rename to src/Resources/images/IconRun.png
diff --git a/src/images/IconSpeed.png b/src/Resources/images/IconSpeed.png
similarity index 100%
rename from src/images/IconSpeed.png
rename to src/Resources/images/IconSpeed.png
diff --git a/src/images/IconSwim.png b/src/Resources/images/IconSwim.png
similarity index 100%
rename from src/images/IconSwim.png
rename to src/Resources/images/IconSwim.png
diff --git a/src/images/IconTemp.png b/src/Resources/images/IconTemp.png
similarity index 100%
rename from src/images/IconTemp.png
rename to src/Resources/images/IconTemp.png
diff --git a/src/images/IconTorque.png b/src/Resources/images/IconTorque.png
similarity index 100%
rename from src/images/IconTorque.png
rename to src/Resources/images/IconTorque.png
diff --git a/src/images/IconWind.png b/src/Resources/images/IconWind.png
similarity index 100%
rename from src/images/IconWind.png
rename to src/Resources/images/IconWind.png
diff --git a/src/images/activity.png b/src/Resources/images/activity.png
similarity index 100%
rename from src/images/activity.png
rename to src/Resources/images/activity.png
diff --git a/src/images/addchart.png b/src/Resources/images/addchart.png
similarity index 100%
rename from src/images/addchart.png
rename to src/Resources/images/addchart.png
diff --git a/src/images/aluBar.png b/src/Resources/images/aluBar.png
similarity index 100%
rename from src/images/aluBar.png
rename to src/Resources/images/aluBar.png
diff --git a/src/images/aluBarDark.png b/src/Resources/images/aluBarDark.png
similarity index 100%
rename from src/images/aluBarDark.png
rename to src/Resources/images/aluBarDark.png
diff --git a/src/images/aluLight.jpg b/src/Resources/images/aluLight.jpg
similarity index 100%
rename from src/images/aluLight.jpg
rename to src/Resources/images/aluLight.jpg
diff --git a/src/images/aluToolBar.png b/src/Resources/images/aluToolBar.png
similarity index 100%
rename from src/images/aluToolBar.png
rename to src/Resources/images/aluToolBar.png
diff --git a/src/images/analysis.png b/src/Resources/images/analysis.png
similarity index 100%
rename from src/images/analysis.png
rename to src/Resources/images/analysis.png
diff --git a/src/images/arduino.png b/src/Resources/images/arduino.png
similarity index 100%
rename from src/images/arduino.png
rename to src/Resources/images/arduino.png
diff --git a/src/images/carbon.jpg b/src/Resources/images/carbon.jpg
similarity index 100%
rename from src/images/carbon.jpg
rename to src/Resources/images/carbon.jpg
diff --git a/src/images/cheetah.png b/src/Resources/images/cheetah.png
similarity index 100%
rename from src/images/cheetah.png
rename to src/Resources/images/cheetah.png
diff --git a/src/images/config.png b/src/Resources/images/config.png
similarity index 100%
rename from src/images/config.png
rename to src/Resources/images/config.png
diff --git a/src/images/cyclist.png b/src/Resources/images/cyclist.png
similarity index 100%
rename from src/images/cyclist.png
rename to src/Resources/images/cyclist.png
diff --git a/src/images/dark.jpg b/src/Resources/images/dark.jpg
similarity index 100%
rename from src/images/dark.jpg
rename to src/Resources/images/dark.jpg
diff --git a/src/images/devices/btle.png b/src/Resources/images/devices/btle.png
similarity index 100%
rename from src/images/devices/btle.png
rename to src/Resources/images/devices/btle.png
diff --git a/src/images/devices/computrainer.png b/src/Resources/images/devices/computrainer.png
similarity index 100%
rename from src/images/devices/computrainer.png
rename to src/Resources/images/devices/computrainer.png
diff --git a/src/images/devices/fortius.png b/src/Resources/images/devices/fortius.png
similarity index 100%
rename from src/images/devices/fortius.png
rename to src/Resources/images/devices/fortius.png
diff --git a/src/images/devices/garminusb.png b/src/Resources/images/devices/garminusb.png
similarity index 100%
rename from src/images/devices/garminusb.png
rename to src/Resources/images/devices/garminusb.png
diff --git a/src/images/devices/kickr.png b/src/Resources/images/devices/kickr.png
similarity index 100%
rename from src/images/devices/kickr.png
rename to src/Resources/images/devices/kickr.png
diff --git a/src/images/devices/monark_lt2.png b/src/Resources/images/devices/monark_lt2.png
similarity index 100%
rename from src/images/devices/monark_lt2.png
rename to src/Resources/images/devices/monark_lt2.png
diff --git a/src/images/devices/quarqd.png b/src/Resources/images/devices/quarqd.png
similarity index 100%
rename from src/images/devices/quarqd.png
rename to src/Resources/images/devices/quarqd.png
diff --git a/src/images/diary.png b/src/Resources/images/diary.png
similarity index 100%
rename from src/images/diary.png
rename to src/Resources/images/diary.png
diff --git a/src/images/gc-blank.png b/src/Resources/images/gc-blank.png
similarity index 100%
rename from src/images/gc-blank.png
rename to src/Resources/images/gc-blank.png
diff --git a/src/images/gc.icns b/src/Resources/images/gc.icns
similarity index 100%
rename from src/images/gc.icns
rename to src/Resources/images/gc.icns
diff --git a/src/images/gc.ico b/src/Resources/images/gc.ico
similarity index 100%
rename from src/images/gc.ico
rename to src/Resources/images/gc.ico
diff --git a/src/images/gc.png b/src/Resources/images/gc.png
similarity index 100%
rename from src/images/gc.png
rename to src/Resources/images/gc.png
diff --git a/src/images/home.png b/src/Resources/images/home.png
similarity index 100%
rename from src/images/home.png
rename to src/Resources/images/home.png
diff --git a/src/images/imetrics.png b/src/Resources/images/imetrics.png
similarity index 100%
rename from src/images/imetrics.png
rename to src/Resources/images/imetrics.png
diff --git a/src/images/library.png b/src/Resources/images/library.png
similarity index 100%
rename from src/images/library.png
rename to src/Resources/images/library.png
diff --git a/src/images/mac/compose.png b/src/Resources/images/mac/compose.png
similarity index 100%
rename from src/images/mac/compose.png
rename to src/Resources/images/mac/compose.png
diff --git a/src/images/mac/download.png b/src/Resources/images/mac/download.png
similarity index 100%
rename from src/images/mac/download.png
rename to src/Resources/images/mac/download.png
diff --git a/src/images/mac/hide.png b/src/Resources/images/mac/hide.png
similarity index 100%
rename from src/images/mac/hide.png
rename to src/Resources/images/mac/hide.png
diff --git a/src/images/mac/left.png b/src/Resources/images/mac/left.png
similarity index 100%
rename from src/images/mac/left.png
rename to src/Resources/images/mac/left.png
diff --git a/src/images/mac/lowbar.png b/src/Resources/images/mac/lowbar.png
similarity index 100%
rename from src/images/mac/lowbar.png
rename to src/Resources/images/mac/lowbar.png
diff --git a/src/images/mac/right.png b/src/Resources/images/mac/right.png
similarity index 100%
rename from src/images/mac/right.png
rename to src/Resources/images/mac/right.png
diff --git a/src/images/mac/scope-active.png b/src/Resources/images/mac/scope-active.png
similarity index 100%
rename from src/images/mac/scope-active.png
rename to src/Resources/images/mac/scope-active.png
diff --git a/src/images/mac/scope-inactive.png b/src/Resources/images/mac/scope-inactive.png
similarity index 100%
rename from src/images/mac/scope-inactive.png
rename to src/Resources/images/mac/scope-inactive.png
diff --git a/src/images/mac/share.png b/src/Resources/images/mac/share.png
similarity index 100%
rename from src/images/mac/share.png
rename to src/Resources/images/mac/share.png
diff --git a/src/images/mac/show.png b/src/Resources/images/mac/show.png
similarity index 100%
rename from src/images/mac/show.png
rename to src/Resources/images/mac/show.png
diff --git a/src/images/mac/sidebar.png b/src/Resources/images/mac/sidebar.png
similarity index 100%
rename from src/images/mac/sidebar.png
rename to src/Resources/images/mac/sidebar.png
diff --git a/src/images/mac/split.png b/src/Resources/images/mac/split.png
similarity index 100%
rename from src/images/mac/split.png
rename to src/Resources/images/mac/split.png
diff --git a/src/images/mac/stop.png b/src/Resources/images/mac/stop.png
similarity index 100%
rename from src/images/mac/stop.png
rename to src/Resources/images/mac/stop.png
diff --git a/src/images/mac/tabbed.png b/src/Resources/images/mac/tabbed.png
similarity index 100%
rename from src/images/mac/tabbed.png
rename to src/Resources/images/mac/tabbed.png
diff --git a/src/images/mac/tiled.png b/src/Resources/images/mac/tiled.png
similarity index 100%
rename from src/images/mac/tiled.png
rename to src/Resources/images/mac/tiled.png
diff --git a/src/images/mac/trash.png b/src/Resources/images/mac/trash.png
similarity index 100%
rename from src/images/mac/trash.png
rename to src/Resources/images/mac/trash.png
diff --git a/src/images/mac/undo.png b/src/Resources/images/mac/undo.png
similarity index 100%
rename from src/images/mac/undo.png
rename to src/Resources/images/mac/undo.png
diff --git a/src/images/maps/cycling.png b/src/Resources/images/maps/cycling.png
similarity index 100%
rename from src/images/maps/cycling.png
rename to src/Resources/images/maps/cycling.png
diff --git a/src/images/maps/cycling_feed.png b/src/Resources/images/maps/cycling_feed.png
similarity index 100%
rename from src/images/maps/cycling_feed.png
rename to src/Resources/images/maps/cycling_feed.png
diff --git a/src/images/maps/cycling_sprint.png b/src/Resources/images/maps/cycling_sprint.png
similarity index 100%
rename from src/images/maps/cycling_sprint.png
rename to src/Resources/images/maps/cycling_sprint.png
diff --git a/src/images/maps/finish.png b/src/Resources/images/maps/finish.png
similarity index 100%
rename from src/images/maps/finish.png
rename to src/Resources/images/maps/finish.png
diff --git a/src/images/maps/loop.png b/src/Resources/images/maps/loop.png
similarity index 100%
rename from src/images/maps/loop.png
rename to src/Resources/images/maps/loop.png
diff --git a/src/images/metadata.png b/src/Resources/images/metadata.png
similarity index 100%
rename from src/images/metadata.png
rename to src/Resources/images/metadata.png
diff --git a/src/images/noavatar.png b/src/Resources/images/noavatar.png
similarity index 100%
rename from src/images/noavatar.png
rename to src/Resources/images/noavatar.png
diff --git a/src/images/oxygen/back.png b/src/Resources/images/oxygen/back.png
similarity index 100%
rename from src/images/oxygen/back.png
rename to src/Resources/images/oxygen/back.png
diff --git a/src/images/oxygen/down-arrow-bw.png b/src/Resources/images/oxygen/down-arrow-bw.png
similarity index 100%
rename from src/images/oxygen/down-arrow-bw.png
rename to src/Resources/images/oxygen/down-arrow-bw.png
diff --git a/src/images/oxygen/equalizer.png b/src/Resources/images/oxygen/equalizer.png
similarity index 100%
rename from src/images/oxygen/equalizer.png
rename to src/Resources/images/oxygen/equalizer.png
diff --git a/src/images/oxygen/ffwd.png b/src/Resources/images/oxygen/ffwd.png
similarity index 100%
rename from src/images/oxygen/ffwd.png
rename to src/Resources/images/oxygen/ffwd.png
diff --git a/src/images/oxygen/fwd.png b/src/Resources/images/oxygen/fwd.png
similarity index 100%
rename from src/images/oxygen/fwd.png
rename to src/Resources/images/oxygen/fwd.png
diff --git a/src/images/oxygen/lap.png b/src/Resources/images/oxygen/lap.png
similarity index 100%
rename from src/images/oxygen/lap.png
rename to src/Resources/images/oxygen/lap.png
diff --git a/src/images/oxygen/open.png b/src/Resources/images/oxygen/open.png
similarity index 100%
rename from src/images/oxygen/open.png
rename to src/Resources/images/oxygen/open.png
diff --git a/src/images/oxygen/pause.png b/src/Resources/images/oxygen/pause.png
similarity index 100%
rename from src/images/oxygen/pause.png
rename to src/Resources/images/oxygen/pause.png
diff --git a/src/images/oxygen/play.png b/src/Resources/images/oxygen/play.png
similarity index 100%
rename from src/images/oxygen/play.png
rename to src/Resources/images/oxygen/play.png
diff --git a/src/images/oxygen/power-off.png b/src/Resources/images/oxygen/power-off.png
similarity index 100%
rename from src/images/oxygen/power-off.png
rename to src/Resources/images/oxygen/power-off.png
diff --git a/src/images/oxygen/power-on.png b/src/Resources/images/oxygen/power-on.png
similarity index 100%
rename from src/images/oxygen/power-on.png
rename to src/Resources/images/oxygen/power-on.png
diff --git a/src/images/oxygen/rewind.png b/src/Resources/images/oxygen/rewind.png
similarity index 100%
rename from src/images/oxygen/rewind.png
rename to src/Resources/images/oxygen/rewind.png
diff --git a/src/images/oxygen/save.png b/src/Resources/images/oxygen/save.png
similarity index 100%
rename from src/images/oxygen/save.png
rename to src/Resources/images/oxygen/save.png
diff --git a/src/images/oxygen/stop.png b/src/Resources/images/oxygen/stop.png
similarity index 100%
rename from src/images/oxygen/stop.png
rename to src/Resources/images/oxygen/stop.png
diff --git a/src/images/oxygen/up-arrow-bw.png b/src/Resources/images/oxygen/up-arrow-bw.png
similarity index 100%
rename from src/images/oxygen/up-arrow-bw.png
rename to src/Resources/images/oxygen/up-arrow-bw.png
diff --git a/src/images/power.png b/src/Resources/images/power.png
similarity index 100%
rename from src/images/power.png
rename to src/Resources/images/power.png
diff --git a/src/images/query.png b/src/Resources/images/query.png
similarity index 100%
rename from src/images/query.png
rename to src/Resources/images/query.png
diff --git a/src/images/settings.png b/src/Resources/images/settings.png
similarity index 100%
rename from src/images/settings.png
rename to src/Resources/images/settings.png
diff --git a/src/images/sidebar/bookmark.png b/src/Resources/images/sidebar/bookmark.png
similarity index 100%
rename from src/images/sidebar/bookmark.png
rename to src/Resources/images/sidebar/bookmark.png
diff --git a/src/images/sidebar/calendar.png b/src/Resources/images/sidebar/calendar.png
similarity index 100%
rename from src/images/sidebar/calendar.png
rename to src/Resources/images/sidebar/calendar.png
diff --git a/src/images/sidebar/charts.png b/src/Resources/images/sidebar/charts.png
similarity index 100%
rename from src/images/sidebar/charts.png
rename to src/Resources/images/sidebar/charts.png
diff --git a/src/images/sidebar/dashboard.png b/src/Resources/images/sidebar/dashboard.png
similarity index 100%
rename from src/images/sidebar/dashboard.png
rename to src/Resources/images/sidebar/dashboard.png
diff --git a/src/images/sidebar/extra.png b/src/Resources/images/sidebar/extra.png
similarity index 100%
rename from src/images/sidebar/extra.png
rename to src/Resources/images/sidebar/extra.png
diff --git a/src/images/sidebar/folder.png b/src/Resources/images/sidebar/folder.png
similarity index 100%
rename from src/images/sidebar/folder.png
rename to src/Resources/images/sidebar/folder.png
diff --git a/src/images/sidebar/minus.png b/src/Resources/images/sidebar/minus.png
similarity index 100%
rename from src/images/sidebar/minus.png
rename to src/Resources/images/sidebar/minus.png
diff --git a/src/images/sidebar/movie.png b/src/Resources/images/sidebar/movie.png
similarity index 100%
rename from src/images/sidebar/movie.png
rename to src/Resources/images/sidebar/movie.png
diff --git a/src/images/sidebar/plus.png b/src/Resources/images/sidebar/plus.png
similarity index 100%
rename from src/images/sidebar/plus.png
rename to src/Resources/images/sidebar/plus.png
diff --git a/src/images/sidebar/power.png b/src/Resources/images/sidebar/power.png
similarity index 100%
rename from src/images/sidebar/power.png
rename to src/Resources/images/sidebar/power.png
diff --git a/src/images/sidebar/sync.png b/src/Resources/images/sidebar/sync.png
similarity index 100%
rename from src/images/sidebar/sync.png
rename to src/Resources/images/sidebar/sync.png
diff --git a/src/images/splashscreen.png b/src/Resources/images/splashscreen.png
similarity index 100%
rename from src/images/splashscreen.png
rename to src/Resources/images/splashscreen.png
diff --git a/src/images/splashscreen.pptx b/src/Resources/images/splashscreen.pptx
similarity index 100%
rename from src/images/splashscreen.pptx
rename to src/Resources/images/splashscreen.pptx
diff --git a/src/images/stopwatch.png b/src/Resources/images/stopwatch.png
similarity index 100%
rename from src/images/stopwatch.png
rename to src/Resources/images/stopwatch.png
diff --git a/src/images/toolbar/64 bit.png b/src/Resources/images/toolbar/64 bit.png
similarity index 100%
rename from src/images/toolbar/64 bit.png
rename to src/Resources/images/toolbar/64 bit.png
diff --git a/src/images/toolbar/Computer On.png b/src/Resources/images/toolbar/Computer On.png
similarity index 100%
rename from src/images/toolbar/Computer On.png
rename to src/Resources/images/toolbar/Computer On.png
diff --git a/src/images/toolbar/Computer.png b/src/Resources/images/toolbar/Computer.png
similarity index 100%
rename from src/images/toolbar/Computer.png
rename to src/Resources/images/toolbar/Computer.png
diff --git a/src/images/toolbar/Credit card.png b/src/Resources/images/toolbar/Credit card.png
similarity index 100%
rename from src/images/toolbar/Credit card.png
rename to src/Resources/images/toolbar/Credit card.png
diff --git a/src/images/toolbar/Desktop 2.png b/src/Resources/images/toolbar/Desktop 2.png
similarity index 100%
rename from src/images/toolbar/Desktop 2.png
rename to src/Resources/images/toolbar/Desktop 2.png
diff --git a/src/images/toolbar/Disk.png b/src/Resources/images/toolbar/Disk.png
similarity index 100%
rename from src/images/toolbar/Disk.png
rename to src/Resources/images/toolbar/Disk.png
diff --git a/src/images/toolbar/GeneralPreferences.png b/src/Resources/images/toolbar/GeneralPreferences.png
similarity index 100%
rename from src/images/toolbar/GeneralPreferences.png
rename to src/Resources/images/toolbar/GeneralPreferences.png
diff --git a/src/images/toolbar/Globe.png b/src/Resources/images/toolbar/Globe.png
similarity index 100%
rename from src/images/toolbar/Globe.png
rename to src/Resources/images/toolbar/Globe.png
diff --git a/src/images/toolbar/Graphite Computer On.png b/src/Resources/images/toolbar/Graphite Computer On.png
similarity index 100%
rename from src/images/toolbar/Graphite Computer On.png
rename to src/Resources/images/toolbar/Graphite Computer On.png
diff --git a/src/images/toolbar/Graphite Desktop.png b/src/Resources/images/toolbar/Graphite Desktop.png
similarity index 100%
rename from src/images/toolbar/Graphite Desktop.png
rename to src/Resources/images/toolbar/Graphite Desktop.png
diff --git a/src/images/toolbar/Graphite Globe.png b/src/Resources/images/toolbar/Graphite Globe.png
similarity index 100%
rename from src/images/toolbar/Graphite Globe.png
rename to src/Resources/images/toolbar/Graphite Globe.png
diff --git a/src/images/toolbar/Picture Cast.png b/src/Resources/images/toolbar/Picture Cast.png
similarity index 100%
rename from src/images/toolbar/Picture Cast.png
rename to src/Resources/images/toolbar/Picture Cast.png
diff --git a/src/images/toolbar/Podcast.png b/src/Resources/images/toolbar/Podcast.png
similarity index 100%
rename from src/images/toolbar/Podcast.png
rename to src/Resources/images/toolbar/Podcast.png
diff --git a/src/images/toolbar/RSS.png b/src/Resources/images/toolbar/RSS.png
similarity index 100%
rename from src/images/toolbar/RSS.png
rename to src/Resources/images/toolbar/RSS.png
diff --git a/src/images/toolbar/RSS_alt.png b/src/Resources/images/toolbar/RSS_alt.png
similarity index 100%
rename from src/images/toolbar/RSS_alt.png
rename to src/Resources/images/toolbar/RSS_alt.png
diff --git a/src/images/toolbar/Universal.png b/src/Resources/images/toolbar/Universal.png
similarity index 100%
rename from src/images/toolbar/Universal.png
rename to src/Resources/images/toolbar/Universal.png
diff --git a/src/images/toolbar/abacus.png b/src/Resources/images/toolbar/abacus.png
similarity index 100%
rename from src/images/toolbar/abacus.png
rename to src/Resources/images/toolbar/abacus.png
diff --git a/src/images/toolbar/address books.png b/src/Resources/images/toolbar/address books.png
similarity index 100%
rename from src/images/toolbar/address books.png
rename to src/Resources/images/toolbar/address books.png
diff --git a/src/images/toolbar/advanced.png b/src/Resources/images/toolbar/advanced.png
similarity index 100%
rename from src/images/toolbar/advanced.png
rename to src/Resources/images/toolbar/advanced.png
diff --git a/src/images/toolbar/applications.png b/src/Resources/images/toolbar/applications.png
similarity index 100%
rename from src/images/toolbar/applications.png
rename to src/Resources/images/toolbar/applications.png
diff --git a/src/images/toolbar/archive.png b/src/Resources/images/toolbar/archive.png
similarity index 100%
rename from src/images/toolbar/archive.png
rename to src/Resources/images/toolbar/archive.png
diff --git a/src/images/toolbar/back_alt.png b/src/Resources/images/toolbar/back_alt.png
similarity index 100%
rename from src/images/toolbar/back_alt.png
rename to src/Resources/images/toolbar/back_alt.png
diff --git a/src/images/toolbar/burn.png b/src/Resources/images/toolbar/burn.png
similarity index 100%
rename from src/images/toolbar/burn.png
rename to src/Resources/images/toolbar/burn.png
diff --git a/src/images/toolbar/calculator.png b/src/Resources/images/toolbar/calculator.png
similarity index 100%
rename from src/images/toolbar/calculator.png
rename to src/Resources/images/toolbar/calculator.png
diff --git a/src/images/toolbar/cash.png b/src/Resources/images/toolbar/cash.png
similarity index 100%
rename from src/images/toolbar/cash.png
rename to src/Resources/images/toolbar/cash.png
diff --git a/src/images/toolbar/clear.png b/src/Resources/images/toolbar/clear.png
similarity index 100%
rename from src/images/toolbar/clear.png
rename to src/Resources/images/toolbar/clear.png
diff --git a/src/images/toolbar/close-icon.png b/src/Resources/images/toolbar/close-icon.png
similarity index 100%
rename from src/images/toolbar/close-icon.png
rename to src/Resources/images/toolbar/close-icon.png
diff --git a/src/images/toolbar/color.png b/src/Resources/images/toolbar/color.png
similarity index 100%
rename from src/images/toolbar/color.png
rename to src/Resources/images/toolbar/color.png
diff --git a/src/images/toolbar/copy doc.png b/src/Resources/images/toolbar/copy doc.png
similarity index 100%
rename from src/images/toolbar/copy doc.png
rename to src/Resources/images/toolbar/copy doc.png
diff --git a/src/images/toolbar/copy.png b/src/Resources/images/toolbar/copy.png
similarity index 100%
rename from src/images/toolbar/copy.png
rename to src/Resources/images/toolbar/copy.png
diff --git a/src/images/toolbar/cut.png b/src/Resources/images/toolbar/cut.png
similarity index 100%
rename from src/images/toolbar/cut.png
rename to src/Resources/images/toolbar/cut.png
diff --git a/src/images/toolbar/data.png b/src/Resources/images/toolbar/data.png
similarity index 100%
rename from src/images/toolbar/data.png
rename to src/Resources/images/toolbar/data.png
diff --git a/src/images/toolbar/delete archive.png b/src/Resources/images/toolbar/delete archive.png
similarity index 100%
rename from src/images/toolbar/delete archive.png
rename to src/Resources/images/toolbar/delete archive.png
diff --git a/src/images/toolbar/down_alt.png b/src/Resources/images/toolbar/down_alt.png
similarity index 100%
rename from src/images/toolbar/down_alt.png
rename to src/Resources/images/toolbar/down_alt.png
diff --git a/src/images/toolbar/edit.png b/src/Resources/images/toolbar/edit.png
similarity index 100%
rename from src/images/toolbar/edit.png
rename to src/Resources/images/toolbar/edit.png
diff --git a/src/images/toolbar/exclamation.png b/src/Resources/images/toolbar/exclamation.png
similarity index 100%
rename from src/images/toolbar/exclamation.png
rename to src/Resources/images/toolbar/exclamation.png
diff --git a/src/images/toolbar/exit.png b/src/Resources/images/toolbar/exit.png
similarity index 100%
rename from src/images/toolbar/exit.png
rename to src/Resources/images/toolbar/exit.png
diff --git a/src/images/toolbar/filter.png b/src/Resources/images/toolbar/filter.png
similarity index 100%
rename from src/images/toolbar/filter.png
rename to src/Resources/images/toolbar/filter.png
diff --git a/src/images/toolbar/filter3.png b/src/Resources/images/toolbar/filter3.png
similarity index 100%
rename from src/images/toolbar/filter3.png
rename to src/Resources/images/toolbar/filter3.png
diff --git a/src/images/toolbar/flipbutton.png b/src/Resources/images/toolbar/flipbutton.png
similarity index 100%
rename from src/images/toolbar/flipbutton.png
rename to src/Resources/images/toolbar/flipbutton.png
diff --git a/src/images/toolbar/folder.png b/src/Resources/images/toolbar/folder.png
similarity index 100%
rename from src/images/toolbar/folder.png
rename to src/Resources/images/toolbar/folder.png
diff --git a/src/images/toolbar/folder_smart.png b/src/Resources/images/toolbar/folder_smart.png
similarity index 100%
rename from src/images/toolbar/folder_smart.png
rename to src/Resources/images/toolbar/folder_smart.png
diff --git a/src/images/toolbar/forward all.png b/src/Resources/images/toolbar/forward all.png
similarity index 100%
rename from src/images/toolbar/forward all.png
rename to src/Resources/images/toolbar/forward all.png
diff --git a/src/images/toolbar/forward button white.png b/src/Resources/images/toolbar/forward button white.png
similarity index 100%
rename from src/images/toolbar/forward button white.png
rename to src/Resources/images/toolbar/forward button white.png
diff --git a/src/images/toolbar/forward button.png b/src/Resources/images/toolbar/forward button.png
similarity index 100%
rename from src/images/toolbar/forward button.png
rename to src/Resources/images/toolbar/forward button.png
diff --git a/src/images/toolbar/forward.png b/src/Resources/images/toolbar/forward.png
similarity index 100%
rename from src/images/toolbar/forward.png
rename to src/Resources/images/toolbar/forward.png
diff --git a/src/images/toolbar/forward_alt.png b/src/Resources/images/toolbar/forward_alt.png
similarity index 100%
rename from src/images/toolbar/forward_alt.png
rename to src/Resources/images/toolbar/forward_alt.png
diff --git a/src/images/toolbar/heineken.png b/src/Resources/images/toolbar/heineken.png
similarity index 100%
rename from src/images/toolbar/heineken.png
rename to src/Resources/images/toolbar/heineken.png
diff --git a/src/images/toolbar/help.png b/src/Resources/images/toolbar/help.png
similarity index 100%
rename from src/images/toolbar/help.png
rename to src/Resources/images/toolbar/help.png
diff --git a/src/images/toolbar/iChat.png b/src/Resources/images/toolbar/iChat.png
similarity index 100%
rename from src/images/toolbar/iChat.png
rename to src/Resources/images/toolbar/iChat.png
diff --git a/src/images/toolbar/iPhone.png b/src/Resources/images/toolbar/iPhone.png
similarity index 100%
rename from src/images/toolbar/iPhone.png
rename to src/Resources/images/toolbar/iPhone.png
diff --git a/src/images/toolbar/info.png b/src/Resources/images/toolbar/info.png
similarity index 100%
rename from src/images/toolbar/info.png
rename to src/Resources/images/toolbar/info.png
diff --git a/src/images/toolbar/install.png b/src/Resources/images/toolbar/install.png
similarity index 100%
rename from src/images/toolbar/install.png
rename to src/Resources/images/toolbar/install.png
diff --git a/src/images/toolbar/intel 2.png b/src/Resources/images/toolbar/intel 2.png
similarity index 100%
rename from src/images/toolbar/intel 2.png
rename to src/Resources/images/toolbar/intel 2.png
diff --git a/src/images/toolbar/intel.png b/src/Resources/images/toolbar/intel.png
similarity index 100%
rename from src/images/toolbar/intel.png
rename to src/Resources/images/toolbar/intel.png
diff --git a/src/images/toolbar/keyboard.png b/src/Resources/images/toolbar/keyboard.png
similarity index 100%
rename from src/images/toolbar/keyboard.png
rename to src/Resources/images/toolbar/keyboard.png
diff --git a/src/images/toolbar/library bookmarked.png b/src/Resources/images/toolbar/library bookmarked.png
similarity index 100%
rename from src/images/toolbar/library bookmarked.png
rename to src/Resources/images/toolbar/library bookmarked.png
diff --git a/src/images/toolbar/lock.png b/src/Resources/images/toolbar/lock.png
similarity index 100%
rename from src/images/toolbar/lock.png
rename to src/Resources/images/toolbar/lock.png
diff --git a/src/images/toolbar/main/analysis.png b/src/Resources/images/toolbar/main/analysis.png
similarity index 100%
rename from src/images/toolbar/main/analysis.png
rename to src/Resources/images/toolbar/main/analysis.png
diff --git a/src/images/toolbar/main/athlete.png b/src/Resources/images/toolbar/main/athlete.png
similarity index 100%
rename from src/images/toolbar/main/athlete.png
rename to src/Resources/images/toolbar/main/athlete.png
diff --git a/src/images/toolbar/main/config.png b/src/Resources/images/toolbar/main/config.png
similarity index 100%
rename from src/images/toolbar/main/config.png
rename to src/Resources/images/toolbar/main/config.png
diff --git a/src/images/toolbar/main/diary.png b/src/Resources/images/toolbar/main/diary.png
similarity index 100%
rename from src/images/toolbar/main/diary.png
rename to src/Resources/images/toolbar/main/diary.png
diff --git a/src/images/toolbar/main/fullscreen.png b/src/Resources/images/toolbar/main/fullscreen.png
similarity index 100%
rename from src/images/toolbar/main/fullscreen.png
rename to src/Resources/images/toolbar/main/fullscreen.png
diff --git a/src/images/toolbar/main/help.png b/src/Resources/images/toolbar/main/help.png
similarity index 100%
rename from src/images/toolbar/main/help.png
rename to src/Resources/images/toolbar/main/help.png
diff --git a/src/images/toolbar/main/hiderside.png b/src/Resources/images/toolbar/main/hiderside.png
similarity index 100%
rename from src/images/toolbar/main/hiderside.png
rename to src/Resources/images/toolbar/main/hiderside.png
diff --git a/src/images/toolbar/main/hideside.png b/src/Resources/images/toolbar/main/hideside.png
similarity index 100%
rename from src/images/toolbar/main/hideside.png
rename to src/Resources/images/toolbar/main/hideside.png
diff --git a/src/images/toolbar/main/home.png b/src/Resources/images/toolbar/main/home.png
similarity index 100%
rename from src/images/toolbar/main/home.png
rename to src/Resources/images/toolbar/main/home.png
diff --git a/src/images/toolbar/main/measures.png b/src/Resources/images/toolbar/main/measures.png
similarity index 100%
rename from src/images/toolbar/main/measures.png
rename to src/Resources/images/toolbar/main/measures.png
diff --git a/src/images/toolbar/main/normal.png b/src/Resources/images/toolbar/main/normal.png
similarity index 100%
rename from src/images/toolbar/main/normal.png
rename to src/Resources/images/toolbar/main/normal.png
diff --git a/src/images/toolbar/main/showrside.png b/src/Resources/images/toolbar/main/showrside.png
similarity index 100%
rename from src/images/toolbar/main/showrside.png
rename to src/Resources/images/toolbar/main/showrside.png
diff --git a/src/images/toolbar/main/showside.png b/src/Resources/images/toolbar/main/showside.png
similarity index 100%
rename from src/images/toolbar/main/showside.png
rename to src/Resources/images/toolbar/main/showside.png
diff --git a/src/images/toolbar/main/style.png b/src/Resources/images/toolbar/main/style.png
similarity index 100%
rename from src/images/toolbar/main/style.png
rename to src/Resources/images/toolbar/main/style.png
diff --git a/src/images/toolbar/main/tab.png b/src/Resources/images/toolbar/main/tab.png
similarity index 100%
rename from src/images/toolbar/main/tab.png
rename to src/Resources/images/toolbar/main/tab.png
diff --git a/src/images/toolbar/main/tick.png b/src/Resources/images/toolbar/main/tick.png
similarity index 100%
rename from src/images/toolbar/main/tick.png
rename to src/Resources/images/toolbar/main/tick.png
diff --git a/src/images/toolbar/main/tile.png b/src/Resources/images/toolbar/main/tile.png
similarity index 100%
rename from src/images/toolbar/main/tile.png
rename to src/Resources/images/toolbar/main/tile.png
diff --git a/src/images/toolbar/main/togglefull.png b/src/Resources/images/toolbar/main/togglefull.png
similarity index 100%
rename from src/images/toolbar/main/togglefull.png
rename to src/Resources/images/toolbar/main/togglefull.png
diff --git a/src/images/toolbar/main/train.png b/src/Resources/images/toolbar/main/train.png
similarity index 100%
rename from src/images/toolbar/main/train.png
rename to src/Resources/images/toolbar/main/train.png
diff --git a/src/images/toolbar/minus white.png b/src/Resources/images/toolbar/minus white.png
similarity index 100%
rename from src/images/toolbar/minus white.png
rename to src/Resources/images/toolbar/minus white.png
diff --git a/src/images/toolbar/minus.png b/src/Resources/images/toolbar/minus.png
similarity index 100%
rename from src/images/toolbar/minus.png
rename to src/Resources/images/toolbar/minus.png
diff --git a/src/images/toolbar/monitor.png b/src/Resources/images/toolbar/monitor.png
similarity index 100%
rename from src/images/toolbar/monitor.png
rename to src/Resources/images/toolbar/monitor.png
diff --git a/src/images/toolbar/moon 2.png b/src/Resources/images/toolbar/moon 2.png
similarity index 100%
rename from src/images/toolbar/moon 2.png
rename to src/Resources/images/toolbar/moon 2.png
diff --git a/src/images/toolbar/moon 3.png b/src/Resources/images/toolbar/moon 3.png
similarity index 100%
rename from src/images/toolbar/moon 3.png
rename to src/Resources/images/toolbar/moon 3.png
diff --git a/src/images/toolbar/movies alt.png b/src/Resources/images/toolbar/movies alt.png
similarity index 100%
rename from src/images/toolbar/movies alt.png
rename to src/Resources/images/toolbar/movies alt.png
diff --git a/src/images/toolbar/movies.png b/src/Resources/images/toolbar/movies.png
similarity index 100%
rename from src/images/toolbar/movies.png
rename to src/Resources/images/toolbar/movies.png
diff --git a/src/images/toolbar/music 2.png b/src/Resources/images/toolbar/music 2.png
similarity index 100%
rename from src/images/toolbar/music 2.png
rename to src/Resources/images/toolbar/music 2.png
diff --git a/src/images/toolbar/music.png b/src/Resources/images/toolbar/music.png
similarity index 100%
rename from src/images/toolbar/music.png
rename to src/Resources/images/toolbar/music.png
diff --git a/src/images/toolbar/new archive.png b/src/Resources/images/toolbar/new archive.png
similarity index 100%
rename from src/images/toolbar/new archive.png
rename to src/Resources/images/toolbar/new archive.png
diff --git a/src/images/toolbar/new doc.png b/src/Resources/images/toolbar/new doc.png
similarity index 100%
rename from src/images/toolbar/new doc.png
rename to src/Resources/images/toolbar/new doc.png
diff --git a/src/images/toolbar/new mail.png b/src/Resources/images/toolbar/new mail.png
similarity index 100%
rename from src/images/toolbar/new mail.png
rename to src/Resources/images/toolbar/new mail.png
diff --git a/src/images/toolbar/notebook.png b/src/Resources/images/toolbar/notebook.png
similarity index 100%
rename from src/images/toolbar/notebook.png
rename to src/Resources/images/toolbar/notebook.png
diff --git a/src/images/toolbar/open alt.png b/src/Resources/images/toolbar/open alt.png
similarity index 100%
rename from src/images/toolbar/open alt.png
rename to src/Resources/images/toolbar/open alt.png
diff --git a/src/images/toolbar/passwords.png b/src/Resources/images/toolbar/passwords.png
similarity index 100%
rename from src/images/toolbar/passwords.png
rename to src/Resources/images/toolbar/passwords.png
diff --git a/src/images/toolbar/paste.png b/src/Resources/images/toolbar/paste.png
similarity index 100%
rename from src/images/toolbar/paste.png
rename to src/Resources/images/toolbar/paste.png
diff --git a/src/images/toolbar/pause.png b/src/Resources/images/toolbar/pause.png
similarity index 100%
rename from src/images/toolbar/pause.png
rename to src/Resources/images/toolbar/pause.png
diff --git a/src/images/toolbar/picture.png b/src/Resources/images/toolbar/picture.png
similarity index 100%
rename from src/images/toolbar/picture.png
rename to src/Resources/images/toolbar/picture.png
diff --git a/src/images/toolbar/pinbutton.png b/src/Resources/images/toolbar/pinbutton.png
similarity index 100%
rename from src/images/toolbar/pinbutton.png
rename to src/Resources/images/toolbar/pinbutton.png
diff --git a/src/images/toolbar/play.png b/src/Resources/images/toolbar/play.png
similarity index 100%
rename from src/images/toolbar/play.png
rename to src/Resources/images/toolbar/play.png
diff --git a/src/images/toolbar/plus.png b/src/Resources/images/toolbar/plus.png
similarity index 100%
rename from src/images/toolbar/plus.png
rename to src/Resources/images/toolbar/plus.png
diff --git a/src/images/toolbar/popbutton.png b/src/Resources/images/toolbar/popbutton.png
similarity index 100%
rename from src/images/toolbar/popbutton.png
rename to src/Resources/images/toolbar/popbutton.png
diff --git a/src/images/toolbar/properties.png b/src/Resources/images/toolbar/properties.png
similarity index 100%
rename from src/images/toolbar/properties.png
rename to src/Resources/images/toolbar/properties.png
diff --git a/src/images/toolbar/public.png b/src/Resources/images/toolbar/public.png
similarity index 100%
rename from src/images/toolbar/public.png
rename to src/Resources/images/toolbar/public.png
diff --git a/src/images/toolbar/record.png b/src/Resources/images/toolbar/record.png
similarity index 100%
rename from src/images/toolbar/record.png
rename to src/Resources/images/toolbar/record.png
diff --git a/src/images/toolbar/redo.png b/src/Resources/images/toolbar/redo.png
similarity index 100%
rename from src/images/toolbar/redo.png
rename to src/Resources/images/toolbar/redo.png
diff --git a/src/images/toolbar/refresh.png b/src/Resources/images/toolbar/refresh.png
similarity index 100%
rename from src/images/toolbar/refresh.png
rename to src/Resources/images/toolbar/refresh.png
diff --git a/src/images/toolbar/remove.png b/src/Resources/images/toolbar/remove.png
similarity index 100%
rename from src/images/toolbar/remove.png
rename to src/Resources/images/toolbar/remove.png
diff --git a/src/images/toolbar/rewind button white.png b/src/Resources/images/toolbar/rewind button white.png
similarity index 100%
rename from src/images/toolbar/rewind button white.png
rename to src/Resources/images/toolbar/rewind button white.png
diff --git a/src/images/toolbar/rewind button.png b/src/Resources/images/toolbar/rewind button.png
similarity index 100%
rename from src/images/toolbar/rewind button.png
rename to src/Resources/images/toolbar/rewind button.png
diff --git a/src/images/toolbar/save.png b/src/Resources/images/toolbar/save.png
similarity index 100%
rename from src/images/toolbar/save.png
rename to src/Resources/images/toolbar/save.png
diff --git a/src/images/toolbar/saveas.png b/src/Resources/images/toolbar/saveas.png
similarity index 100%
rename from src/images/toolbar/saveas.png
rename to src/Resources/images/toolbar/saveas.png
diff --git a/src/images/toolbar/search.png b/src/Resources/images/toolbar/search.png
similarity index 100%
rename from src/images/toolbar/search.png
rename to src/Resources/images/toolbar/search.png
diff --git a/src/images/toolbar/search3.png b/src/Resources/images/toolbar/search3.png
similarity index 100%
rename from src/images/toolbar/search3.png
rename to src/Resources/images/toolbar/search3.png
diff --git a/src/images/toolbar/select.png b/src/Resources/images/toolbar/select.png
similarity index 100%
rename from src/images/toolbar/select.png
rename to src/Resources/images/toolbar/select.png
diff --git a/src/images/toolbar/send.png b/src/Resources/images/toolbar/send.png
similarity index 100%
rename from src/images/toolbar/send.png
rename to src/Resources/images/toolbar/send.png
diff --git a/src/images/toolbar/server.png b/src/Resources/images/toolbar/server.png
similarity index 100%
rename from src/images/toolbar/server.png
rename to src/Resources/images/toolbar/server.png
diff --git a/src/images/toolbar/smiley sad.png b/src/Resources/images/toolbar/smiley sad.png
similarity index 100%
rename from src/images/toolbar/smiley sad.png
rename to src/Resources/images/toolbar/smiley sad.png
diff --git a/src/images/toolbar/smiley.png b/src/Resources/images/toolbar/smiley.png
similarity index 100%
rename from src/images/toolbar/smiley.png
rename to src/Resources/images/toolbar/smiley.png
diff --git a/src/images/toolbar/splash green.png b/src/Resources/images/toolbar/splash green.png
similarity index 100%
rename from src/images/toolbar/splash green.png
rename to src/Resources/images/toolbar/splash green.png
diff --git a/src/images/toolbar/star.png b/src/Resources/images/toolbar/star.png
similarity index 100%
rename from src/images/toolbar/star.png
rename to src/Resources/images/toolbar/star.png
diff --git a/src/images/toolbar/stop 2.png b/src/Resources/images/toolbar/stop 2.png
similarity index 100%
rename from src/images/toolbar/stop 2.png
rename to src/Resources/images/toolbar/stop 2.png
diff --git a/src/images/toolbar/stop.png b/src/Resources/images/toolbar/stop.png
similarity index 100%
rename from src/images/toolbar/stop.png
rename to src/Resources/images/toolbar/stop.png
diff --git a/src/images/toolbar/stop_alt.png b/src/Resources/images/toolbar/stop_alt.png
similarity index 100%
rename from src/images/toolbar/stop_alt.png
rename to src/Resources/images/toolbar/stop_alt.png
diff --git a/src/images/toolbar/sun 2.png b/src/Resources/images/toolbar/sun 2.png
similarity index 100%
rename from src/images/toolbar/sun 2.png
rename to src/Resources/images/toolbar/sun 2.png
diff --git a/src/images/toolbar/sun.png b/src/Resources/images/toolbar/sun.png
similarity index 100%
rename from src/images/toolbar/sun.png
rename to src/Resources/images/toolbar/sun.png
diff --git a/src/images/toolbar/terminal.png b/src/Resources/images/toolbar/terminal.png
similarity index 100%
rename from src/images/toolbar/terminal.png
rename to src/Resources/images/toolbar/terminal.png
diff --git a/src/images/toolbar/trash full.png b/src/Resources/images/toolbar/trash full.png
similarity index 100%
rename from src/images/toolbar/trash full.png
rename to src/Resources/images/toolbar/trash full.png
diff --git a/src/images/toolbar/trash.png b/src/Resources/images/toolbar/trash.png
similarity index 100%
rename from src/images/toolbar/trash.png
rename to src/Resources/images/toolbar/trash.png
diff --git a/src/images/toolbar/unarchive.png b/src/Resources/images/toolbar/unarchive.png
similarity index 100%
rename from src/images/toolbar/unarchive.png
rename to src/Resources/images/toolbar/unarchive.png
diff --git a/src/images/toolbar/undo.png b/src/Resources/images/toolbar/undo.png
similarity index 100%
rename from src/images/toolbar/undo.png
rename to src/Resources/images/toolbar/undo.png
diff --git a/src/images/toolbar/unread mail.png b/src/Resources/images/toolbar/unread mail.png
similarity index 100%
rename from src/images/toolbar/unread mail.png
rename to src/Resources/images/toolbar/unread mail.png
diff --git a/src/images/toolbar/up_alt.png b/src/Resources/images/toolbar/up_alt.png
similarity index 100%
rename from src/images/toolbar/up_alt.png
rename to src/Resources/images/toolbar/up_alt.png
diff --git a/src/images/toolbar/user.png b/src/Resources/images/toolbar/user.png
similarity index 100%
rename from src/images/toolbar/user.png
rename to src/Resources/images/toolbar/user.png
diff --git a/src/images/toolbar/users.png b/src/Resources/images/toolbar/users.png
similarity index 100%
rename from src/images/toolbar/users.png
rename to src/Resources/images/toolbar/users.png
diff --git a/src/images/toolbar/window.png b/src/Resources/images/toolbar/window.png
similarity index 100%
rename from src/images/toolbar/window.png
rename to src/Resources/images/toolbar/window.png
diff --git a/src/images/toolbar/zoom in.png b/src/Resources/images/toolbar/zoom in.png
similarity index 100%
rename from src/images/toolbar/zoom in.png
rename to src/Resources/images/toolbar/zoom in.png
diff --git a/src/images/toolbar/zoom out.png b/src/Resources/images/toolbar/zoom out.png
similarity index 100%
rename from src/images/toolbar/zoom out.png
rename to src/Resources/images/toolbar/zoom out.png
diff --git a/src/images/train.png b/src/Resources/images/train.png
similarity index 100%
rename from src/images/train.png
rename to src/Resources/images/train.png
diff --git a/src/images/twitter.png b/src/Resources/images/twitter.png
similarity index 100%
rename from src/images/twitter.png
rename to src/Resources/images/twitter.png
diff --git a/src/images/update.png b/src/Resources/images/update.png
similarity index 100%
rename from src/images/update.png
rename to src/Resources/images/update.png
diff --git a/src/translations/gc_cs.ts b/src/Resources/translations/gc_cs.ts
similarity index 100%
rename from src/translations/gc_cs.ts
rename to src/Resources/translations/gc_cs.ts
diff --git a/src/translations/gc_de.ts b/src/Resources/translations/gc_de.ts
similarity index 100%
rename from src/translations/gc_de.ts
rename to src/Resources/translations/gc_de.ts
diff --git a/src/translations/gc_es.ts b/src/Resources/translations/gc_es.ts
similarity index 100%
rename from src/translations/gc_es.ts
rename to src/Resources/translations/gc_es.ts
diff --git a/src/translations/gc_fr.ts b/src/Resources/translations/gc_fr.ts
similarity index 100%
rename from src/translations/gc_fr.ts
rename to src/Resources/translations/gc_fr.ts
diff --git a/src/translations/gc_it.ts b/src/Resources/translations/gc_it.ts
similarity index 100%
rename from src/translations/gc_it.ts
rename to src/Resources/translations/gc_it.ts
diff --git a/src/translations/gc_ja.ts b/src/Resources/translations/gc_ja.ts
similarity index 100%
rename from src/translations/gc_ja.ts
rename to src/Resources/translations/gc_ja.ts
diff --git a/src/translations/gc_pt-br.ts b/src/Resources/translations/gc_pt-br.ts
similarity index 100%
rename from src/translations/gc_pt-br.ts
rename to src/Resources/translations/gc_pt-br.ts
diff --git a/src/translations/gc_pt.ts b/src/Resources/translations/gc_pt.ts
similarity index 100%
rename from src/translations/gc_pt.ts
rename to src/Resources/translations/gc_pt.ts
diff --git a/src/translations/gc_ru.ts b/src/Resources/translations/gc_ru.ts
similarity index 100%
rename from src/translations/gc_ru.ts
rename to src/Resources/translations/gc_ru.ts
diff --git a/src/translations/gc_zh-tw.ts b/src/Resources/translations/gc_zh-tw.ts
similarity index 100%
rename from src/translations/gc_zh-tw.ts
rename to src/Resources/translations/gc_zh-tw.ts
diff --git a/src/web/MapWindow.html b/src/Resources/web/MapWindow.html
similarity index 100%
rename from src/web/MapWindow.html
rename to src/Resources/web/MapWindow.html
diff --git a/src/web/Rider.js b/src/Resources/web/Rider.js
similarity index 100%
rename from src/web/Rider.js
rename to src/Resources/web/Rider.js
diff --git a/src/web/StreetViewWindow.html b/src/Resources/web/StreetViewWindow.html
similarity index 100%
rename from src/web/StreetViewWindow.html
rename to src/Resources/web/StreetViewWindow.html
diff --git a/src/web/Window.css b/src/Resources/web/Window.css
similarity index 100%
rename from src/web/Window.css
rename to src/Resources/web/Window.css
diff --git a/src/web/jquery-1.6.4.min.js b/src/Resources/web/jquery-1.6.4.min.js
similarity index 100%
rename from src/web/jquery-1.6.4.min.js
rename to src/Resources/web/jquery-1.6.4.min.js
diff --git a/src/web/ride.js b/src/Resources/web/ride.js
similarity index 100%
rename from src/web/ride.js
rename to src/Resources/web/ride.js
diff --git a/src/webservice/httpserver.ini b/src/Resources/webservice/httpserver.ini
similarity index 100%
rename from src/webservice/httpserver.ini
rename to src/Resources/webservice/httpserver.ini
diff --git a/src/xml/analysis-layout.xml b/src/Resources/xml/analysis-layout.xml
similarity index 100%
rename from src/xml/analysis-layout.xml
rename to src/Resources/xml/analysis-layout.xml
diff --git a/src/xml/charts.xml b/src/Resources/xml/charts.xml
similarity index 100%
rename from src/xml/charts.xml
rename to src/Resources/xml/charts.xml
diff --git a/src/xml/diary-layout.xml b/src/Resources/xml/diary-layout.xml
similarity index 100%
rename from src/xml/diary-layout.xml
rename to src/Resources/xml/diary-layout.xml
diff --git a/src/xml/home-layout.xml b/src/Resources/xml/home-layout.xml
similarity index 100%
rename from src/xml/home-layout.xml
rename to src/Resources/xml/home-layout.xml
diff --git a/src/xml/metadata.xml b/src/Resources/xml/metadata.xml
similarity index 100%
rename from src/xml/metadata.xml
rename to src/Resources/xml/metadata.xml
diff --git a/src/xml/train-layout.xml b/src/Resources/xml/train-layout.xml
similarity index 100%
rename from src/xml/train-layout.xml
rename to src/Resources/xml/train-layout.xml
diff --git a/src/xml/video-layout.xml b/src/Resources/xml/video-layout.xml
similarity index 100%
rename from src/xml/video-layout.xml
rename to src/Resources/xml/video-layout.xml
diff --git a/src/AddDeviceWizard.cpp b/src/Train/AddDeviceWizard.cpp
similarity index 100%
rename from src/AddDeviceWizard.cpp
rename to src/Train/AddDeviceWizard.cpp
diff --git a/src/AddDeviceWizard.h b/src/Train/AddDeviceWizard.h
similarity index 100%
rename from src/AddDeviceWizard.h
rename to src/Train/AddDeviceWizard.h
diff --git a/src/BT40.cpp b/src/Train/BT40.cpp
similarity index 100%
rename from src/BT40.cpp
rename to src/Train/BT40.cpp
diff --git a/src/BT40.h b/src/Train/BT40.h
similarity index 100%
rename from src/BT40.h
rename to src/Train/BT40.h
diff --git a/src/BT40Controller.cpp b/src/Train/BT40Controller.cpp
similarity index 100%
rename from src/BT40Controller.cpp
rename to src/Train/BT40Controller.cpp
diff --git a/src/BT40Controller.h b/src/Train/BT40Controller.h
similarity index 100%
rename from src/BT40Controller.h
rename to src/Train/BT40Controller.h
diff --git a/src/Computrainer.cpp b/src/Train/Computrainer.cpp
similarity index 100%
rename from src/Computrainer.cpp
rename to src/Train/Computrainer.cpp
diff --git a/src/Computrainer.h b/src/Train/Computrainer.h
similarity index 100%
rename from src/Computrainer.h
rename to src/Train/Computrainer.h
diff --git a/src/ComputrainerController.cpp b/src/Train/ComputrainerController.cpp
similarity index 100%
rename from src/ComputrainerController.cpp
rename to src/Train/ComputrainerController.cpp
diff --git a/src/ComputrainerController.h b/src/Train/ComputrainerController.h
similarity index 100%
rename from src/ComputrainerController.h
rename to src/Train/ComputrainerController.h
diff --git a/src/DeviceConfiguration.cpp b/src/Train/DeviceConfiguration.cpp
similarity index 100%
rename from src/DeviceConfiguration.cpp
rename to src/Train/DeviceConfiguration.cpp
diff --git a/src/DeviceConfiguration.h b/src/Train/DeviceConfiguration.h
similarity index 100%
rename from src/DeviceConfiguration.h
rename to src/Train/DeviceConfiguration.h
diff --git a/src/DeviceTypes.cpp b/src/Train/DeviceTypes.cpp
similarity index 100%
rename from src/DeviceTypes.cpp
rename to src/Train/DeviceTypes.cpp
diff --git a/src/DeviceTypes.h b/src/Train/DeviceTypes.h
similarity index 100%
rename from src/DeviceTypes.h
rename to src/Train/DeviceTypes.h
diff --git a/src/DialWindow.cpp b/src/Train/DialWindow.cpp
similarity index 100%
rename from src/DialWindow.cpp
rename to src/Train/DialWindow.cpp
diff --git a/src/DialWindow.h b/src/Train/DialWindow.h
similarity index 100%
rename from src/DialWindow.h
rename to src/Train/DialWindow.h
diff --git a/src/ErgDB.cpp b/src/Train/ErgDB.cpp
similarity index 100%
rename from src/ErgDB.cpp
rename to src/Train/ErgDB.cpp
diff --git a/src/ErgDB.h b/src/Train/ErgDB.h
similarity index 100%
rename from src/ErgDB.h
rename to src/Train/ErgDB.h
diff --git a/src/ErgDBDownloadDialog.cpp b/src/Train/ErgDBDownloadDialog.cpp
similarity index 100%
rename from src/ErgDBDownloadDialog.cpp
rename to src/Train/ErgDBDownloadDialog.cpp
diff --git a/src/ErgDBDownloadDialog.h b/src/Train/ErgDBDownloadDialog.h
similarity index 100%
rename from src/ErgDBDownloadDialog.h
rename to src/Train/ErgDBDownloadDialog.h
diff --git a/src/ErgFile.cpp b/src/Train/ErgFile.cpp
similarity index 100%
rename from src/ErgFile.cpp
rename to src/Train/ErgFile.cpp
diff --git a/src/ErgFile.h b/src/Train/ErgFile.h
similarity index 100%
rename from src/ErgFile.h
rename to src/Train/ErgFile.h
diff --git a/src/ErgFilePlot.cpp b/src/Train/ErgFilePlot.cpp
similarity index 100%
rename from src/ErgFilePlot.cpp
rename to src/Train/ErgFilePlot.cpp
diff --git a/src/ErgFilePlot.h b/src/Train/ErgFilePlot.h
similarity index 100%
rename from src/ErgFilePlot.h
rename to src/Train/ErgFilePlot.h
diff --git a/src/EzUsb.c b/src/Train/EzUsb.c
similarity index 100%
rename from src/EzUsb.c
rename to src/Train/EzUsb.c
diff --git a/src/EzUsb.h b/src/Train/EzUsb.h
similarity index 100%
rename from src/EzUsb.h
rename to src/Train/EzUsb.h
diff --git a/src/Fortius.cpp b/src/Train/Fortius.cpp
similarity index 100%
rename from src/Fortius.cpp
rename to src/Train/Fortius.cpp
diff --git a/src/Fortius.h b/src/Train/Fortius.h
similarity index 100%
rename from src/Fortius.h
rename to src/Train/Fortius.h
diff --git a/src/FortiusController.cpp b/src/Train/FortiusController.cpp
similarity index 100%
rename from src/FortiusController.cpp
rename to src/Train/FortiusController.cpp
diff --git a/src/FortiusController.h b/src/Train/FortiusController.h
similarity index 100%
rename from src/FortiusController.h
rename to src/Train/FortiusController.h
diff --git a/src/Kickr.cpp b/src/Train/Kickr.cpp
similarity index 100%
rename from src/Kickr.cpp
rename to src/Train/Kickr.cpp
diff --git a/src/Kickr.h b/src/Train/Kickr.h
similarity index 100%
rename from src/Kickr.h
rename to src/Train/Kickr.h
diff --git a/src/KickrController.cpp b/src/Train/KickrController.cpp
similarity index 100%
rename from src/KickrController.cpp
rename to src/Train/KickrController.cpp
diff --git a/src/KickrController.h b/src/Train/KickrController.h
similarity index 100%
rename from src/KickrController.h
rename to src/Train/KickrController.h
diff --git a/src/LibUsb.cpp b/src/Train/LibUsb.cpp
similarity index 100%
rename from src/LibUsb.cpp
rename to src/Train/LibUsb.cpp
diff --git a/src/LibUsb.h b/src/Train/LibUsb.h
similarity index 100%
rename from src/LibUsb.h
rename to src/Train/LibUsb.h
diff --git a/src/Library.cpp b/src/Train/Library.cpp
similarity index 100%
rename from src/Library.cpp
rename to src/Train/Library.cpp
diff --git a/src/Library.h b/src/Train/Library.h
similarity index 100%
rename from src/Library.h
rename to src/Train/Library.h
diff --git a/src/LibraryParser.cpp b/src/Train/LibraryParser.cpp
similarity index 100%
rename from src/LibraryParser.cpp
rename to src/Train/LibraryParser.cpp
diff --git a/src/LibraryParser.h b/src/Train/LibraryParser.h
similarity index 100%
rename from src/LibraryParser.h
rename to src/Train/LibraryParser.h
diff --git a/src/MeterWidget.cpp b/src/Train/MeterWidget.cpp
similarity index 100%
rename from src/MeterWidget.cpp
rename to src/Train/MeterWidget.cpp
diff --git a/src/MeterWidget.h b/src/Train/MeterWidget.h
similarity index 100%
rename from src/MeterWidget.h
rename to src/Train/MeterWidget.h
diff --git a/src/Monark.cpp b/src/Train/Monark.cpp
similarity index 100%
rename from src/Monark.cpp
rename to src/Train/Monark.cpp
diff --git a/src/Monark.h b/src/Train/Monark.h
similarity index 100%
rename from src/Monark.h
rename to src/Train/Monark.h
diff --git a/src/MonarkConnection.cpp b/src/Train/MonarkConnection.cpp
similarity index 100%
rename from src/MonarkConnection.cpp
rename to src/Train/MonarkConnection.cpp
diff --git a/src/MonarkConnection.h b/src/Train/MonarkConnection.h
similarity index 100%
rename from src/MonarkConnection.h
rename to src/Train/MonarkConnection.h
diff --git a/src/MonarkController.cpp b/src/Train/MonarkController.cpp
similarity index 100%
rename from src/MonarkController.cpp
rename to src/Train/MonarkController.cpp
diff --git a/src/MonarkController.h b/src/Train/MonarkController.h
similarity index 100%
rename from src/MonarkController.h
rename to src/Train/MonarkController.h
diff --git a/src/NullController.cpp b/src/Train/NullController.cpp
similarity index 100%
rename from src/NullController.cpp
rename to src/Train/NullController.cpp
diff --git a/src/NullController.h b/src/Train/NullController.h
similarity index 100%
rename from src/NullController.h
rename to src/Train/NullController.h
diff --git a/src/RealtimeController.cpp b/src/Train/RealtimeController.cpp
similarity index 100%
rename from src/RealtimeController.cpp
rename to src/Train/RealtimeController.cpp
diff --git a/src/RealtimeController.h b/src/Train/RealtimeController.h
similarity index 100%
rename from src/RealtimeController.h
rename to src/Train/RealtimeController.h
diff --git a/src/RealtimeData.cpp b/src/Train/RealtimeData.cpp
similarity index 100%
rename from src/RealtimeData.cpp
rename to src/Train/RealtimeData.cpp
diff --git a/src/RealtimeData.h b/src/Train/RealtimeData.h
similarity index 100%
rename from src/RealtimeData.h
rename to src/Train/RealtimeData.h
diff --git a/src/RealtimePlot.cpp b/src/Train/RealtimePlot.cpp
similarity index 100%
rename from src/RealtimePlot.cpp
rename to src/Train/RealtimePlot.cpp
diff --git a/src/RealtimePlot.h b/src/Train/RealtimePlot.h
similarity index 100%
rename from src/RealtimePlot.h
rename to src/Train/RealtimePlot.h
diff --git a/src/RealtimePlotWindow.cpp b/src/Train/RealtimePlotWindow.cpp
similarity index 100%
rename from src/RealtimePlotWindow.cpp
rename to src/Train/RealtimePlotWindow.cpp
diff --git a/src/RealtimePlotWindow.h b/src/Train/RealtimePlotWindow.h
similarity index 100%
rename from src/RealtimePlotWindow.h
rename to src/Train/RealtimePlotWindow.h
diff --git a/src/RemoteControl.cpp b/src/Train/RemoteControl.cpp
similarity index 100%
rename from src/RemoteControl.cpp
rename to src/Train/RemoteControl.cpp
diff --git a/src/RemoteControl.h b/src/Train/RemoteControl.h
similarity index 100%
rename from src/RemoteControl.h
rename to src/Train/RemoteControl.h
diff --git a/src/SpinScanPlot.cpp b/src/Train/SpinScanPlot.cpp
similarity index 100%
rename from src/SpinScanPlot.cpp
rename to src/Train/SpinScanPlot.cpp
diff --git a/src/SpinScanPlot.h b/src/Train/SpinScanPlot.h
similarity index 100%
rename from src/SpinScanPlot.h
rename to src/Train/SpinScanPlot.h
diff --git a/src/SpinScanPlotWindow.cpp b/src/Train/SpinScanPlotWindow.cpp
similarity index 100%
rename from src/SpinScanPlotWindow.cpp
rename to src/Train/SpinScanPlotWindow.cpp
diff --git a/src/SpinScanPlotWindow.h b/src/Train/SpinScanPlotWindow.h
similarity index 100%
rename from src/SpinScanPlotWindow.h
rename to src/Train/SpinScanPlotWindow.h
diff --git a/src/SpinScanPolarPlot.cpp b/src/Train/SpinScanPolarPlot.cpp
similarity index 100%
rename from src/SpinScanPolarPlot.cpp
rename to src/Train/SpinScanPolarPlot.cpp
diff --git a/src/SpinScanPolarPlot.h b/src/Train/SpinScanPolarPlot.h
similarity index 100%
rename from src/SpinScanPolarPlot.h
rename to src/Train/SpinScanPolarPlot.h
diff --git a/src/TrainBottom.cpp b/src/Train/TrainBottom.cpp
similarity index 100%
rename from src/TrainBottom.cpp
rename to src/Train/TrainBottom.cpp
diff --git a/src/TrainBottom.h b/src/Train/TrainBottom.h
similarity index 100%
rename from src/TrainBottom.h
rename to src/Train/TrainBottom.h
diff --git a/src/TrainDB.cpp b/src/Train/TrainDB.cpp
similarity index 100%
rename from src/TrainDB.cpp
rename to src/Train/TrainDB.cpp
diff --git a/src/TrainDB.h b/src/Train/TrainDB.h
similarity index 100%
rename from src/TrainDB.h
rename to src/Train/TrainDB.h
diff --git a/src/TrainSidebar.cpp b/src/Train/TrainSidebar.cpp
similarity index 100%
rename from src/TrainSidebar.cpp
rename to src/Train/TrainSidebar.cpp
diff --git a/src/TrainSidebar.h b/src/Train/TrainSidebar.h
similarity index 100%
rename from src/TrainSidebar.h
rename to src/Train/TrainSidebar.h
diff --git a/src/USBXpress.cpp b/src/Train/USBXpress.cpp
similarity index 100%
rename from src/USBXpress.cpp
rename to src/Train/USBXpress.cpp
diff --git a/src/USBXpress.h b/src/Train/USBXpress.h
similarity index 100%
rename from src/USBXpress.h
rename to src/Train/USBXpress.h
diff --git a/src/VideoLayoutParser.cpp b/src/Train/VideoLayoutParser.cpp
similarity index 100%
rename from src/VideoLayoutParser.cpp
rename to src/Train/VideoLayoutParser.cpp
diff --git a/src/VideoLayoutParser.h b/src/Train/VideoLayoutParser.h
similarity index 100%
rename from src/VideoLayoutParser.h
rename to src/Train/VideoLayoutParser.h
diff --git a/src/VideoSyncFile.cpp b/src/Train/VideoSyncFile.cpp
similarity index 100%
rename from src/VideoSyncFile.cpp
rename to src/Train/VideoSyncFile.cpp
diff --git a/src/VideoSyncFile.h b/src/Train/VideoSyncFile.h
similarity index 100%
rename from src/VideoSyncFile.h
rename to src/Train/VideoSyncFile.h
diff --git a/src/VideoWindow.cpp b/src/Train/VideoWindow.cpp
similarity index 100%
rename from src/VideoWindow.cpp
rename to src/Train/VideoWindow.cpp
diff --git a/src/VideoWindow.h b/src/Train/VideoWindow.h
similarity index 100%
rename from src/VideoWindow.h
rename to src/Train/VideoWindow.h
diff --git a/src/WFApi.h b/src/Train/WFApi.h
similarity index 100%
rename from src/WFApi.h
rename to src/Train/WFApi.h
diff --git a/src/WFApi.mm b/src/Train/WFApi.mm
similarity index 100%
rename from src/WFApi.mm
rename to src/Train/WFApi.mm
diff --git a/src/WorkoutPlotWindow.cpp b/src/Train/WorkoutPlotWindow.cpp
similarity index 100%
rename from src/WorkoutPlotWindow.cpp
rename to src/Train/WorkoutPlotWindow.cpp
diff --git a/src/WorkoutPlotWindow.h b/src/Train/WorkoutPlotWindow.h
similarity index 100%
rename from src/WorkoutPlotWindow.h
rename to src/Train/WorkoutPlotWindow.h
diff --git a/src/WorkoutWidget.cpp b/src/Train/WorkoutWidget.cpp
similarity index 100%
rename from src/WorkoutWidget.cpp
rename to src/Train/WorkoutWidget.cpp
diff --git a/src/WorkoutWidget.h b/src/Train/WorkoutWidget.h
similarity index 100%
rename from src/WorkoutWidget.h
rename to src/Train/WorkoutWidget.h
diff --git a/src/WorkoutWidgetItems.cpp b/src/Train/WorkoutWidgetItems.cpp
similarity index 100%
rename from src/WorkoutWidgetItems.cpp
rename to src/Train/WorkoutWidgetItems.cpp
diff --git a/src/WorkoutWidgetItems.h b/src/Train/WorkoutWidgetItems.h
similarity index 100%
rename from src/WorkoutWidgetItems.h
rename to src/Train/WorkoutWidgetItems.h
diff --git a/src/WorkoutWindow.cpp b/src/Train/WorkoutWindow.cpp
similarity index 100%
rename from src/WorkoutWindow.cpp
rename to src/Train/WorkoutWindow.cpp
diff --git a/src/WorkoutWindow.h b/src/Train/WorkoutWindow.h
similarity index 100%
rename from src/WorkoutWindow.h
rename to src/Train/WorkoutWindow.h
diff --git a/src/WorkoutWizard.cpp b/src/Train/WorkoutWizard.cpp
similarity index 100%
rename from src/WorkoutWizard.cpp
rename to src/Train/WorkoutWizard.cpp
diff --git a/src/WorkoutWizard.h b/src/Train/WorkoutWizard.h
similarity index 100%
rename from src/WorkoutWizard.h
rename to src/Train/WorkoutWizard.h
diff --git a/src/ZwoParser.cpp b/src/Train/ZwoParser.cpp
similarity index 100%
rename from src/ZwoParser.cpp
rename to src/Train/ZwoParser.cpp
diff --git a/src/ZwoParser.h b/src/Train/ZwoParser.h
similarity index 100%
rename from src/ZwoParser.h
rename to src/Train/ZwoParser.h
diff --git a/src/simpleserver.py b/src/deprecated/simpleserver.py
similarity index 100%
rename from src/simpleserver.py
rename to src/deprecated/simpleserver.py
diff --git a/src/gcconfig.pri.in b/src/gcconfig.pri.in
index e82a803ce..27a89d7a6 100644
--- a/src/gcconfig.pri.in
+++ b/src/gcconfig.pri.in
@@ -8,6 +8,14 @@
 #CONFIG += debug
 #CONFIG += release
 
+# put output into a separate dir
+# to keep main directory clear
+#DESTDIR = .
+#OBJECTS_DIR = ./.obj
+#MOC_DIR = ./.moc
+#RCC_DIR = ./.rcc
+#UI_DIR = ./.ui
+
 # If you want a console window to appear on Windows machines
 # then uncomment the following two lines.
 #CONFIG += console
diff --git a/src/src.pro b/src/src.pro
index 3e781a48b..947b3913d 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -54,6 +54,11 @@ lessThan(QT_MAJOR_VERSION, 5) {
     }
 }
 
+###=======================================================================
+### Directory Structure - Split into subdirs to be more manageable
+###=======================================================================
+INCLUDEPATH += ./ANT ./Train ./FileIO ./Cloud ./Charts ./Metrics ./Gui ./Core
+
 
 ###=======================================================================
 ### DISTRIBUTED SOURCE [Snaffled in sources to avoid further dependencies]
@@ -109,7 +114,7 @@ LIBS += $${LIBZ_LIBS}
 # windows icon and use QT zlib, not sure why different but keep for now
 win32 {
 
-    RC_FILE = windowsico.rc
+    RC_FILE = win32/windowsico.rc
     INCLUDEPATH += ./win32 $${QT_INSTALL_PREFIX}/src/3rdparty/zlib
     LIBS += -lws2_32
 
@@ -126,27 +131,27 @@ macx {
     # on mac we use native buttons and video, but have native fullscreen support
     LIBS    += -lobjc -framework IOKit -framework AppKit -framework QTKit
     HEADERS += \
-            QtMacVideoWindow.h \
-            QtMacSegmentedButton.h \
-            QtMacButton.h
+            Gui/QtMacVideoWindow.h \
+            Gui/QtMacSegmentedButton.h \
+            Gui/QtMacButton.h
 
     OBJECTIVE_SOURCES += \
-            QtMacVideoWindow.mm \
-            QtMacSegmentedButton.mm \
-            QtMacButton.mm
+            Gui/QtMacVideoWindow.mm \
+            Gui/QtMacSegmentedButton.mm \
+            Gui/QtMacButton.mm
 
 } else {
 
     # not on mac we need our own full screen support and segment control button
-    HEADERS += QTFullScreen.h
-    SOURCES += QTFullScreen.cpp
+    HEADERS += Gui/QTFullScreen.h
+    SOURCES += Gui/QTFullScreen.cpp
 
     HEADERS += ../qtsolutions/segmentcontrol/qtsegmentcontrol.h
     SOURCES += ../qtsolutions/segmentcontrol/qtsegmentcontrol.cpp
 
     # we now have videowindow, it will do nothing
-    HEADERS += VideoWindow.h
-    SOURCES += VideoWindow.cpp
+    HEADERS += Train/VideoWindow.h
+    SOURCES += Train/VideoWindow.cpp
 }
 
 
@@ -154,16 +159,16 @@ macx {
 ### LANGUAGE SUPPORT
 ###=================
 
-TRANSLATIONS = translations/gc_fr.ts \
-               translations/gc_ja.ts \
-               translations/gc_it.ts \
-               translations/gc_pt-br.ts \
-               translations/gc_de.ts \
-               translations/gc_cs.ts \
-               translations/gc_es.ts \
-               translations/gc_pt.ts \
-               translations/gc_ru.ts \
-               translations/gc_zh-tw.ts
+TRANSLATIONS = Resources/translations/gc_fr.ts \
+               Resources/translations/gc_ja.ts \
+               Resources/translations/gc_it.ts \
+               Resources/translations/gc_pt-br.ts \
+               Resources/translations/gc_de.ts \
+               Resources/translations/gc_cs.ts \
+               Resources/translations/gc_es.ts \
+               Resources/translations/gc_pt.ts \
+               Resources/translations/gc_ru.ts \
+               Resources/translations/gc_zh-tw.ts
 
 # need lrelease to generate qm files
 isEmpty(QMAKE_LRELEASE) {
@@ -173,7 +178,7 @@ isEmpty(QMAKE_LRELEASE) {
 }
 
 # how to run lrelease
-isEmpty(TS_DIR):TS_DIR = translations
+isEmpty(TS_DIR):TS_DIR = Resources/translations
 TSQM.name = lrelease ${QMAKE_FILE_IN}
 TSQM.input = TRANSLATIONS
 TSQM.output = $$TS_DIR/${QMAKE_FILE_BASE}.qm
@@ -187,8 +192,7 @@ PRE_TARGETDEPS += compiler_TSQM_make_all
 ### RESOURCES
 ###==========
 
-RESOURCES = application.qrc \
-            RideWindow.qrc
+RESOURCES = Resources/application.qrc Resources/RideWindow.qrc
 
 
 
@@ -230,8 +234,8 @@ unix:!macx {
 
 # if we have it we can add twitter support
 contains(DEFINES, "GC_HAVE_KQOAUTH") {
-        SOURCES     += TwitterDialog.cpp
-        HEADERS     += TwitterDialog.h
+        SOURCES     += Cloud/TwitterDialog.cpp
+        HEADERS     += Cloud/TwitterDialog.h
 }
 
 
@@ -267,8 +271,8 @@ contains(DEFINES, "GC_HAVE_KQOAUTH") {
     LIBS        += $${SRMIO_LIBS}
 
     # add support for srm downloads
-    HEADERS     += SrmDevice.h
-    SOURCES     += SrmDevice.cpp
+    HEADERS     += FileIO/SrmDevice.h
+    SOURCES     += FileIO/SrmDevice.cpp
 }
 
 
@@ -291,8 +295,8 @@ contains(DEFINES, "GC_HAVE_KQOAUTH") {
     QT          += opengl
 
     # add 3d plot
-    HEADERS     += ModelPlot.h ModelWindow.h
-    SOURCES     += ModelPlot.cpp ModelWindow.cpp
+    HEADERS     += Charts/ModelPlot.h Charts/ModelWindow.h
+    SOURCES     += Charts/ModelPlot.cpp Charts/ModelWindow.cpp
 }
 
 
@@ -317,8 +321,8 @@ contains(DEFINES, "GC_HAVE_KQOAUTH") {
     LIBS        += $${KML_LIBS}
 
     # add kml file i/o
-    SOURCES     += KmlRideFile.cpp
-    HEADERS     += KmlRideFile.h
+    SOURCES     += FileIO/KmlRideFile.cpp
+    HEADERS     += FileIO/KmlRideFile.h
 }
 
 
@@ -337,8 +341,8 @@ contains(DEFINES, "GC_HAVE_KQOAUTH") {
     LIBS        += $${ICAL_LIBS}
 
     # add caldav and diary functions
-    HEADERS     += ICalendar.h DiaryWindow.h CalDAV.h
-    SOURCES     += ICalendar.cpp DiaryWindow.cpp CalDAV.cpp
+    HEADERS     += Core/ICalendar.h Charts/DiaryWindow.h Cloud/CalDAV.h
+    SOURCES     += Core/ICalendar.cpp Charts/DiaryWindow.cpp Cloud/CalDAV.cpp
 }
 
 
@@ -361,8 +365,8 @@ contains(DEFINES, "GC_HAVE_KQOAUTH") {
     LIBS        += $${LIBUSB_LIBS}
 
     # lots of dependents
-    SOURCES     += LibUsb.cpp EzUsb.c Fortius.cpp FortiusController.cpp
-    HEADERS     += LibUsb.h EzUsb.h Fortius.cpp FortiusController.h
+    SOURCES     += Train/LibUsb.cpp Train/EzUsb.c Train/Fortius.cpp Train/FortiusController.cpp
+    HEADERS     += Train/LibUsb.h Train/EzUsb.h Train/Fortius.cpp Train/FortiusController.h
 }
 
 
@@ -383,8 +387,8 @@ contains(DEFINES, "GC_HAVE_KQOAUTH") {
     INCLUDEPATH += $${USBXPRESS_INCLUDE}
     LIBS        += $${USBXPRESS_LIBS}
 
-    SOURCES += USBXpress.cpp
-    HEADERS += USBXpress.h
+    SOURCES += Train/USBXpress.cpp
+    HEADERS += Train/USBXpress.h
 }
 
 
@@ -435,8 +439,8 @@ contains(DEFINES, "GC_HAVE_KQOAUTH") {
 
     DEFINES += GC_WANT_HTTP
 
-    HEADERS +=  APIWebService.h
-    SOURCES +=  APIWebService.cpp
+    HEADERS +=  Core/APIWebService.h
+    SOURCES +=  Core/APIWebService.cpp
 
     HEADERS +=  $$HTPATH/httpglobal.h \
                 $$HTPATH/httplistener.h \
@@ -480,10 +484,10 @@ equals(CloudDB, active) {
 
         greaterThan(QT_MINOR_VERSION, 4) {
 
-            HEADERS += CloudDBChart.h CloudDBCommon.h \
-                       CloudDBCurator.h CloudDBStatus.h
-            SOURCES += CloudDBChart.cpp CloudDBCommon.cpp \
-                       CloudDBCurator.cpp CloudDBStatus.cpp
+            HEADERS += Cloud/CloudDBChart.h Cloud/CloudDBCommon.h \
+                       Cloud/CloudDBCurator.h Cloud/CloudDBStatus.h
+            SOURCES += Cloud/CloudDBChart.cpp Cloud/CloudDBCommon.cpp \
+                       Cloud/CloudDBCurator.cpp Cloud/CloudDBStatus.cpp
             DEFINES += GC_HAS_CLOUD_DB
 
         } else {
@@ -517,12 +521,12 @@ equals(CloudDB, active) {
 greaterThan(QT_MAJOR_VERSION, 4) {
 
     # Features that only work with QT5 or higher
-    SOURCES += Dropbox.cpp
-    HEADERS += Dropbox.h
-    SOURCES += GoogleDrive.cpp
-    HEADERS += GoogleDrive.h
-    SOURCES += Monark.cpp MonarkController.cpp MonarkConnection.cpp
-    HEADERS += Monark.h MonarkController.h MonarkConnection.h
+    SOURCES += Cloud/Dropbox.cpp
+    HEADERS += Cloud/Dropbox.h
+    SOURCES += Cloud/GoogleDrive.cpp
+    HEADERS += Cloud/GoogleDrive.h
+    SOURCES += Train/Monark.cpp Train/MonarkController.cpp Train/MonarkConnection.cpp
+    HEADERS += Train/Monark.h Train/MonarkController.h Train/MonarkConnection.h
 }
 
 
@@ -530,553 +534,176 @@ greaterThan(QT_MAJOR_VERSION, 4) {
 ### LEX AND YACC SOURCES
 ###=====================
 
-YACCSOURCES += DataFilter.y \
-               JsonRideFile.y \
-               WithingsParser.y \
-               RideDB.y
+YACCSOURCES += Core/DataFilter.y \
+               FileIO/JsonRideFile.y \
+               Cloud/WithingsParser.y \
+               Core/RideDB.y
 
-LEXSOURCES  += DataFilter.l \
-               JsonRideFile.l \
-               WithingsParser.l \
-               RideDB.l
+LEXSOURCES  += Core/DataFilter.l \
+               FileIO/JsonRideFile.l \
+               Cloud/WithingsParser.l \
+               Core/RideDB.l
 
 
 ###=========================================
 ### HEADER FILES [scanned by qmake, for moc]
 ###=========================================
 
-HEADERS  += \
-        AboutDialog.h \
-        AddDeviceWizard.h \
-        AddIntervalDialog.h \
-        Aerolab.h \
-        AerolabWindow.h \
-        AllPlot.h \
-        AllPlotInterval.h \
-        AllPlotSlopeCurve.h \
-        AllPlotWindow.h \
-        AnalysisSidebar.h \
-        ANTChannel.h \
-        ANT.h \
-        ANTlocalController.h \
-        ANTLogger.h \
-        ANTMessage.h \
-        ANTMessages.h \
-        AthleteBackup.h \
-        Athlete.h \
-        BatchExportDialog.h \
-        BestIntervalDialog.h \
-        Bin2RideFile.h \
-        BingMap.h \
-        BinRideFile.h \
-        BlankState.h \
-        CalendarDownload.h \
-        ChartBar.h \
-        ChartSettings.h \
-        ChooseCyclistDialog.h \
-        ../qtsolutions/codeeditor/codeeditor.h \
-        ColorButton.h \
-        Colors.h \
-        CommPort.h \
-        CompareDateRange.h \
-        CompareInterval.h \
-        ComparePane.h \
-        Computrainer3dpFile.h \
-        ComputrainerController.h \
-        Computrainer.h \
-        ConfigDialog.h \
-        Context.h \
-        CpPlotCurve.h \
-        CPPlot.h \
-        CriticalPowerWindow.h \
-        CsvRideFile.h \
-        DataFilter.h \
-        DataProcessor.h \
-        DaysScaleDraw.h \
-        DeviceConfiguration.h \
-        Device.h \
-        DeviceTypes.h \
-        DialWindow.h \
-        DiarySidebar.h \
-        DownloadRideDialog.h \
-        DragBar.h \
-        ErgDBDownloadDialog.h \
-        ErgDB.h \
-        ErgFile.h \
-        ErgFilePlot.h \
-        ExtendedCriticalPower.h \
-        FileStore.h \
-        FitlogParser.h \
-        FitlogRideFile.h \
-        FitRideFile.h \
-        FreeSearch.h \
-        GcCalendarModel.h \
-        GcCrashDialog.h \
-        GcOverlayWidget.h \
-        GcPane.h \
-        GcRideFile.h \
-        GcScopeBar.h \
-        GcSideBarItem.h \
-        GcToolBar.h \
-        GcUpgrade.h \
-        GcWindowLayout.h \
-        GcWindowRegistry.h \
-        GenerateHeatMapDialog.h \
-        GoldenCheetah.h \
-        GoogleMapControl.h \
-        GProgressDialog.h \
-        GpxParser.h \
-        GpxRideFile.h \
-        HelpWhatsThis.h \
-        HelpWindow.h \
-        HistogramWindow.h \
-        HomeWindow.h \
-        HrPwPlot.h \
-        HrPwWindow.h \
-        HrZones.h \
-        IdleTimer.h \
-        IndendPlotMarker.h \
-        IntervalItem.h \
-        IntervalSummaryWindow.h \
-        IntervalTreeView.h \
-        JouleDevice.h \
-        JsonRideFile.h \
-        LapsEditor.h \
-        Library.h \
-        LibraryParser.h \
-        LocalFileStore.h \
-        LogTimeScaleDraw.h \
-        LTMCanvasPicker.h \
-        LTMChartParser.h \
-        LTMOutliers.h \
-        LTMPlot.h \
-        LTMPopup.h \
-        LTMSettings.h \
-        LTMSidebar.h \
-        LTMTool.h \
-        LTMTrend2.h \
-        LTMTrend.h \
-        LTMWindow.h \
-        MacroDevice.h \
-        MainWindow.h \
-        ManualRideDialog.h \
-        ManualRideFile.h \
-        MergeActivityWizard.h \
-        MetadataWindow.h \
-        MeterWidget.h \
-        MoxyDevice.h \
-        MUPlot.h \
-        MUPool.h \
-        MUWidget.h \
-        NamedSearch.h \
-        NewCyclistDialog.h \
-        NullController.h \
-        OAuthDialog.h \
-        PaceZones.h \
-        Pages.h \
-        PDModel.h \
-        PfPvPlot.h \
-        PfPvWindow.h \
-        PMCData.h \
-        PolarRideFile.h \
-        PowerHist.h \
-        PowerTapDevice.h \
-        PowerTapUtil.h \
-        PwxRideFile.h \
-        ../qtsolutions/json/mvjson.h \
-        ../qtsolutions/qwtcurve/qwt_plot_gapped_curve.h \
-        QuarqParser.h \
-        QuarqRideFile.h \
-        ../qxt/src/qxtspanslider.h \
-        ../qxt/src/qxtspanslider_p.h \
-        ../qxt/src/qxtstringspinbox.h \
-        ../qzip/zipreader.h \
-        ../qzip/zipwriter.h \
-        RawRideFile.h \
-        RealtimeController.h \
-        RealtimeData.h \
-        RealtimePlot.h \
-        RealtimePlotWindow.h \
-        ReferenceLineDialog.h \
-        RemoteControl.h \
-        RideAutoImportConfig.h \
-        RideCache.h \
-        RideCacheModel.h \
-        RideEditor.h \
-        RideFileCache.h \
-        RideFileCommand.h \
-        RideFile.h \
-        RideFileTableModel.h \
-        RideImportWizard.h \
-        RideItem.h \
-        RideMetadata.h \
-        RideMetric.h \
-        RideNavigator.h \
-        RideNavigatorProxy.h \
-        RideSummaryWindow.h \
-        RideWindow.h \
-        Route.h \
-        RouteParser.h \
-        SaveDialogs.h \
-        ScatterPlot.h \
-        ScatterWindow.h \
-        SearchBox.h \
-        SearchFilterBox.h \
-        Season.h \
-        SeasonParser.h \
-        Secrets.h \
-        Serial.h \
-        Settings.h \
-        ShareDialog.h \
-        SlfParser.h \
-        SlfRideFile.h \
-        SmallPlot.h \
-        SmfParser.h \
-        SmfRideFile.h \
-        SmlParser.h \
-        SmlRideFile.h \
-        SpecialFields.h \
-        Specification.h \
-        SpinScanPlot.h \
-        SpinScanPlotWindow.h \
-        SpinScanPolarPlot.h \
-        SplitActivityWizard.h \
-        SportPlusHealthUploader.h \
-        SrdRideFile.h \
-        SrmRideFile.h \
-        Statistic.h \
-        SummaryWindow.h \
-        SyncRideFile.h \
-        Tab.h \
-        TabView.h \
-        TcxParser.h \
-        TcxRideFile.h \
-        TimeUtils.h \
-        ToolsDialog.h \
-        ToolsRhoEstimator.h \
-        TPDownloadDialog.h \
-        TPDownload.h \
-        TPUploadDialog.h \
-        TPUpload.h \
-        TrainDB.h \
-        TrainBottom.h \
-        TrainingstagebuchUploader.h \
-        TrainSidebar.h \
-        TreeMapPlot.h \
-        TreeMapWindow.h \
-        TxtRideFile.h \
-        Units.h \
-        UserData.h \
-        UserMetricParser.h \
-        UserMetricSettings.h \
-        Utils.h \
-        VDOTCalculator.h \
-        VeloHeroUploader.h \
-        VideoLayoutParser.h \
-        VideoSyncFile.h \
-        Views.h \
-        WithingsDownload.h \
-        WkoRideFile.h \
-        WorkoutPlotWindow.h \
-        WorkoutWidget.h \
-        WorkoutWidgetItems.h \
-        WorkoutWindow.h \
-        WorkoutWizard.h \
-        WPrime.h \
-        ZoneScaleDraw.h \
-        Zones.h \
-        ZwoParser.h
+# ANT+
+HEADERS  += ANT/ANTChannel.h ANT/ANT.h ANT/ANTlocalController.h ANT/ANTLogger.h ANT/ANTMessage.h ANT/ANTMessages.h
+
+# Charts and associated widgets
+HEADERS += Charts/Aerolab.h Charts/AerolabWindow.h Charts/AllPlot.h Charts/AllPlotInterval.h Charts/AllPlotSlopeCurve.h \
+           Charts/AllPlotWindow.h Charts/BingMap.h Charts/BlankState.h Charts/ChartBar.h Charts/ChartSettings.h \
+           Charts/CpPlotCurve.h Charts/CPPlot.h Charts/CriticalPowerWindow.h Charts/DaysScaleDraw.h Charts/GcOverlayWidget.h \
+           Charts/GcPane.h Charts/GoldenCheetah.h Charts/GoogleMapControl.h Charts/HistogramWindow.h Charts/HomeWindow.h \
+           Charts/HrPwPlot.h Charts/HrPwWindow.h Charts/IndendPlotMarker.h Charts/IntervalSummaryWindow.h Charts/LogTimeScaleDraw.h \
+           Charts/LTMCanvasPicker.h Charts/LTMChartParser.h Charts/LTMOutliers.h Charts/LTMPlot.h Charts/LTMPopup.h \
+           Charts/LTMSettings.h Charts/LTMSidebar.h Charts/LTMTool.h Charts/LTMTrend2.h Charts/LTMTrend.h Charts/LTMWindow.h \
+           Charts/MetadataWindow.h Charts/MUPlot.h Charts/MUPool.h Charts/MUWidget.h Charts/PfPvPlot.h Charts/PfPvWindow.h \
+           Charts/PowerHist.h Charts/ReferenceLineDialog.h Charts/RideEditor.h Charts/RideSummaryWindow.h Charts/RideWindow.h \
+           Charts/ScatterPlot.h Charts/ScatterWindow.h Charts/SmallPlot.h Charts/SummaryWindow.h Charts/TreeMapPlot.h \
+           Charts/TreeMapWindow.h Charts/ZoneScaleDraw.h
+
+# cloud services
+HEADERS += Cloud/CalendarDownload.h Cloud/FileStore.h Cloud/LocalFileStore.h Cloud/OAuthDialog.h Cloud/ShareDialog.h \
+           Cloud/SportPlusHealthUploader.h Cloud/TPDownloadDialog.h Cloud/TPDownload.h Cloud/TPUploadDialog.h Cloud/TPUpload.h \
+           Cloud/TrainingstagebuchUploader.h Cloud/VeloHeroUploader.h Cloud/WithingsDownload.h 
+# core data 
+HEADERS += Core/Athlete.h Core/Context.h Core/DataFilter.h Core/FreeSearch.h Core/GcCalendarModel.h Core/GcUpgrade.h \
+           Core/IdleTimer.h Core/IntervalItem.h Core/NamedSearch.h Core/RideItem.h Core/Route.h Core/RouteParser.h \
+           Core/Season.h Core/SeasonParser.h Core/Secrets.h Core/Settings.h Core/Specification.h Core/TimeUtils.h \
+           Core/Units.h Core/UserData.h Core/Utils.h
+
+# device and file IO or edit
+HEADERS += FileIO/AthleteBackup.h FileIO/BatchExportDialog.h FileIO/Bin2RideFile.h FileIO/BinRideFile.h FileIO/CommPort.h \
+           FileIO/Computrainer3dpFile.h FileIO/CsvRideFile.h FileIO/DataProcessor.h FileIO/Device.h FileIO/DownloadRideDialog.h \
+           FileIO/FitlogParser.h FileIO/FitlogRideFile.h FileIO/FitRideFile.h FileIO/GcRideFile.h FileIO/GpxParser.h \
+           FileIO/GpxRideFile.h FileIO/JouleDevice.h FileIO/JsonRideFile.h FileIO/LapsEditor.h FileIO/MacroDevice.h \
+           FileIO/ManualRideDialog.h FileIO/ManualRideFile.h FileIO/MergeActivityWizard.h FileIO/MoxyDevice.h FileIO/PolarRideFile.h \
+           FileIO/PowerTapDevice.h FileIO/PowerTapUtil.h FileIO/PwxRideFile.h FileIO/QuarqParser.h FileIO/QuarqRideFile.h \
+           FileIO/RawRideFile.h FileIO/RideAutoImportConfig.h FileIO/RideCache.h FileIO/RideCacheModel.h FileIO/RideFileCache.h \
+           FileIO/RideFileCommand.h FileIO/RideFile.h FileIO/RideFileTableModel.h FileIO/RideImportWizard.h FileIO/Serial.h \
+           FileIO/SlfParser.h FileIO/SlfRideFile.h FileIO/SmfParser.h FileIO/SmfRideFile.h FileIO/SmlParser.h FileIO/SmlRideFile.h \
+           FileIO/SplitActivityWizard.h FileIO/SrdRideFile.h FileIO/SrmRideFile.h FileIO/SyncRideFile.h FileIO/TcxParser.h \
+           FileIO/TcxRideFile.h FileIO/TxtRideFile.h FileIO/WkoRideFile.h
+
+# GUI components
+HEADERS += Gui/AboutDialog.h Gui/AddIntervalDialog.h Gui/AnalysisSidebar.h Gui/ChooseCyclistDialog.h Gui/ColorButton.h \
+           Gui/Colors.h Gui/CompareDateRange.h Gui/CompareInterval.h Gui/ComparePane.h Gui/ConfigDialog.h Gui/DiarySidebar.h \
+           Gui/DragBar.h Gui/GcCrashDialog.h Gui/GcScopeBar.h Gui/GcSideBarItem.h Gui/GcToolBar.h Gui/GcWindowLayout.h \
+           Gui/GcWindowRegistry.h Gui/GenerateHeatMapDialog.h Gui/GProgressDialog.h Gui/HelpWhatsThis.h Gui/HelpWindow.h \
+           Gui/IntervalTreeView.h Gui/MainWindow.h Gui/NewCyclistDialog.h Gui/Pages.h Gui/RideNavigator.h Gui/RideNavigatorProxy.h \
+           Gui/SaveDialogs.h Gui/SearchBox.h Gui/SearchFilterBox.h Gui/Tab.h Gui/TabView.h Gui/ToolsDialog.h Gui/ToolsRhoEstimator.h \
+           Gui/Views.h
+
+# metrics and models
+HEADERS += Metrics/BestIntervalDialog.h Metrics/ExtendedCriticalPower.h Metrics/HrZones.h Metrics/PaceZones.h Metrics/PDModel.h \
+           Metrics/PMCData.h Metrics/RideMetadata.h Metrics/RideMetric.h Metrics/SpecialFields.h Metrics/Statistic.h \
+           Metrics/UserMetricParser.h Metrics/UserMetricSettings.h Metrics/VDOTCalculator.h Metrics/WPrime.h Metrics/Zones.h
+
+# contrib
+HEADERS += ../qtsolutions/codeeditor/codeeditor.h ../qtsolutions/json/mvjson.h ../qtsolutions/qwtcurve/qwt_plot_gapped_curve.h \
+           ../qxt/src/qxtspanslider.h ../qxt/src/qxtspanslider_p.h ../qxt/src/qxtstringspinbox.h ../qzip/zipreader.h \
+           ../qzip/zipwriter.h
+
+# Train View
+HEADERS += Train/AddDeviceWizard.h Train/ComputrainerController.h Train/Computrainer.h Train/DeviceConfiguration.h \
+           Train/DeviceTypes.h Train/DialWindow.h Train/ErgDBDownloadDialog.h Train/ErgDB.h Train/ErgFile.h Train/ErgFilePlot.h \
+           Train/Library.h Train/LibraryParser.h Train/MeterWidget.h Train/NullController.h Train/RealtimeController.h \
+           Train/RealtimeData.h Train/RealtimePlot.h Train/RealtimePlotWindow.h Train/RemoteControl.h Train/SpinScanPlot.h \
+           Train/SpinScanPlotWindow.h Train/SpinScanPolarPlot.h Train/TrainBottom.h Train/TrainDB.h Train/TrainSidebar.h \
+           Train/VideoLayoutParser.h Train/VideoSyncFile.h Train/WorkoutPlotWindow.h Train/WorkoutWidget.h Train/WorkoutWidgetItems.h \
+           Train/WorkoutWindow.h Train/WorkoutWizard.h Train/ZwoParser.h
 
 
 ###=============
 ### SOURCE FILES
 ###=============
 
-SOURCES += \
-        aBikeScore.cpp \
-        AboutDialog.cpp \
-        aCoggan.cpp \
-        AddDeviceWizard.cpp \
-        AddIntervalDialog.cpp \
-        AerobicDecoupling.cpp \
-        Aerolab.cpp \
-        AerolabWindow.cpp \
-        AllPlot.cpp \
-        AllPlotInterval.cpp \
-        AllPlotSlopeCurve.cpp \
-        AllPlotWindow.cpp \
-        AnalysisSidebar.cpp \
-        ANTChannel.cpp \
-        ANT.cpp \
-        ANTlocalController.cpp \
-        ANTLogger.cpp \
-        ANTMessage.cpp \
-        AthleteBackup.cpp \
-        Athlete.cpp \
-        BasicRideMetrics.cpp \
-        BatchExportDialog.cpp \
-        BestIntervalDialog.cpp \
-        BikeScore.cpp \
-        Bin2RideFile.cpp \
-        BingMap.cpp \
-        BinRideFile.cpp \
-        BlankState.cpp \
-        CalendarDownload.cpp \
-        ChartBar.cpp \
-        ChartSettings.cpp \
-        ChooseCyclistDialog.cpp \
-        ../qtsolutions/codeeditor/codeeditor.cpp \
-        Coggan.cpp \
-        ColorButton.cpp \
-        Colors.cpp \
-        CommPort.cpp \
-        CompareDateRange.cpp \
-        CompareInterval.cpp \
-        ComparePane.cpp \
-        Computrainer3dpFile.cpp \
-        ComputrainerController.cpp \
-        Computrainer.cpp \
-        ConfigDialog.cpp \
-        Context.cpp \
-        CPPlot.cpp \
-        CpPlotCurve.cpp \
-        CriticalPowerWindow.cpp \
-        CsvRideFile.cpp \
-        DanielsPoints.cpp \
-        DataFilter.cpp \
-        DataProcessor.cpp \
-        DeviceConfiguration.cpp \
-        Device.cpp \
-        DeviceTypes.cpp \
-        DialWindow.cpp \
-        DiarySidebar.cpp \
-        DownloadRideDialog.cpp \
-        DragBar.cpp \
-        EditUserMetricDialog.cpp \
-        ErgDB.cpp \
-        ErgDBDownloadDialog.cpp \
-        ErgFile.cpp \
-        ErgFilePlot.cpp \
-        ExtendedCriticalPower.cpp \
-        FileStore.cpp \
-        FitlogParser.cpp \
-        FitlogRideFile.cpp \
-        FitRideFile.cpp \
-        FixDeriveDistance.cpp \
-        FixDerivePower.cpp \
-        FixDeriveTorque.cpp \
-        FixElevation.cpp \
-        FixFreewheeling.cpp \
-        FixGaps.cpp \
-        FixGPS.cpp \
-        FixHRSpikes.cpp \
-        FixMoxy.cpp \
-        FixPower.cpp \
-        FixSmO2.cpp \
-        FixSpeed.cpp \
-        FixSpikes.cpp \
-        FixTorque.cpp \
-        FreeSearch.cpp \
-        GcCrashDialog.cpp \
-        GcOverlayWidget.cpp \
-        GcPane.cpp \
-        GcRideFile.cpp \
-        GcScopeBar.cpp \
-        GcSideBarItem.cpp \
-        GcToolBar.cpp \
-        GcUpgrade.cpp \
-        GcWindowLayout.cpp \
-        GcWindowRegistry.cpp \
-        GenerateHeatMapDialog.cpp \
-        GoldenCheetah.cpp \
-        GoogleMapControl.cpp \
-        GOVSS.cpp \
-        GProgressDialog.cpp \
-        GpxParser.cpp \
-        GpxRideFile.cpp \
-        HelpWhatsThis.cpp \
-        HelpWindow.cpp \
-        HistogramWindow.cpp \
-        HomeWindow.cpp \
-        HrPwPlot.cpp \
-        HrPwWindow.cpp \
-        HrTimeInZone.cpp \
-        HrZones.cpp \
-        IdleTimer.cpp \
-        IndendPlotMarker.cpp \
-        IntervalItem.cpp \
-        IntervalSummaryWindow.cpp \
-        IntervalTreeView.cpp \
-        JouleDevice.cpp \
-        LapsEditor.cpp \
-        LeftRightBalance.cpp \
-        Library.cpp \
-        LibraryParser.cpp \
-        LocalFileStore.cpp \
-        LogTimeScaleDraw.cpp \
-        LTMCanvasPicker.cpp \
-        LTMChartParser.cpp \
-        LTMOutliers.cpp \
-        LTMPlot.cpp \
-        LTMPopup.cpp \
-        LTMSettings.cpp \
-        LTMSidebar.cpp \
-        LTMTool.cpp \
-        LTMTrend.cpp \
-        LTMWindow.cpp \
-        MacroDevice.cpp \
-        main.cpp \
-        MainWindow.cpp \
-        ManualRideDialog.cpp \
-        ManualRideFile.cpp \
-        MergeActivityWizard.cpp \
-        MetadataWindow.cpp \
-        MeterWidget.cpp \
-        MoxyDevice.cpp \
-        MUPlot.cpp \
-        MUWidget.cpp \
-        NamedSearch.cpp \
-        NewCyclistDialog.cpp \
-        NullController.cpp \
-        OAuthDialog.cpp \
-        PaceTimeInZone.cpp \
-        PaceZones.cpp \
-        Pages.cpp \
-        PDModel.cpp \
-        PeakPace.cpp \
-        PeakPower.cpp \
-        PfPvPlot.cpp \
-        PfPvWindow.cpp \
-        PMCData.cpp \
-        PolarRideFile.cpp \
-        PowerHist.cpp \
-        PowerTapDevice.cpp \
-        PowerTapUtil.cpp \
-        PwxRideFile.cpp \
-        ../qtsolutions/json/mvjson.cpp \
-        ../qtsolutions/qwtcurve/qwt_plot_gapped_curve.cpp \
-        QuarqParser.cpp \
-        QuarqRideFile.cpp \
-        ../qxt/src/qxtspanslider.cpp \
-        ../qxt/src/qxtstringspinbox.cpp \
-        ../qzip/zip.cpp \
-        RawRideFile.cpp \
-        RealtimeController.cpp \
-        RealtimeData.cpp \
-        RealtimePlot.cpp \
-        RealtimePlotWindow.cpp \
-        ReferenceLineDialog.cpp \
-        RemoteControl.cpp \
-        RideAutoImportConfig.cpp \
-        RideCache.cpp \
-        RideCacheModel.cpp \
-        RideEditor.cpp \
-        RideFileCache.cpp \
-        RideFileCommand.cpp \
-        RideFile.cpp \
-        RideFileTableModel.cpp \
-        RideImportWizard.cpp \
-        RideItem.cpp \
-        RideMetadata.cpp \
-        RideMetric.cpp \
-        RideNavigator.cpp \
-        RideSummaryWindow.cpp \
-        RideWindow.cpp \
-        Route.cpp \
-        RouteParser.cpp \
-        SaveDialogs.cpp \
-        ScatterPlot.cpp \
-        ScatterWindow.cpp \
-        SearchBox.cpp \
-        SearchFilterBox.cpp \
-        Season.cpp \
-        SeasonParser.cpp \
-        Serial.cpp \
-        Settings.cpp \
-        ShareDialog.cpp \
-        SlfParser.cpp \
-        SlfRideFile.cpp \
-        SmallPlot.cpp \
-        SmfParser.cpp \
-        SmfRideFile.cpp \
-        SmlParser.cpp \
-        SmlRideFile.cpp \
-        SpecialFields.cpp \
-        Specification.cpp \
-        SpinScanPlot.cpp \
-        SpinScanPlotWindow.cpp \
-        SpinScanPolarPlot.cpp \
-        SplitActivityWizard.cpp \
-        SportPlusHealthUploader.cpp \
-        SrdRideFile.cpp \
-        SrmRideFile.cpp \
-        Statistic.cpp \
-        SummaryWindow.cpp \
-        SustainMetric.cpp \
-        SwimScore.cpp \
-        SyncRideFile.cpp \
-        Tab.cpp \
-        TabView.cpp \
-        TacxCafRideFile.cpp \
-        TcxParser.cpp \
-        TcxRideFile.cpp \
-        TimeInZone.cpp \
-        TimeUtils.cpp \
-        ToolsDialog.cpp \
-        ToolsRhoEstimator.cpp \
-        TPDownload.cpp \
-        TPDownloadDialog.cpp \
-        TPUpload.cpp \
-        TPUploadDialog.cpp \
-        TrainBottom.cpp \
-        TrainDB.cpp \
-        TrainingstagebuchUploader.cpp \
-        TrainSidebar.cpp \
-        TreeMapPlot.cpp \
-        TreeMapWindow.cpp \
-        TRIMPPoints.cpp \
-        TxtRideFile.cpp \
-        Units.cpp \
-        UserData.cpp \
-        UserMetric.cpp \
-        UserMetricParser.cpp \
-        Utils.cpp \
-        VDOTCalculator.cpp \
-        VDOT.cpp \
-        VeloHeroUploader.cpp \
-        VideoLayoutParser.cpp \
-        VideoSyncFile.cpp \
-        Views.cpp \
-        WattsPerKilogram.cpp \
-        WithingsDownload.cpp \
-        WkoRideFile.cpp \
-        WorkoutWidget.cpp \
-        WorkoutWidgetItems.cpp \
-        WorkoutPlotWindow.cpp \
-        WorkoutWindow.cpp \
-        WorkoutWizard.cpp \
-        WPrime.cpp \
-        Zones.cpp \
-        ZwoParser.cpp
+## ANT+ 
+SOURCES += ANT/ANTChannel.cpp ANT/ANT.cpp ANT/ANTlocalController.cpp ANT/ANTLogger.cpp ANT/ANTMessage.cpp
+
+## Charts and related
+SOURCES += Charts/Aerolab.cpp Charts/AerolabWindow.cpp Charts/AllPlot.cpp Charts/AllPlotInterval.cpp Charts/AllPlotSlopeCurve.cpp \
+           Charts/AllPlotWindow.cpp Charts/BingMap.cpp Charts/BlankState.cpp Charts/ChartBar.cpp Charts/ChartSettings.cpp \
+           Charts/CPPlot.cpp Charts/CpPlotCurve.cpp Charts/CriticalPowerWindow.cpp Charts/GcOverlayWidget.cpp Charts/GcPane.cpp \
+           Charts/GoldenCheetah.cpp Charts/GoogleMapControl.cpp Charts/HistogramWindow.cpp Charts/HomeWindow.cpp Charts/HrPwPlot.cpp \
+           Charts/HrPwWindow.cpp Charts/IndendPlotMarker.cpp Charts/IntervalSummaryWindow.cpp Charts/LogTimeScaleDraw.cpp \
+           Charts/LTMCanvasPicker.cpp Charts/LTMChartParser.cpp Charts/LTMOutliers.cpp Charts/LTMPlot.cpp Charts/LTMPopup.cpp \
+           Charts/LTMSettings.cpp Charts/LTMSidebar.cpp Charts/LTMTool.cpp Charts/LTMTrend.cpp Charts/LTMWindow.cpp \
+           Charts/MetadataWindow.cpp Charts/MUPlot.cpp Charts/MUWidget.cpp Charts/PfPvPlot.cpp Charts/PfPvWindow.cpp \
+           Charts/PowerHist.cpp Charts/ReferenceLineDialog.cpp Charts/RideEditor.cpp Charts/RideSummaryWindow.cpp Charts/RideWindow.cpp \
+           Charts/ScatterPlot.cpp Charts/ScatterWindow.cpp Charts/SmallPlot.cpp Charts/SummaryWindow.cpp Charts/TreeMapPlot.cpp \
+           Charts/TreeMapWindow.cpp
+
+## Cloud Services / Web resources
+SOURCES += Cloud/CalendarDownload.cpp Cloud/FileStore.cpp Cloud/LocalFileStore.cpp Cloud/OAuthDialog.cpp Cloud/ShareDialog.cpp \
+           Cloud/SportPlusHealthUploader.cpp Cloud/TPDownload.cpp Cloud/TPDownloadDialog.cpp Cloud/TPUpload.cpp Cloud/TPUploadDialog.cpp \
+           Cloud/TrainingstagebuchUploader.cpp Cloud/VeloHeroUploader.cpp Cloud/WithingsDownload.cpp 
+
+## Core Data Structures
+SOURCES += Core/Athlete.cpp Core/Context.cpp Core/DataFilter.cpp Core/FreeSearch.cpp Core/GcUpgrade.cpp Core/IdleTimer.cpp \
+           Core/IntervalItem.cpp Core/main.cpp Core/NamedSearch.cpp Core/RideItem.cpp Core/Route.cpp Core/RouteParser.cpp \
+           Core/Season.cpp Core/SeasonParser.cpp Core/Settings.cpp Core/Specification.cpp Core/TimeUtils.cpp Core/Units.cpp \
+           Core/UserData.cpp Core/Utils.cpp 
+
+## File and Device IO and Editing
+SOURCES += FileIO/AthleteBackup.cpp FileIO/BatchExportDialog.cpp FileIO/Bin2RideFile.cpp FileIO/BinRideFile.cpp FileIO/CommPort.cpp \
+           FileIO/Computrainer3dpFile.cpp FileIO/CsvRideFile.cpp FileIO/DataProcessor.cpp FileIO/Device.cpp FileIO/DownloadRideDialog.cpp \
+           FileIO/FitlogParser.cpp FileIO/FitlogRideFile.cpp FileIO/FitRideFile.cpp FileIO/FixDeriveDistance.cpp FileIO/FixDerivePower.cpp \
+           FileIO/FixDeriveTorque.cpp FileIO/FixElevation.cpp FileIO/FixFreewheeling.cpp FileIO/FixGaps.cpp FileIO/FixGPS.cpp \
+           FileIO/FixHRSpikes.cpp FileIO/FixMoxy.cpp FileIO/FixPower.cpp FileIO/FixSmO2.cpp FileIO/FixSpeed.cpp FileIO/FixSpikes.cpp \
+           FileIO/FixTorque.cpp FileIO/GcRideFile.cpp FileIO/GpxParser.cpp FileIO/GpxRideFile.cpp FileIO/JouleDevice.cpp FileIO/LapsEditor.cpp \
+           FileIO/MacroDevice.cpp FileIO/ManualRideDialog.cpp FileIO/ManualRideFile.cpp FileIO/MergeActivityWizard.cpp FileIO/MoxyDevice.cpp \
+           FileIO/PolarRideFile.cpp FileIO/PowerTapDevice.cpp FileIO/PowerTapUtil.cpp FileIO/PwxRideFile.cpp FileIO/QuarqParser.cpp \
+           FileIO/QuarqRideFile.cpp FileIO/RawRideFile.cpp FileIO/RideAutoImportConfig.cpp FileIO/RideCache.cpp FileIO/RideCacheModel.cpp \
+           FileIO/RideFileCache.cpp FileIO/RideFileCommand.cpp FileIO/RideFile.cpp FileIO/RideFileTableModel.cpp FileIO/RideImportWizard.cpp \
+           FileIO/Serial.cpp FileIO/SlfParser.cpp FileIO/SlfRideFile.cpp FileIO/SmfParser.cpp FileIO/SmfRideFile.cpp FileIO/SmlParser.cpp \
+           FileIO/SmlRideFile.cpp FileIO/SplitActivityWizard.cpp FileIO/SrdRideFile.cpp FileIO/SrmRideFile.cpp FileIO/SyncRideFile.cpp \
+           FileIO/TacxCafRideFile.cpp FileIO/TcxParser.cpp FileIO/TcxRideFile.cpp FileIO/TxtRideFile.cpp FileIO/WkoRideFile.cpp
+
+## GUI Elements and Dialogs
+SOURCES += Gui/AboutDialog.cpp Gui/AddIntervalDialog.cpp Gui/AnalysisSidebar.cpp Gui/ChooseCyclistDialog.cpp Gui/ColorButton.cpp \
+           Gui/Colors.cpp Gui/CompareDateRange.cpp Gui/CompareInterval.cpp Gui/ComparePane.cpp Gui/ConfigDialog.cpp Gui/DiarySidebar.cpp \
+           Gui/DragBar.cpp Gui/GcCrashDialog.cpp Gui/GcScopeBar.cpp Gui/GcSideBarItem.cpp Gui/GcToolBar.cpp Gui/GcWindowLayout.cpp \
+           Gui/GcWindowRegistry.cpp Gui/GenerateHeatMapDialog.cpp Gui/GProgressDialog.cpp Gui/HelpWhatsThis.cpp Gui/HelpWindow.cpp \
+           Gui/IntervalTreeView.cpp Gui/MainWindow.cpp Gui/NewCyclistDialog.cpp Gui/Pages.cpp Gui/RideNavigator.cpp Gui/SaveDialogs.cpp \
+           Gui/SearchBox.cpp Gui/SearchFilterBox.cpp Gui/Tab.cpp Gui/TabView.cpp Gui/ToolsDialog.cpp Gui/ToolsRhoEstimator.cpp Gui/Views.cpp
+
+## Models and Metrics
+SOURCES += Metrics/aBikeScore.cpp Metrics/aCoggan.cpp Metrics/AerobicDecoupling.cpp Metrics/BasicRideMetrics.cpp Metrics/BestIntervalDialog.cpp \
+           Metrics/BikeScore.cpp Metrics/Coggan.cpp Metrics/DanielsPoints.cpp Metrics/EditUserMetricDialog.cpp Metrics/ExtendedCriticalPower.cpp \
+           Metrics/GOVSS.cpp Metrics/HrTimeInZone.cpp Metrics/HrZones.cpp Metrics/LeftRightBalance.cpp Metrics/PaceTimeInZone.cpp \
+           Metrics/PaceZones.cpp Metrics/PDModel.cpp Metrics/PeakPace.cpp Metrics/PeakPower.cpp Metrics/PMCData.cpp Metrics/RideMetadata.cpp \
+           Metrics/RideMetric.cpp Metrics/SpecialFields.cpp Metrics/Statistic.cpp Metrics/SustainMetric.cpp Metrics/SwimScore.cpp \
+           Metrics/TimeInZone.cpp Metrics/TRIMPPoints.cpp Metrics/UserMetric.cpp Metrics/UserMetricParser.cpp Metrics/VDOTCalculator.cpp \
+           Metrics/VDOT.cpp Metrics/WattsPerKilogram.cpp Metrics/WPrime.cpp Metrics/Zones.cpp
+
+## Contributed solutions
+SOURCES += ../qtsolutions/codeeditor/codeeditor.cpp ../qtsolutions/json/mvjson.cpp ../qtsolutions/qwtcurve/qwt_plot_gapped_curve.cpp \
+           ../qxt/src/qxtspanslider.cpp ../qxt/src/qxtstringspinbox.cpp ../qzip/zip.cpp
+
+## Train View Components
+SOURCES += Train/AddDeviceWizard.cpp Train/ComputrainerController.cpp Train/Computrainer.cpp Train/DeviceConfiguration.cpp \
+           Train/DeviceTypes.cpp Train/DialWindow.cpp Train/ErgDB.cpp Train/ErgDBDownloadDialog.cpp Train/ErgFile.cpp Train/ErgFilePlot.cpp \
+           Train/Library.cpp Train/LibraryParser.cpp Train/MeterWidget.cpp Train/NullController.cpp Train/RealtimeController.cpp \
+           Train/RealtimeData.cpp Train/RealtimePlot.cpp Train/RealtimePlotWindow.cpp Train/RemoteControl.cpp Train/SpinScanPlot.cpp \
+           Train/SpinScanPlotWindow.cpp Train/SpinScanPolarPlot.cpp Train/TrainBottom.cpp Train/TrainDB.cpp Train/TrainSidebar.cpp \
+           Train/VideoLayoutParser.cpp Train/VideoSyncFile.cpp Train/WorkoutPlotWindow.cpp Train/WorkoutWidget.cpp Train/WorkoutWidgetItems.cpp \
+           Train/WorkoutWindow.cpp Train/WorkoutWizard.cpp Train/ZwoParser.cpp
 
 
 ###======================================
 ### PENDING SOURCE FILES [not active yet]
 ###======================================
 
-DEFERRES += RouteWindow.h \
-            RouteWindow.cpp \
-            RouteItem.h \
-            RouteItem.cpp
+DEFERRES += Core/RouteWindow.h Core/RouteWindow.cpp Core/RouteItem.h Core/RouteItem.cpp
 
 ###====================
 ### MISCELLANEOUS FILES
 ###====================
 
-OTHER_FILES += \
-    web/Rider.js \
-    web/ride.js \
-    web/jquery-1.6.4.min.js \
-    web/MapWindow.html \
-    web/StreetViewWindow.html \
-    web/Window.css
+OTHER_FILES += Resources/web/Rider.js Resources/web/ride.js Resources/web/jquery-1.6.4.min.js \
+               Resources/web/MapWindow.html Resources/web/StreetViewWindow.html Resources/web/Window.css
+
diff --git a/src/gh-downloads.py b/src/util/gh-downloads.py
similarity index 100%
rename from src/gh-downloads.py
rename to src/util/gh-downloads.py
diff --git a/src/ppxml.rb b/src/util/ppxml.rb
similarity index 100%
rename from src/ppxml.rb
rename to src/util/ppxml.rb
diff --git a/src/qmake-xcode b/src/util/qmake-xcode
similarity index 100%
rename from src/qmake-xcode
rename to src/util/qmake-xcode
diff --git a/src/windowsico.rc b/src/win32/windowsico.rc
similarity index 100%
rename from src/windowsico.rc
rename to src/win32/windowsico.rc