[Kdenlive-svn] [kdenlive] src: moving files (continued)

[Vincent P. <vin...@la...>]

Git commit d0fa610d80adcc5dbe96ed04bac794990b514d42 by Vincent PINON.
Committed on 21/07/2014 at 06:46.
Pushed by vpinon into branch 'master'.

moving files (continued)

M  +13   -82   src/CMakeLists.txt
D  +0    -8    src/beziercurve/CMakeLists.txt
A  +13   -0    src/capture/CMakeLists.txt
R  +0    -0    src/capture/managecapturesdialog.cpp [from: src/managecapturesdialog.cpp - 100% similarity]
R  +0    -0    src/capture/managecapturesdialog.h [from: src/managecapturesdialog.h - 100% similarity]
R  +1    -0    src/capture/mltdevicecapture.cpp [from: src/mltdevicecapture.cpp - 099% similarity]
R  +0    -0    src/capture/mltdevicecapture.h [from: src/mltdevicecapture.h - 100% similarity]
R  +0    -0    src/capture/v4lcapture.cpp [from: src/v4l/v4lcapture.cpp - 100% similarity]
R  +0    -0    src/capture/v4lcapture.h [from: src/v4l/v4lcapture.h - 100% similarity]
D  +0    -60   src/commands/editkeyframecommand.cpp
D  +0    -46   src/commands/editkeyframecommand.h
M  +1    -1    src/definitions.h
A  +10   -0    src/dialogs/CMakeLists.txt
R  +2    -1    src/dialogs/encodingprofilesdialog.cpp [from: src/encodingprofilesdialog.cpp - 099% similarity]
R  +0    -0    src/dialogs/encodingprofilesdialog.h [from: src/encodingprofilesdialog.h - 100% similarity]
R  +4    -3    src/dialogs/kdenlivesettingsdialog.cpp [from: src/kdenlivesettingsdialog.cpp - 099% similarity]
R  +0    -0    src/dialogs/kdenlivesettingsdialog.h [from: src/kdenlivesettingsdialog.h - 100% similarity]
R  +1    -0    src/dialogs/profilesdialog.cpp [from: src/profilesdialog.cpp - 099% similarity]
R  +0    -0    src/dialogs/profilesdialog.h [from: src/profilesdialog.h - 100% similarity]
R  +3    -2    src/dialogs/projectsettings.cpp [from: src/projectsettings.cpp - 099% similarity]
R  +0    -0    src/dialogs/projectsettings.h [from: src/projectsettings.h - 100% similarity]
R  +1    -1    src/dialogs/slideshowclip.cpp [from: src/slideshowclip.cpp - 099% similarity]
R  +0    -0    src/dialogs/slideshowclip.h [from: src/slideshowclip.h - 100% similarity]
R  +3    -2    src/dialogs/wizard.cpp [from: src/wizard.cpp - 099% similarity]
R  +0    -0    src/dialogs/wizard.h [from: src/wizard.h - 100% similarity]
A  +9    -0    src/doc/CMakeLists.txt
M  +4    -4    src/doc/docclipbase.cpp
M  +1    -1    src/doc/docclipbase.h
M  +3    -2    src/doc/doccommands.cpp
M  +3    -3    src/doc/documentchecker.cpp
M  +4    -2    src/doc/documentvalidator.cpp
M  +9    -9    src/doc/kdenlivedoc.cpp
M  +1    -0    src/doc/kdenlivedoc.h
A  +8    -0    src/dvdwizard/CMakeLists.txt
M  +4    -3    src/dvdwizard/dvdwizard.cpp
M  +6    -7    src/dvdwizard/dvdwizard.h
M  +2    -2    src/dvdwizard/dvdwizardchapters.cpp
M  +5    -5    src/dvdwizard/dvdwizardchapters.h
M  +2    -1    src/dvdwizard/dvdwizardmenu.cpp
M  +3    -3    src/dvdwizard/dvdwizardmenu.h
M  +2    -2    src/dvdwizard/dvdwizardvob.cpp
A  +8    -0    src/effectslist/CMakeLists.txt
R  +0    -0    src/effectslist/effectslist.cpp [from: src/effectslist.cpp - 100% similarity]
R  +0    -0    src/effectslist/effectslist.h [from: src/effectslist.h - 100% similarity]
R  +2    -1    src/effectslist/effectslistview.cpp [from: src/effectslistview.cpp - 099% similarity]
R  +0    -0    src/effectslist/effectslistview.h [from: src/effectslistview.h - 100% similarity]
R  +1    -1    src/effectslist/effectslistwidget.cpp [from: src/effectstack/widgets/effectslistwidget.cpp - 099% similarity]
R  +0    -0    src/effectslist/effectslistwidget.h [from: src/effectstack/widgets/effectslistwidget.h - 100% similarity]
R  +3    -1    src/effectslist/initeffects.cpp [from: src/initeffects.cpp - 099% similarity]
R  +0    -0    src/effectslist/initeffects.h [from: src/initeffects.h - 100% similarity]
M  +19   -3    src/effectstack/CMakeLists.txt
M  +1    -1    src/effectstack/collapsibleeffect.cpp
M  +3    -2    src/effectstack/complexparameter.cpp
M  +1    -1    src/effectstack/complexparameter.h
M  +2    -1    src/effectstack/dragvalue.cpp
M  +4    -3    src/effectstack/effectstackedit.cpp
M  +3    -2    src/effectstack/effectstackedit.h
M  +7    -7    src/effectstack/effectstackview2.cpp
M  +2    -1    src/effectstack/geometryval.cpp
M  +5    -5    src/effectstack/geometryval.h
R  +0    -0    src/effectstack/graphicsscenerectmove.cpp [from: src/graphicsscenerectmove.cpp - 100% similarity]
R  +0    -0    src/effectstack/graphicsscenerectmove.h [from: src/graphicsscenerectmove.h - 100% similarity]
M  +4    -3    src/effectstack/keyframeedit.cpp
M  +6    -5    src/effectstack/keyframeedit.h
M  +2    -1    src/effectstack/keyframehelper.cpp
M  +22   -20   src/effectstack/parametercontainer.cpp
M  +1    -1    src/effectstack/parametercontainer.h
R  +0    -0    src/effectstack/parameterplotter.cpp [from: src/parameterplotter.cpp - 100% similarity]
R  +0    -0    src/effectstack/parameterplotter.h [from: src/parameterplotter.h - 100% similarity]
M  +3    -2    src/effectstack/positionedit.cpp
M  +1    -1    src/effectstack/positionedit.h
A  +8    -0    src/effectstack/widgets/bezier/CMakeLists.txt
R  +0    -0    src/effectstack/widgets/bezier/beziersplineeditor.cpp [from: src/beziercurve/beziersplineeditor.cpp - 100% similarity]
R  +0    -0    src/effectstack/widgets/bezier/beziersplineeditor.h [from: src/beziercurve/beziersplineeditor.h - 100% similarity]
R  +0    -0    src/effectstack/widgets/bezier/beziersplinewidget.cpp [from: src/beziercurve/beziersplinewidget.cpp - 100% similarity]
R  +0    -0    src/effectstack/widgets/bezier/beziersplinewidget.h [from: src/beziercurve/beziersplinewidget.h - 100% similarity]
R  +0    -0    src/effectstack/widgets/bezier/bpoint.cpp [from: src/beziercurve/bpoint.cpp - 100% similarity]
R  +0    -0    src/effectstack/widgets/bezier/bpoint.h [from: src/beziercurve/bpoint.h - 100% similarity]
R  +0    -0    src/effectstack/widgets/bezier/cubicbezierspline.cpp [from: src/beziercurve/cubicbezierspline.cpp - 100% similarity]
R  +0    -0    src/effectstack/widgets/bezier/cubicbezierspline.h [from: src/beziercurve/cubicbezierspline.h - 100% similarity]
M  +2    -2    src/effectstack/widgets/choosecolorwidget.cpp
M  +3    -2    src/effectstack/widgets/cornerswidget.cpp
M  +5    -4    src/effectstack/widgets/geometrywidget.cpp
M  +1    -1    src/effectstack/widgets/kis_cubic_curve.cpp
M  +1    -1    src/effectstack/widgets/kis_curve_widget_p.h
D  +0    -38   src/events.h
M  +1    -1    src/jogshuttle/jogaction.cpp
M  +1    -2    src/jogshuttle/jogaction.h
M  +1    -1    src/jogshuttle/jogshuttle.cpp
M  +1    -1    src/jogshuttle/jogshuttleconfig.cpp
M  +1    -1    src/jogshuttle/jogshuttleconfig.h
M  +1    -1    src/kthumb.cpp
M  +1    -7    src/lib/CMakeLists.txt
M  +1    -1    src/lib/audio/fftTools.h
M  +3    -3    src/lib/external/kiss_fft/tools/psdpng.c
M  +10   -11   src/mainwindow.cpp
M  +1    -1    src/mainwindow.h
M  +9    -8    src/monitor/CMakeLists.txt
M  +5    -3    src/monitor/abstractmonitor.cpp
M  +3    -3    src/monitor/abstractmonitor.h
M  +7    -5    src/monitor/monitor.cpp
M  +1    -1    src/monitor/monitor.h
M  +4    -2    src/monitor/monitormanager.cpp
M  +3    -2    src/monitor/monitormanager.h
M  +4    -2    src/monitor/monitorscene.cpp
M  +8    -7    src/monitor/recmonitor.cpp
M  +2    -1    src/monitor/recmonitor.h
M  +4    -2    src/monitor/smallruler.cpp
M  +2    -2    src/monitor/smallruler.h
M  +2    -2    src/onmonitoritems/CMakeLists.txt
M  +1    -0    src/onmonitoritems/rotoscoping/CMakeLists.txt
M  +1    -1    src/onmonitoritems/rotoscoping/bpointitem.h
R  +4    -3    src/onmonitoritems/rotoscoping/rotowidget.cpp [from: src/rotoscoping/rotowidget.cpp - 099% similarity]
R  +1    -1    src/onmonitoritems/rotoscoping/rotowidget.h [from: src/rotoscoping/rotowidget.h - 098% similarity]
M  +15   -3    src/project/CMakeLists.txt
R  +5    -4    src/project/clipmanager.cpp [from: src/clipmanager.cpp - 099% similarity]
R  +0    -0    src/project/clipmanager.h [from: src/clipmanager.h - 100% similarity]
R  +4    -3    src/project/clipproperties.cpp [from: src/clipproperties.cpp - 099% similarity]
R  +0    -0    src/project/clipproperties.h [from: src/clipproperties.h - 100% similarity]
M  +1    -1    src/project/clipstabilize.cpp
R  +0    -0    src/project/cliptranscode.cpp [from: src/cliptranscode.cpp - 100% similarity]
R  +0    -0    src/project/cliptranscode.h [from: src/cliptranscode.h - 100% similarity]
M  +1    -1    src/project/folderprojectitem.cpp
M  +2    -2    src/project/projectcommands.cpp
R  +1    -0    src/project/projectitem.cpp [from: src/projectitem.cpp - 099% similarity]
R  +5    -4    src/project/projectitem.h [from: src/projectitem.h - 099% similarity]
M  +16   -15   src/project/projectlist.cpp
M  +9    -8    src/project/projectlist.h
M  +8    -8    src/project/projectlistview.cpp
M  +2    -1    src/project/subprojectitem.cpp
M  +5    -4    src/project/transitionsettings.cpp
M  +2    -2    src/renderer.cpp
D  +0    -5    src/rotoscoping/CMakeLists.txt
M  +2    -4    src/scopes/CMakeLists.txt
M  +1    -0    src/scopes/abstractscopewidget.cpp
M  +1    -0    src/scopes/audioscopes/abstractaudioscopewidget.cpp
M  +1    -1    src/scopes/audioscopes/audiosignal.h
M  +1    -0    src/scopes/audioscopes/audiospectrum.cpp
M  +5    -5    src/scopes/audioscopes/audiospectrum.h
M  +5    -0    src/scopes/colorscopes/CMakeLists.txt
M  +1    -1    src/scopes/colorscopes/colorplaneexport.cpp
M  +1    -1    src/scopes/colorscopes/histogram.cpp
M  +2    -1    src/scopes/colorscopes/histogramgenerator.cpp
M  +1    -1    src/scopes/colorscopes/rgbparade.cpp
M  +1    -1    src/scopes/colorscopes/rgbparadegenerator.cpp
M  +3    -2    src/scopes/colorscopes/vectorscope.cpp
M  +1    -1    src/scopes/colorscopes/vectorscopegenerator.cpp
M  +2    -2    src/scopes/colorscopes/waveform.cpp
M  +1    -1    src/scopes/colorscopes/waveformgenerator.cpp
M  +3    -3    src/scopes/scopemanager.cpp
M  +3    -3    src/scopes/scopemanager.h
M  +2    -2    src/simplekeyframes/CMakeLists.txt
M  +4    -4    src/stopmotion/stopmotion.cpp
A  +20   -0    src/timeline/CMakeLists.txt
M  +2    -2    src/timeline/abstractclipitem.cpp
M  +5    -4    src/timeline/abstractgroupitem.cpp
M  +2    -2    src/timeline/clipdurationdialog.cpp
M  +1    -1    src/timeline/clipdurationdialog.h
M  +8    -7    src/timeline/clipitem.cpp
M  +6    -5    src/timeline/clipitem.h
M  +2    -1    src/timeline/customruler.cpp
M  +1    -1    src/timeline/customtrackscene.cpp
M  +15   -14   src/timeline/customtrackview.cpp
M  +1    -1    src/timeline/customtrackview.h
M  +3    -2    src/timeline/guide.cpp
M  +3    -2    src/timeline/headertrack.cpp
R  +1    -0    src/timeline/markerdialog.cpp [from: src/markerdialog.cpp - 099% similarity]
R  +0    -0    src/timeline/markerdialog.h [from: src/markerdialog.h - 100% similarity]
M  +2    -1    src/timeline/spacerdialog.cpp
M  +39   -2    src/timeline/timelinecommands.cpp
M  +18   -1    src/timeline/timelinecommands.h
M  +4    -4    src/timeline/trackdialog.cpp
M  +1    -1    src/timeline/tracksconfigdialog.cpp
M  +12   -11   src/timeline/trackview.cpp
M  +5    -5    src/timeline/trackview.h
M  +5    -4    src/timeline/transition.cpp
M  +5    -5    src/timeline/transition.h
A  +7    -0    src/titler/CMakeLists.txt
R  +0    -0    src/titler/KoSliderCombo.cpp [from: src/KoSliderCombo.cpp - 100% similarity]
R  +0    -0    src/titler/KoSliderCombo.h [from: src/KoSliderCombo.h - 100% similarity]
R  +0    -0    src/titler/titledocument.cpp [from: src/titledocument.cpp - 100% similarity]
R  +0    -0    src/titler/titledocument.h [from: src/titledocument.h - 100% similarity]
R  +0    -0    src/titler/unicodedialog.cpp [from: src/unicodedialog.cpp - 100% similarity]
R  +0    -0    src/titler/unicodedialog.h [from: src/unicodedialog.h - 100% similarity]
M  +1    -1    src/ui/keyframewidget_ui.ui
M  +1    -1    src/ui/titlewidget_ui.ui
M  +1    -1    src/utils/resourcewidget.h
D  +0    -5    src/v4l/CMakeLists.txt
M  +3    -10   src/widgets/CMakeLists.txt
M  +1    -1    src/widgets/archivewidget.cpp
M  +2    -2    src/widgets/monitoreditwidget.cpp
M  +1    -1    src/widgets/renderwidget.cpp
M  +3    -2    src/widgets/titlewidget.cpp
M  +3    -3    src/widgets/titlewidget.h
M  +1    -1    src/widgets/videoglwidget.cpp
M  +1    -1    src/widgets/videosurface.cpp

http://commits.kde.org/kdenlive/d0fa610d80adcc5dbe96ed04bac794990b514d42

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ff0806d..9097eab 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -81,108 +81,39 @@ macro_log_feature(QJSON_FOUND
 install(FILES kdenlivesettings.kcfg DESTINATION ${KCFG_INSTALL_DIR})
 kde4_add_kcfg_files(kdenlive_SRCS kdenlivesettings.kcfgc)
 
-add_subdirectory(beziercurve)
-add_subdirectory(lib)
-add_subdirectory(utils)
+add_subdirectory(doc)
+add_subdirectory(project)
+add_subdirectory(timeline)
 add_subdirectory(effectstack)
-add_subdirectory(onmonitoritems)
+add_subdirectory(widgets)
+add_subdirectory(dialogs)
+add_subdirectory(effectslist)
 add_subdirectory(scopes)
+add_subdirectory(capture)
+add_subdirectory(dvdwizard)
+add_subdirectory(lib)
+add_subdirectory(monitor)
+add_subdirectory(onmonitoritems)
 add_subdirectory(simplekeyframes)
 add_subdirectory(stopmotion)
-add_subdirectory(widgets)
-add_subdirectory(monitor)
-add_subdirectory(project)
-
+add_subdirectory(titler)
+add_subdirectory(utils)
 
 if(QJSON_FOUND)
   add_subdirectory(onmonitoritems/rotoscoping)
-  add_subdirectory(rotoscoping)
 endif(QJSON_FOUND)
 
-if(LIBV4L2_FOUND)
-  add_subdirectory(v4l)
-endif()
-
 list(APPEND kdenlive_SRCS
-  ${monitor_SRCS}
-  ${project_SRCS}
-  clipmanager.cpp
-  clipproperties.cpp
-  cliptranscode.cpp
   colortools.cpp
   definitions.cpp
-  doc/docclipbase.cpp
-  doc/doccommands.cpp
-  doc/documentchecker.cpp
-  doc/documentvalidator.cpp
-  doc/kdenlivedoc.cpp
-  dvdwizard/dvdwizard.cpp
-  dvdwizard/dvdwizardchapters.cpp
-  dvdwizard/dvdwizardmenu.cpp
-  dvdwizard/dvdwizardvob.cpp
-  effectslist.cpp
-  effectslistview.cpp
-  effectstack/complexparameter.cpp
-  effectstack/dragvalue.cpp
-  effectstack/effectstackedit.cpp
-  effectstack/geometryval.cpp
-  effectstack/keyframeedit.cpp
-  effectstack/keyframehelper.cpp
-  effectstack/positionedit.cpp
-  effectstack/widgets/kis_cubic_curve.cpp
-  encodingprofilesdialog.cpp
   gentime.cpp
-  graphicsscenerectmove.cpp
-  initeffects.cpp
-  kdenlivesettingsdialog.cpp
-  KoSliderCombo.cpp
   kthumb.cpp
   main.cpp
   mainwindow.cpp
-  managecapturesdialog.cpp
-  markerdialog.cpp
-  mltdevicecapture.cpp
-  monitor/smallruler.cpp
-  parameterplotter.cpp
-  profilesdialog.cpp
-  project/clipstabilize.cpp
-  project/folderprojectitem.cpp
-  projectitem.cpp
-  project/projectcommands.cpp
-  project/projectlist.cpp
-  project/projectlistview.cpp
-  projectsettings.cpp
-  project/subprojectitem.cpp
-  project/transitionsettings.cpp
   renderer.cpp
-  scopes/colorscopes/colorplaneexport.cpp
-  scopes/colorscopes/histogramgenerator.cpp
-  scopes/colorscopes/rgbparadegenerator.cpp
-  scopes/colorscopes/vectorscopegenerator.cpp
-  scopes/colorscopes/waveformgenerator.cpp
-  slideshowclip.cpp
   statusbarmessagelabel.cpp
   timecode.cpp
   timecodedisplay.cpp
-  timeline/abstractgroupitem.cpp
-  timeline/abstractclipitem.cpp
-  timeline/clipdurationdialog.cpp
-  timeline/clipitem.cpp
-  timeline/customruler.cpp
-  timeline/customtrackscene.cpp
-  timeline/customtrackview.cpp
-  timeline/guide.cpp
-  timeline/headertrack.cpp
-  timeline/spacerdialog.cpp
-  timeline/timelinecommands.cpp
-  timeline/trackdialog.cpp
-  timeline/tracksconfigdialog.cpp
-  timeline/trackview.cpp
-  timeline/transition.cpp
-  titledocument.cpp
-  unicodedialog.cpp
-  widgets/backupwidget.cpp
-  wizard.cpp
 )
 
 kde4_add_ui_files(kdenlive_UIS
diff --git a/src/beziercurve/CMakeLists.txt b/src/beziercurve/CMakeLists.txt
deleted file mode 100644
index 625b404..0000000
--- a/src/beziercurve/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-set(kdenlive_SRCS
-  ${kdenlive_SRCS}
-  beziercurve/beziersplineeditor.cpp
-  beziercurve/beziersplinewidget.cpp
-  beziercurve/bpoint.cpp
-  beziercurve/cubicbezierspline.cpp
-  PARENT_SCOPE
-)
diff --git a/src/capture/CMakeLists.txt b/src/capture/CMakeLists.txt
new file mode 100644
index 0000000..312d245
--- /dev/null
+++ b/src/capture/CMakeLists.txt
@@ -0,0 +1,13 @@
+if(LIBV4L2_FOUND)
+    list(APPEND kdenlive_SRCS
+    capture/v4lcapture.cpp
+    )
+endif()
+
+set(kdenlive_SRCS
+  ${kdenlive_SRCS}
+  capture/managecapturesdialog.cpp
+  capture/mltdevicecapture.cpp
+  PARENT_SCOPE)
+
+
diff --git a/src/managecapturesdialog.cpp b/src/capture/managecapturesdialog.cpp
similarity index 100%
rename from src/managecapturesdialog.cpp
rename to src/capture/managecapturesdialog.cpp
diff --git a/src/managecapturesdialog.h b/src/capture/managecapturesdialog.h
similarity index 100%
rename from src/managecapturesdialog.h
rename to src/capture/managecapturesdialog.h
diff --git a/src/mltdevicecapture.cpp b/src/capture/mltdevicecapture.cpp
similarity index 99%
rename from src/mltdevicecapture.cpp
rename to src/capture/mltdevicecapture.cpp
index fcfeac8..d1a236c 100644
--- a/src/mltdevicecapture.cpp
+++ b/src/capture/mltdevicecapture.cpp
@@ -17,6 +17,7 @@
 
 
 #include "mltdevicecapture.h"
+
 #include "kdenlivesettings.h"
 #include "definitions.h"
 #include "widgets/videosurface.h"
diff --git a/src/mltdevicecapture.h b/src/capture/mltdevicecapture.h
similarity index 100%
rename from src/mltdevicecapture.h
rename to src/capture/mltdevicecapture.h
diff --git a/src/v4l/v4lcapture.cpp b/src/capture/v4lcapture.cpp
similarity index 100%
rename from src/v4l/v4lcapture.cpp
rename to src/capture/v4lcapture.cpp
diff --git a/src/v4l/v4lcapture.h b/src/capture/v4lcapture.h
similarity index 100%
rename from src/v4l/v4lcapture.h
rename to src/capture/v4lcapture.h
diff --git a/src/commands/editkeyframecommand.cpp b/src/commands/editkeyframecommand.cpp
deleted file mode 100644
index 5b8049c..0000000
--- a/src/commands/editkeyframecommand.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/***************************************************************************
-                          editkeyframecommand.cpp  -  description
-                             -------------------
-    begin                : 2008
-    copyright            : (C) 2008 by Jean-Baptiste Mardelle
-    email                : jb...@kd...
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-
-#include "editkeyframecommand.h"
-#include "customtrackview.h"
-
-#include <KLocalizedString>
-
-EditKeyFrameCommand::EditKeyFrameCommand(CustomTrackView *view, const int track, const GenTime &pos, const int effectIndex, const QString& oldkeyframes, const QString& newkeyframes, bool doIt) :
-    QUndoCommand(),
-    m_view(view),
-    m_oldkfr(oldkeyframes),
-    m_newkfr(newkeyframes),
-    m_track(track),
-    m_index(effectIndex),
-    m_pos(pos),
-    m_doIt(doIt)
-{
-    int prev = m_oldkfr.split(QLatin1Char(';'), QString::SkipEmptyParts).count();
-    int next = m_newkfr.split(QLatin1Char(';'), QString::SkipEmptyParts).count();
-    if (prev == next)
-        setText(i18n("Edit keyframe"));
-    else if (prev > next)
-        setText(i18n("Delete keyframe"));
-    else
-        setText(i18n("Add keyframe"));
-    //kDebug() << "///  CREATE GUIDE COMMAND, TIMES: " << m_oldPos.frames(25) << 'x' << m_pos.frames(25);
-}
-
-
-// virtual
-void EditKeyFrameCommand::undo()
-{
-    m_view->editKeyFrame(m_pos, m_track, m_index, m_oldkfr);
-    m_doIt = true;
-}
-// virtual
-void EditKeyFrameCommand::redo()
-{
-    if (m_doIt) {
-        m_view->editKeyFrame(m_pos, m_track, m_index, m_newkfr);
-    }
-    m_doIt = true;
-}
-
diff --git a/src/commands/editkeyframecommand.h b/src/commands/editkeyframecommand.h
deleted file mode 100644
index 81ece60..0000000
--- a/src/commands/editkeyframecommand.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/***************************************************************************
-                          editkeyframecommand.h  -  description
-                             -------------------
-    begin                : 2008
-    copyright            : (C) 2008 by Jean-Baptiste Mardelle
-    email                : jb...@kd...
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef KEYFRAMECOMMAND_H
-#define KEYFRAMECOMMAND_H
-
-#include <QUndoCommand>
-
-#include "gentime.h"
-#include "definitions.h"
-class CustomTrackView;
-
-
-class EditKeyFrameCommand : public QUndoCommand
-{
-public:
-    EditKeyFrameCommand(CustomTrackView *view, const int track, const GenTime &pos, const int effectIndex, const QString& oldkeyframes, const QString& newkeyframes, bool doIt);
-    void undo();
-    void redo();
-
-private:
-    CustomTrackView *m_view;
-    const QString m_oldkfr;
-    const QString m_newkfr;
-    const int m_track;
-    const int m_index;
-    const GenTime m_pos;
-    bool m_doIt;
-};
-
-#endif
-
diff --git a/src/definitions.h b/src/definitions.h
index 4adfb35..973444c 100644
--- a/src/definitions.h
+++ b/src/definitions.h
@@ -22,7 +22,7 @@
 #define DEFINITIONS_H
 
 #include "gentime.h"
-#include "effectslist.h"
+#include "effectslist/effectslist.h"
 
 #include <KLocalizedString>
 #include <QDebug>
diff --git a/src/dialogs/CMakeLists.txt b/src/dialogs/CMakeLists.txt
new file mode 100644
index 0000000..c3ba38e
--- /dev/null
+++ b/src/dialogs/CMakeLists.txt
@@ -0,0 +1,10 @@
+set(kdenlive_SRCS
+  ${kdenlive_SRCS}
+  dialogs/encodingprofilesdialog.cpp
+  dialogs/kdenlivesettingsdialog.cpp
+  dialogs/profilesdialog.cpp
+  dialogs/projectsettings.cpp
+  dialogs/slideshowclip.cpp
+  dialogs/wizard.cpp
+  PARENT_SCOPE)
+
diff --git a/src/encodingprofilesdialog.cpp b/src/dialogs/encodingprofilesdialog.cpp
similarity index 99%
rename from src/encodingprofilesdialog.cpp
rename to src/dialogs/encodingprofilesdialog.cpp
index b3d4749..dc1755e 100644
--- a/src/encodingprofilesdialog.cpp
+++ b/src/dialogs/encodingprofilesdialog.cpp
@@ -18,6 +18,7 @@
  ***************************************************************************/
 
 #include "encodingprofilesdialog.h"
+
 #include "kdenlivesettings.h"
 
 #include <KStandardDirs>
@@ -186,5 +187,5 @@ void EncodingProfilesDialog::slotEditProfile()
     delete d;
 }
 
-
 #include "encodingprofilesdialog.moc"
+
diff --git a/src/encodingprofilesdialog.h b/src/dialogs/encodingprofilesdialog.h
similarity index 100%
rename from src/encodingprofilesdialog.h
rename to src/dialogs/encodingprofilesdialog.h
diff --git a/src/kdenlivesettingsdialog.cpp b/src/dialogs/kdenlivesettingsdialog.cpp
similarity index 99%
rename from src/kdenlivesettingsdialog.cpp
rename to src/dialogs/kdenlivesettingsdialog.cpp
index f4cab98..72c3cdb 100644
--- a/src/kdenlivesettingsdialog.cpp
+++ b/src/dialogs/kdenlivesettingsdialog.cpp
@@ -19,12 +19,13 @@
 
 #include "kdenlivesettingsdialog.h"
 #include "profilesdialog.h"
-#ifdef USE_V4L
-#include "v4l/v4lcapture.h"
-#endif
 #include "encodingprofilesdialog.h"
+
 #include "kdenlivesettings.h"
 #include "renderer.h"
+#ifdef USE_V4L
+#include "capture/v4lcapture.h"
+#endif
 
 #include <KStandardDirs>
 #include <KDebug>
diff --git a/src/kdenlivesettingsdialog.h b/src/dialogs/kdenlivesettingsdialog.h
similarity index 100%
rename from src/kdenlivesettingsdialog.h
rename to src/dialogs/kdenlivesettingsdialog.h
diff --git a/src/profilesdialog.cpp b/src/dialogs/profilesdialog.cpp
similarity index 99%
rename from src/profilesdialog.cpp
rename to src/dialogs/profilesdialog.cpp
index c97db06..03da092 100644
--- a/src/profilesdialog.cpp
+++ b/src/dialogs/profilesdialog.cpp
@@ -18,6 +18,7 @@
  ***************************************************************************/
 
 #include "profilesdialog.h"
+
 #include "kdenlivesettings.h"
 
 #include <KStandardDirs>
diff --git a/src/profilesdialog.h b/src/dialogs/profilesdialog.h
similarity index 100%
rename from src/profilesdialog.h
rename to src/dialogs/profilesdialog.h
diff --git a/src/projectsettings.cpp b/src/dialogs/projectsettings.cpp
similarity index 99%
rename from src/projectsettings.cpp
rename to src/dialogs/projectsettings.cpp
index 46c9769..4f886a3 100644
--- a/src/projectsettings.cpp
+++ b/src/dialogs/projectsettings.cpp
@@ -18,11 +18,12 @@
  ***************************************************************************/
 
 #include "projectsettings.h"
-#include "kdenlivesettings.h"
 #include "profilesdialog.h"
+
+#include "kdenlivesettings.h"
 #include "doc/docclipbase.h"
 #include "widgets/titlewidget.h"
-#include "effectslist.h"
+#include "effectslist/effectslist.h"
 
 #include <KStandardDirs>
 #include <KMessageBox>
diff --git a/src/projectsettings.h b/src/dialogs/projectsettings.h
similarity index 100%
rename from src/projectsettings.h
rename to src/dialogs/projectsettings.h
diff --git a/src/slideshowclip.cpp b/src/dialogs/slideshowclip.cpp
similarity index 99%
rename from src/slideshowclip.cpp
rename to src/dialogs/slideshowclip.cpp
index 20d5f37..ef927bb 100644
--- a/src/slideshowclip.cpp
+++ b/src/dialogs/slideshowclip.cpp
@@ -50,7 +50,7 @@ SlideshowClip::SlideshowClip(const Timecode &tc, QWidget * parent) :
     connect(m_view.slide_fade, SIGNAL(stateChanged(int)), this, SLOT(slotEnableLuma(int)));
     connect(m_view.luma_fade, SIGNAL(stateChanged(int)), this, SLOT(slotEnableLumaFile(int)));
 
-    //WARNING: keep in sync with clipproperties.cpp
+    //WARNING: keep in sync with project/clipproperties.cpp
     m_view.image_type->addItem("JPG (*.jpg)", "jpg");
     m_view.image_type->addItem("JPEG (*.jpeg)", "jpeg");
     m_view.image_type->addItem("PNG (*.png)", "png");
diff --git a/src/slideshowclip.h b/src/dialogs/slideshowclip.h
similarity index 100%
rename from src/slideshowclip.h
rename to src/dialogs/slideshowclip.h
diff --git a/src/wizard.cpp b/src/dialogs/wizard.cpp
similarity index 99%
rename from src/wizard.cpp
rename to src/dialogs/wizard.cpp
index 20814a2..f54c005 100644
--- a/src/wizard.cpp
+++ b/src/dialogs/wizard.cpp
@@ -18,11 +18,12 @@
  ***************************************************************************/
 
 #include "wizard.h"
-#include "kdenlivesettings.h"
 #include "profilesdialog.h"
+
+#include "kdenlivesettings.h"
 #include "renderer.h"
 #ifdef USE_V4L
-#include "v4l/v4lcapture.h"
+#include "capture/v4lcapture.h"
 #endif
 #include <config-kdenlive.h>
 
diff --git a/src/wizard.h b/src/dialogs/wizard.h
similarity index 100%
rename from src/wizard.h
rename to src/dialogs/wizard.h
diff --git a/src/doc/CMakeLists.txt b/src/doc/CMakeLists.txt
new file mode 100644
index 0000000..624d7d9
--- /dev/null
+++ b/src/doc/CMakeLists.txt
@@ -0,0 +1,9 @@
+set(kdenlive_SRCS
+  ${kdenlive_SRCS}
+  doc/docclipbase.cpp
+  doc/doccommands.cpp
+  doc/documentchecker.cpp
+  doc/documentvalidator.cpp
+  doc/kdenlivedoc.cpp
+  PARENT_SCOPE)
+
diff --git a/src/doc/docclipbase.cpp b/src/doc/docclipbase.cpp
index e2207bc..4e97b46 100644
--- a/src/doc/docclipbase.cpp
+++ b/src/doc/docclipbase.cpp
@@ -22,13 +22,12 @@
  ***************************************************************************/
 
 
+#include "docclipbase.h"
 
-
-#include "doc/docclipbase.h"
 #include "kdenlivesettings.h"
 #include "kthumb.h"
-#include "clipmanager.h"
-#include "slideshowclip.h"
+#include "project/clipmanager.h"
+#include "dialogs/slideshowclip.h"
 
 #include <KIO/NetAccess>
 #include <KStandardDirs>
@@ -1410,3 +1409,4 @@ QMap <QString, QString> DocClipBase::analysisData() const
 
 
 #include "docclipbase.moc"
+
diff --git a/src/doc/docclipbase.h b/src/doc/docclipbase.h
index beb17f4..7701f07 100644
--- a/src/doc/docclipbase.h
+++ b/src/doc/docclipbase.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          doc/docclipbase.h  -  description
+                          docclipbase.h  -  description
                              -------------------
     begin                : Fri Apr 12 2002
     copyright            : (C) 2002 by Jason Wood
diff --git a/src/doc/doccommands.cpp b/src/doc/doccommands.cpp
index f46b004..6e2aaa9 100644
--- a/src/doc/doccommands.cpp
+++ b/src/doc/doccommands.cpp
@@ -17,8 +17,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include "doc/doccommands.h"
-#include "doc/kdenlivedoc.h"
+#include "doccommands.h"
+#include "kdenlivedoc.h"
+
 #include <KLocalizedString>
 
 AddClipCommand::AddClipCommand(KdenliveDoc *doc, const QDomElement &xml, const QString &id, bool doIt, QUndoCommand * parent) :
diff --git a/src/doc/documentchecker.cpp b/src/doc/documentchecker.cpp
index 421f7d4..aff2a70 100644
--- a/src/doc/documentchecker.cpp
+++ b/src/doc/documentchecker.cpp
@@ -18,9 +18,10 @@
  ***************************************************************************/
 
 
-#include "doc/documentchecker.h"
+#include "documentchecker.h"
+#include "docclipbase.h"
+
 #include "kthumb.h"
-#include "doc/docclipbase.h"
 #include "widgets/titlewidget.h"
 #include "definitions.h"
 #include "kdenlivesettings.h"
@@ -961,4 +962,3 @@ void DocumentChecker::slotCheckButtons()
 
 #include "documentchecker.moc"
 
-
diff --git a/src/doc/documentvalidator.cpp b/src/doc/documentvalidator.cpp
index 94b05ea..bccd8dd 100644
--- a/src/doc/documentvalidator.cpp
+++ b/src/doc/documentvalidator.cpp
@@ -18,9 +18,10 @@
  ***************************************************************************/
 
 
-#include "doc/documentvalidator.h"
+#include "documentvalidator.h"
+
 #include "definitions.h"
-#include "initeffects.h"
+#include "effectslist/initeffects.h"
 #include "mainwindow.h"
 
 #include <KDebug>
@@ -1204,3 +1205,4 @@ bool DocumentValidator::updateEffectParameters(const QDomNodeList &parameters, c
     }
     return updated;
 }
+
diff --git a/src/doc/kdenlivedoc.cpp b/src/doc/kdenlivedoc.cpp
index b3031cb..2a67a25 100644
--- a/src/doc/kdenlivedoc.cpp
+++ b/src/doc/kdenlivedoc.cpp
@@ -18,20 +18,20 @@
  ***************************************************************************/
 
 
-#include "doc/kdenlivedoc.h"
+#include "kdenlivedoc.h"
+#include "docclipbase.h"
+#include "documentchecker.h"
+#include "documentvalidator.h"
+
 #include <config-kdenlive.h>
-#include "doc/docclipbase.h"
-#include "profilesdialog.h"
 #include "kdenlivesettings.h"
 #include "renderer.h"
-#include "clipmanager.h"
-#include "widgets/titlewidget.h"
-#include "mainwindow.h"
-#include "doc/documentchecker.h"
-#include "doc/documentvalidator.h"
-#include "initeffects.h"
 #include "mainwindow.h"
+#include "project/clipmanager.h"
 #include "project/projectlist.h"
+#include "effectslist/initeffects.h"
+#include "dialogs/profilesdialog.h"
+#include "widgets/titlewidget.h"
 
 #include <KDebug>
 #include <KStandardDirs>
diff --git a/src/doc/kdenlivedoc.h b/src/doc/kdenlivedoc.h
index ee927f1..3be5567 100644
--- a/src/doc/kdenlivedoc.h
+++ b/src/doc/kdenlivedoc.h
@@ -244,3 +244,4 @@ signals:
 };
 
 #endif
+
diff --git a/src/dvdwizard/CMakeLists.txt b/src/dvdwizard/CMakeLists.txt
new file mode 100644
index 0000000..60ac5ea
--- /dev/null
+++ b/src/dvdwizard/CMakeLists.txt
@@ -0,0 +1,8 @@
+set(kdenlive_SRCS
+  ${kdenlive_SRCS}
+  dvdwizard/dvdwizardchapters.cpp
+  dvdwizard/dvdwizard.cpp
+  dvdwizard/dvdwizardmenu.cpp
+  dvdwizard/dvdwizardvob.cpp
+  PARENT_SCOPE)
+
diff --git a/src/dvdwizard/dvdwizard.cpp b/src/dvdwizard/dvdwizard.cpp
index 068b442..82fdd6a 100644
--- a/src/dvdwizard/dvdwizard.cpp
+++ b/src/dvdwizard/dvdwizard.cpp
@@ -18,10 +18,11 @@
  ***************************************************************************/
 
 
-#include "dvdwizard/dvdwizard.h"
-#include "dvdwizard/dvdwizardvob.h"
+#include "dvdwizard.h"
+#include "dvdwizardvob.h"
+
 #include "kdenlivesettings.h"
-#include "profilesdialog.h"
+#include "dialogs/profilesdialog.h"
 #include "timecode.h"
 #include "monitor/monitormanager.h"
 
diff --git a/src/dvdwizard/dvdwizard.h b/src/dvdwizard/dvdwizard.h
index 73b03c8..4e48979 100644
--- a/src/dvdwizard/dvdwizard.h
+++ b/src/dvdwizard/dvdwizard.h
@@ -21,20 +21,19 @@
 #ifndef DVDWIZARD_H
 #define DVDWIZARD_H
 
+#include "dvdwizard/dvdwizardvob.h"
+#include "dvdwizard/dvdwizardmenu.h"
+#include "dvdwizard/dvdwizardchapters.h"
+#include "ui_dvdwizardstatus_ui.h"
+#include "ui_dvdwizardchapters_ui.h"
+
 #include <QWizard>
 #include <QPainter>
 #include <QProcess>
 
-
 #include <KDebug>
 #include <KTemporaryFile>
 
-#include "dvdwizard/dvdwizardvob.h"
-#include "dvdwizard/dvdwizardmenu.h"
-#include "dvdwizard/dvdwizardchapters.h"
-#include "ui_dvdwizardstatus_ui.h"
-#include "ui_dvdwizardchapters_ui.h"
-
 typedef QMap <QString, QRect> stringRectMap;
 
 class DvdWizard : public QWizard
diff --git a/src/dvdwizard/dvdwizardchapters.cpp b/src/dvdwizard/dvdwizardchapters.cpp
index 5d7611b..1c21969 100644
--- a/src/dvdwizard/dvdwizardchapters.cpp
+++ b/src/dvdwizard/dvdwizardchapters.cpp
@@ -17,7 +17,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include "dvdwizard/dvdwizardchapters.h"
+#include "dvdwizardchapters.h"
 
 #include <KDebug>
 
@@ -258,4 +258,4 @@ QDomElement DvdWizardChapters::toXml() const
     return doc.documentElement();
 }
 
-#include "dvdwizard/dvdwizardchapters.moc"
+#include "dvdwizardchapters.moc"
diff --git a/src/dvdwizard/dvdwizardchapters.h b/src/dvdwizard/dvdwizardchapters.h
index 4743a7a..051f3dd 100644
--- a/src/dvdwizard/dvdwizardchapters.h
+++ b/src/dvdwizard/dvdwizardchapters.h
@@ -21,15 +21,15 @@
 #ifndef DVDWIZARDCHAPTERS_H
 #define DVDWIZARDCHAPTERS_H
 
-#include <QWizardPage>
-
-#include <KDebug>
-
 #include "ui_dvdwizardchapters_ui.h"
+#include "dvdwizardvob.h"
 #include "monitor/monitor.h"
-#include "dvdwizard/dvdwizardvob.h"
 #include "monitor/monitormanager.h"
 
+#include <QWizardPage>
+
+#include <KDebug>
+
 class DvdWizardChapters : public QWizardPage
 {
     Q_OBJECT
diff --git a/src/dvdwizard/dvdwizardmenu.cpp b/src/dvdwizard/dvdwizardmenu.cpp
index 1188305..9053a92 100644
--- a/src/dvdwizard/dvdwizardmenu.cpp
+++ b/src/dvdwizard/dvdwizardmenu.cpp
@@ -17,7 +17,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include "dvdwizard/dvdwizardmenu.h"
+#include "dvdwizardmenu.h"
+
 #include "kdenlivesettings.h"
 
 #include <KDebug>
diff --git a/src/dvdwizard/dvdwizardmenu.h b/src/dvdwizard/dvdwizardmenu.h
index f1b6eeb..98e5013 100644
--- a/src/dvdwizard/dvdwizardmenu.h
+++ b/src/dvdwizard/dvdwizardmenu.h
@@ -21,6 +21,9 @@
 #ifndef DVDWIZARDMENU_H
 #define DVDWIZARDMENU_H
 
+#include "dvdwizardvob.h"
+#include "ui_dvdwizardmenu_ui.h"
+
 #include <QWizardPage>
 #include <QGraphicsScene>
 #include <QGraphicsTextItem>
@@ -35,9 +38,6 @@
 #include <KMessageWidget>
 #endif
 
-#include "dvdwizard/dvdwizardvob.h"
-#include "ui_dvdwizardmenu_ui.h"
-
 class DvdScene : public QGraphicsScene
 {
     Q_OBJECT
diff --git a/src/dvdwizard/dvdwizardvob.cpp b/src/dvdwizard/dvdwizardvob.cpp
index 936397b..356180f 100644
--- a/src/dvdwizard/dvdwizardvob.cpp
+++ b/src/dvdwizard/dvdwizardvob.cpp
@@ -17,10 +17,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include "dvdwizard/dvdwizardvob.h"
+#include "dvdwizardvob.h"
 #include "kthumb.h"
 #include "timecode.h"
-#include "cliptranscode.h"
+#include "project/cliptranscode.h"
 
 #include <mlt++/Mlt.h>
 
diff --git a/src/effectslist/CMakeLists.txt b/src/effectslist/CMakeLists.txt
new file mode 100644
index 0000000..ebfdb32
--- /dev/null
+++ b/src/effectslist/CMakeLists.txt
@@ -0,0 +1,8 @@
+set(kdenlive_SRCS
+  ${kdenlive_SRCS}
+  effectslist/effectslist.cpp
+  effectslist/effectslistview.cpp
+  effectslist/effectslistwidget.cpp
+  effectslist/initeffects.cpp
+  PARENT_SCOPE)
+
diff --git a/src/effectslist.cpp b/src/effectslist/effectslist.cpp
similarity index 100%
rename from src/effectslist.cpp
rename to src/effectslist/effectslist.cpp
diff --git a/src/effectslist.h b/src/effectslist/effectslist.h
similarity index 100%
rename from src/effectslist.h
rename to src/effectslist/effectslist.h
diff --git a/src/effectslistview.cpp b/src/effectslist/effectslistview.cpp
similarity index 99%
rename from src/effectslistview.cpp
rename to src/effectslist/effectslistview.cpp
index ed0465d..d867219 100644
--- a/src/effectslistview.cpp
+++ b/src/effectslist/effectslistview.cpp
@@ -19,8 +19,9 @@
 
 
 #include "effectslistview.h"
-#include "effectstack/widgets/effectslistwidget.h"
 #include "effectslist.h"
+#include "effectslistwidget.h"
+
 #include "kdenlivesettings.h"
 
 #include <KDebug>
diff --git a/src/effectslistview.h b/src/effectslist/effectslistview.h
similarity index 100%
rename from src/effectslistview.h
rename to src/effectslist/effectslistview.h
diff --git a/src/effectstack/widgets/effectslistwidget.cpp b/src/effectslist/effectslistwidget.cpp
similarity index 99%
rename from src/effectstack/widgets/effectslistwidget.cpp
rename to src/effectslist/effectslistwidget.cpp
index e32ce0e..ad74446 100644
--- a/src/effectstack/widgets/effectslistwidget.cpp
+++ b/src/effectslist/effectslistwidget.cpp
@@ -19,7 +19,7 @@
 
 
 #include "effectslistwidget.h"
-#include "effectslist.h"
+#include "effectslist/effectslist.h"
 #include "mainwindow.h"
 
 #include <KDebug>
diff --git a/src/effectstack/widgets/effectslistwidget.h b/src/effectslist/effectslistwidget.h
similarity index 100%
rename from src/effectstack/widgets/effectslistwidget.h
rename to src/effectslist/effectslistwidget.h
diff --git a/src/initeffects.cpp b/src/effectslist/initeffects.cpp
similarity index 99%
rename from src/initeffects.cpp
rename to src/effectslist/initeffects.cpp
index 761df57..9292156 100644
--- a/src/initeffects.cpp
+++ b/src/effectslist/initeffects.cpp
@@ -18,8 +18,9 @@
  ***************************************************************************/
 
 #include "initeffects.h"
-#include "kdenlivesettings.h"
 #include "effectslist.h"
+
+#include "kdenlivesettings.h"
 #include "mainwindow.h"
 
 #include <KDebug>
@@ -773,3 +774,4 @@ QDomElement initEffects::quickParameterFill(QDomDocument & doc, const QString &n
 }
 
 #include "initeffects.moc"
+
diff --git a/src/initeffects.h b/src/effectslist/initeffects.h
similarity index 100%
rename from src/initeffects.h
rename to src/effectslist/initeffects.h
diff --git a/src/effectstack/CMakeLists.txt b/src/effectstack/CMakeLists.txt
index dd6d10f..2d891e1 100644
--- a/src/effectstack/CMakeLists.txt
+++ b/src/effectstack/CMakeLists.txt
@@ -1,10 +1,26 @@
+add_subdirectory(widgets/bezier)
 set(kdenlive_SRCS
   ${kdenlive_SRCS}
-  effectstack/parametercontainer.cpp
   effectstack/abstractcollapsiblewidget.cpp
   effectstack/collapsibleeffect.cpp
   effectstack/collapsiblegroup.cpp
+  effectstack/complexparameter.cpp
+  effectstack/dragvalue.cpp
+  effectstack/effectstackedit.cpp
   effectstack/effectstackview2.cpp
-  PARENT_SCOPE
-)
+  effectstack/geometryval.cpp
+  effectstack/graphicsscenerectmove.cpp
+  effectstack/keyframeedit.cpp
+  effectstack/keyframehelper.cpp
+  effectstack/parametercontainer.cpp
+  effectstack/parameterplotter.cpp
+  effectstack/positionedit.cpp
+  effectstack/widgets/choosecolorwidget.cpp
+  effectstack/widgets/colorpickerwidget.cpp
+  effectstack/widgets/cornerswidget.cpp
+  effectstack/widgets/doubleparameterwidget.cpp
+  effectstack/widgets/geometrywidget.cpp
+  effectstack/widgets/kis_cubic_curve.cpp
+  effectstack/widgets/kis_curve_widget.cpp
+  PARENT_SCOPE)
 
diff --git a/src/effectstack/collapsibleeffect.cpp b/src/effectstack/collapsibleeffect.cpp
index 6ef2838..ac71e73 100644
--- a/src/effectstack/collapsibleeffect.cpp
+++ b/src/effectstack/collapsibleeffect.cpp
@@ -19,7 +19,7 @@
 
 
 #include "collapsibleeffect.h"
-#include "effectslist.h"
+#include "effectslist/effectslist.h"
 #include "kdenlivesettings.h"
 #include "project/projectlist.h"
 
diff --git a/src/effectstack/complexparameter.cpp b/src/effectstack/complexparameter.cpp
index 2df3234..a6558dd 100644
--- a/src/effectstack/complexparameter.cpp
+++ b/src/effectstack/complexparameter.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          effectstack/complexparameter.cpp  -  description
+                          complexparameter.cpp  -  description
                              -------------------
     begin                : Feb 15 2008
     copyright            : (C) 2008 by Marco Gittler
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "effectstack/complexparameter.h"
+#include "complexparameter.h"
 
 #include <KDebug>
 #include <KLocalizedString>
@@ -140,3 +140,4 @@ void ComplexParameter::slotUpdateParameterList(const QStringList &l)
 }
 
 #include "complexparameter.moc"
+
diff --git a/src/effectstack/complexparameter.h b/src/effectstack/complexparameter.h
index 70e0ca4..b5a7c17 100644
--- a/src/effectstack/complexparameter.h
+++ b/src/effectstack/complexparameter.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          effectstack/complexparameter.h  -  description
+                          complexparameter.h  -  description
                              -------------------
     begin                : Feb 15 2008
     copyright            : (C) 2008 by Marco Gittler
diff --git a/src/effectstack/dragvalue.cpp b/src/effectstack/dragvalue.cpp
index 78014d5..87e30cf 100644
--- a/src/effectstack/dragvalue.cpp
+++ b/src/effectstack/dragvalue.cpp
@@ -17,7 +17,8 @@
  *   along with Kdenlive.  If not, see <http://www.gnu.org/licenses/>.     *
  ***************************************************************************/
 
-#include "effectstack/dragvalue.h"
+#include "dragvalue.h"
+
 #include "kdenlivesettings.h"
 
 #include <math.h>
diff --git a/src/effectstack/effectstackedit.cpp b/src/effectstack/effectstackedit.cpp
index a35112b..39b0ef6 100644
--- a/src/effectstack/effectstackedit.cpp
+++ b/src/effectstack/effectstackedit.cpp
@@ -15,10 +15,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "effectstack/effectstackedit.h"
-#include "effectstack/effectstackview2.h"
-#include "effectslist.h"
+#include "effectstackedit.h"
+#include "effectstackview2.h"
+
 #include "monitor/monitor.h"
+#include "effectslist/effectslist.h"
 #include "kdenlivesettings.h"
 
 #include <KDebug>
diff --git a/src/effectstack/effectstackedit.h b/src/effectstack/effectstackedit.h
index fcf4859..dd71553 100644
--- a/src/effectstack/effectstackedit.h
+++ b/src/effectstack/effectstackedit.h
@@ -18,10 +18,11 @@
 #ifndef EFFECTSTACKEDIT_H
 #define EFFECTSTACKEDIT_H
 
+#include "keyframeedit.h"
+#include "parametercontainer.h"
+
 #include "definitions.h"
 #include "timecode.h"
-#include "effectstack/keyframeedit.h"
-#include "effectstack/parametercontainer.h"
 
 #include <QWidget>
 #include <QDomElement>
diff --git a/src/effectstack/effectstackview2.cpp b/src/effectstack/effectstackview2.cpp
index f7be515..a22f10e 100644
--- a/src/effectstack/effectstackview2.cpp
+++ b/src/effectstack/effectstackview2.cpp
@@ -15,19 +15,19 @@
  *                                                                         *
  ***************************************************************************/
 
-
+#include "collapsibleeffect.h"
+#include "collapsiblegroup.h"
 #include "effectstackview2.h"
-#include "effectslist.h"
-#include "timeline/clipitem.h"
+
+#include "kdenlivesettings.h"
 #include "mainwindow.h"
+#include "kthumb.h"
 #include "doc/docclipbase.h"
 #include "project/projectlist.h"
-#include "kthumb.h"
+#include "effectslist/effectslist.h"
+#include "timeline/clipitem.h"
 #include "widgets/monitoreditwidget.h"
 #include "monitor/monitorscene.h"
-#include "kdenlivesettings.h"
-#include "collapsibleeffect.h"
-#include "collapsiblegroup.h"
 
 #include <KDebug>
 #include <KLocalizedString>
diff --git a/src/effectstack/geometryval.cpp b/src/effectstack/geometryval.cpp
index 9e91904..5785928 100644
--- a/src/effectstack/geometryval.cpp
+++ b/src/effectstack/geometryval.cpp
@@ -15,8 +15,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "effectstack/geometryval.h"
+#include "geometryval.h"
 #include "graphicsscenerectmove.h"
+
 #include "kdenlivesettings.h"
 
 #include <KDebug>
diff --git a/src/effectstack/geometryval.h b/src/effectstack/geometryval.h
index 4dd275c..a7142bd 100644
--- a/src/effectstack/geometryval.h
+++ b/src/effectstack/geometryval.h
@@ -18,6 +18,11 @@
 #ifndef GEOMETRYVAL_H
 #define GEOMETRYVAL_H
 
+#include "keyframehelper.h"
+
+#include "definitions.h"
+#include "timecodedisplay.h"
+#include "ui_geometryval_ui.h"
 
 #include <QWidget>
 #include <QDomElement>
@@ -25,11 +30,6 @@
 
 #include <mlt++/Mlt.h>
 
-#include "ui_geometryval_ui.h"
-#include "definitions.h"
-#include "effectstack/keyframehelper.h"
-#include "timecodedisplay.h"
-
 class GraphicsSceneRectMove;
 class QGraphicsRectItem;
 class QGraphicsView;
diff --git a/src/graphicsscenerectmove.cpp b/src/effectstack/graphicsscenerectmove.cpp
similarity index 100%
rename from src/graphicsscenerectmove.cpp
rename to src/effectstack/graphicsscenerectmove.cpp
diff --git a/src/graphicsscenerectmove.h b/src/effectstack/graphicsscenerectmove.h
similarity index 100%
rename from src/graphicsscenerectmove.h
rename to src/effectstack/graphicsscenerectmove.h
diff --git a/src/effectstack/keyframeedit.cpp b/src/effectstack/keyframeedit.cpp
index a795e79..34040d8 100644
--- a/src/effectstack/keyframeedit.cpp
+++ b/src/effectstack/keyframeedit.cpp
@@ -15,9 +15,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "effectstack/keyframeedit.h"
-#include "effectstack/widgets/doubleparameterwidget.h"
-#include "effectstack/positionedit.h"
+#include "keyframeedit.h"
+#include "positionedit.h"
+#include "widgets/doubleparameterwidget.h"
+
 #include "kdenlivesettings.h"
 
 #include <KDebug>
diff --git a/src/effectstack/keyframeedit.h b/src/effectstack/keyframeedit.h
index bb908bb..874203c 100644
--- a/src/effectstack/keyframeedit.h
+++ b/src/effectstack/keyframeedit.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          effectstack/keyframeedit.h  -  description
+                          keyframeedit.h  -  description
                              -------------------
     begin                : 22 Jun 2009
     copyright            : (C) 2008 by Jean-Baptiste Mardelle
@@ -18,6 +18,10 @@
 #ifndef KEYFRAMEEDIT_H
 #define KEYFRAMEEDIT_H
 
+#include "keyframehelper.h"
+
+#include "ui_keyframeeditor_ui.h"
+#include "definitions.h"
 
 #include <QWidget>
 #include <QDomElement>
@@ -27,10 +31,6 @@
 
 class PositionEdit;
 
-#include "ui_keyframeeditor_ui.h"
-#include "definitions.h"
-#include "effectstack/keyframehelper.h"
-
 class KeyItemDelegate: public QItemDelegate
 {
     Q_OBJECT
@@ -146,3 +146,4 @@ signals:
 };
 
 #endif
+
diff --git a/src/effectstack/keyframehelper.cpp b/src/effectstack/keyframehelper.cpp
index 4c06a4d..6ed96a1 100644
--- a/src/effectstack/keyframehelper.cpp
+++ b/src/effectstack/keyframehelper.cpp
@@ -18,7 +18,8 @@
  ***************************************************************************/
 
 
-#include "effectstack/keyframehelper.h"
+#include "keyframehelper.h"
+
 #include "kdenlivesettings.h"
 #include "definitions.h"
 
diff --git a/src/effectstack/parametercontainer.cpp b/src/effectstack/parametercontainer.cpp
index 2bde185..df3e3c7 100644
--- a/src/effectstack/parametercontainer.cpp
+++ b/src/effectstack/parametercontainer.cpp
@@ -19,32 +19,34 @@
 
 #include "parametercontainer.h"
 
+#include "complexparameter.h"
+#include "geometryval.h"
+#include "positionedit.h"
+#include "dragvalue.h"
+#include "widgets/kis_curve_widget.h"
+#include "widgets/kis_cubic_curve.h"
+#include "widgets/choosecolorwidget.h"
+#include "widgets/geometrywidget.h"
+#include "widgets/doubleparameterwidget.h"
+#include "widgets/cornerswidget.h"
+#include "widgets/bezier/beziersplinewidget.h"
+
+#include "kdenlivesettings.h"
+#include "mainwindow.h"
+#include "colortools.h"
+#include "dialogs/profilesdialog.h"
+#include "project/projectlist.h"
+#include "timeline/customtrackview.h"
+#ifdef USE_QJSON
+#include "onmonitoritems/rotoscoping/rotowidget.h"
+#endif
+
 #include "ui_listval_ui.h"
 #include "ui_boolval_ui.h"
 #include "ui_wipeval_ui.h"
 #include "ui_urlval_ui.h"
 #include "ui_keywordval_ui.h"
 #include "ui_fontval_ui.h"
-#include "effectstack/complexparameter.h"
-#include "effectstack/geometryval.h"
-#include "effectstack/positionedit.h"
-#include "effectstack/widgets/kis_curve_widget.h"
-#include "effectstack/widgets/kis_cubic_curve.h"
-#include "effectstack/widgets/choosecolorwidget.h"
-#include "effectstack/widgets/geometrywidget.h"
-#include "colortools.h"
-#include "effectstack/widgets/doubleparameterwidget.h"
-#include "effectstack/widgets/cornerswidget.h"
-#include "effectstack/dragvalue.h"
-#include "beziercurve/beziersplinewidget.h"
-#ifdef USE_QJSON
-#include "rotoscoping/rotowidget.h"
-#endif
-#include "kdenlivesettings.h"
-#include "profilesdialog.h"
-#include "project/projectlist.h"
-#include "mainwindow.h"
-#include "../timeline/customtrackview.h"
 
 #include <KUrlRequester>
 #include <KFileDialog>
diff --git a/src/effectstack/parametercontainer.h b/src/effectstack/parametercontainer.h
index 2860d1b..4890cb7 100644
--- a/src/effectstack/parametercontainer.h
+++ b/src/effectstack/parametercontainer.h
@@ -20,7 +20,7 @@
 #ifndef PARAMETERCONTAINER_H
 #define PARAMETERCONTAINER_H
 
-#include "effectstack/keyframeedit.h"
+#include "keyframeedit.h"
 
 class GeometryWidget;
 class Monitor;
diff --git a/src/parameterplotter.cpp b/src/effectstack/parameterplotter.cpp
similarity index 100%
rename from src/parameterplotter.cpp
rename to src/effectstack/parameterplotter.cpp
diff --git a/src/parameterplotter.h b/src/effectstack/parameterplotter.h
similarity index 100%
rename from src/parameterplotter.h
rename to src/effectstack/parameterplotter.h
diff --git a/src/effectstack/positionedit.cpp b/src/effectstack/positionedit.cpp
index 20bbc26..5005924 100644
--- a/src/effectstack/positionedit.cpp
+++ b/src/effectstack/positionedit.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          effectstack/positionedit.cpp  -  description
+                          positionedit.cpp  -  description
                              -------------------
     begin                : 03 Aug 2008
     copyright            : (C) 2008 by Marco Gittler
@@ -15,7 +15,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "effectstack/positionedit.h"
+#include "positionedit.h"
+
 #include "timecodedisplay.h"
 #include "kdenlivesettings.h"
 
diff --git a/src/effectstack/positionedit.h b/src/effectstack/positionedit.h
index ca1b6e7..6590f3e 100644
--- a/src/effectstack/positionedit.h
+++ b/src/effectstack/positionedit.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          effectstack/positionedit.h  -  description
+                          positionedit.h  -  description
                              -------------------
     begin                : 03 Aug 2008
     copyright            : (C) 2008 by Marco Gittler
diff --git a/src/effectstack/widgets/bezier/CMakeLists.txt b/src/effectstack/widgets/bezier/CMakeLists.txt
new file mode 100644
index 0000000..fad8d39
--- /dev/null
+++ b/src/effectstack/widgets/bezier/CMakeLists.txt
@@ -0,0 +1,8 @@
+set(kdenlive_SRCS
+  ${kdenlive_SRCS}
+  effectstack/widgets/bezier/beziersplineeditor.cpp
+  effectstack/widgets/bezier/beziersplinewidget.cpp
+  effectstack/widgets/bezier/bpoint.cpp
+  effectstack/widgets/bezier/cubicbezierspline.cpp
+  PARENT_SCOPE
+)
diff --git a/src/beziercurve/beziersplineeditor.cpp b/src/effectstack/widgets/bezier/beziersplineeditor.cpp
similarity index 100%
rename from src/beziercurve/beziersplineeditor.cpp
rename to src/effectstack/widgets/bezier/beziersplineeditor.cpp
diff --git a/src/beziercurve/beziersplineeditor.h b/src/effectstack/widgets/bezier/beziersplineeditor.h
similarity index 100%
rename from src/beziercurve/beziersplineeditor.h
rename to src/effectstack/widgets/bezier/beziersplineeditor.h
diff --git a/src/beziercurve/beziersplinewidget.cpp b/src/effectstack/widgets/bezier/beziersplinewidget.cpp
similarity index 100%
rename from src/beziercurve/beziersplinewidget.cpp
rename to src/effectstack/widgets/bezier/beziersplinewidget.cpp
diff --git a/src/beziercurve/beziersplinewidget.h b/src/effectstack/widgets/bezier/beziersplinewidget.h
similarity index 100%
rename from src/beziercurve/beziersplinewidget.h
rename to src/effectstack/widgets/bezier/beziersplinewidget.h
diff --git a/src/beziercurve/bpoint.cpp b/src/effectstack/widgets/bezier/bpoint.cpp
similarity index 100%
rename from src/beziercurve/bpoint.cpp
rename to src/effectstack/widgets/bezier/bpoint.cpp
diff --git a/src/beziercurve/bpoint.h b/src/effectstack/widgets/bezier/bpoint.h
similarity index 100%
rename from src/beziercurve/bpoint.h
rename to src/effectstack/widgets/bezier/bpoint.h
diff --git a/src/beziercurve/cubicbezierspline.cpp b/src/effectstack/widgets/bezier/cubicbezierspline.cpp
similarity index 100%
rename from src/beziercurve/cubicbezierspline.cpp
rename to src/effectstack/widgets/bezier/cubicbezierspline.cpp
diff --git a/src/beziercurve/cubicbezierspline.h b/src/effectstack/widgets/bezier/cubicbezierspline.h
similarity index 100%
rename from src/beziercurve/cubicbezierspline.h
rename to src/effectstack/widgets/bezier/cubicbezierspline.h
diff --git a/src/effectstack/widgets/choosecolorwidget.cpp b/src/effectstack/widgets/choosecolorwidget.cpp
index 8ddfc54..01f8cf1 100644
--- a/src/effectstack/widgets/choosecolorwidget.cpp
+++ b/src/effectstack/widgets/choosecolorwidget.cpp
@@ -18,8 +18,8 @@
  ***************************************************************************/
 
 
-#include "effectstack/widgets/choosecolorwidget.h"
-#include "effectstack/widgets/colorpickerwidget.h"
+#include "choosecolorwidget.h"
+#include "colorpickerwidget.h"
 
 #include <QLabel>
 #include <QHBoxLayout>
diff --git a/src/effectstack/widgets/cornerswidget.cpp b/src/effectstack/widgets/cornerswidget.cpp
index a3ac848..bc52f47 100644
--- a/src/effectstack/widgets/cornerswidget.cpp
+++ b/src/effectstack/widgets/cornerswidget.cpp
@@ -18,12 +18,13 @@
  ***************************************************************************/
 
 #include "cornerswidget.h"
+
+#include "renderer.h"
+#include "kdenlivesettings.h"
 #include "monitor/monitor.h"
 #include "monitor/monitorscene.h"
 #include "widgets/monitoreditwidget.h"
 #include "onmonitoritems/onmonitorcornersitem.h"
-#include "renderer.h"
-#include "kdenlivesettings.h"
 
 #include <QGraphicsView>
 #include <QGridLayout>
diff --git a/src/effectstack/widgets/geometrywidget.cpp b/src/effectstack/widgets/geometrywidget.cpp
index 6864287..bad6d32 100644
--- a/src/effectstack/widgets/geometrywidget.cpp
+++ b/src/effectstack/widgets/geometrywidget.cpp
@@ -19,16 +19,17 @@
 
 
 #include "geometrywidget.h"
-#include "monitor/monitor.h"
-#include "renderer.h"
+
+#include "effectstack/dragvalue.h"
 #include "effectstack/keyframehelper.h"
+#include "kdenlivesettings.h"
+#include "renderer.h"
 #include "timecodedisplay.h"
+#include "monitor/monitor.h"
 #include "monitor/monitorscene.h"
 #include "widgets/monitoreditwidget.h"
 #include "onmonitoritems/onmonitorrectitem.h"
 #include "onmonitoritems/onmonitorpathitem.h"
-#include "kdenlivesettings.h"
-#include "effectstack/dragvalue.h"
 
 #include <QtCore>
 #include <QGraphicsView>
diff --git a/src/effectstack/widgets/kis_cubic_curve.cpp b/src/effectstack/widgets/kis_cubic_curve.cpp
index 074f58e..e8fe31d 100644
--- a/src/effectstack/widgets/kis_cubic_curve.cpp
+++ b/src/effectstack/widgets/kis_cubic_curve.cpp
@@ -18,7 +18,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include "effectstack/widgets/kis_cubic_curve.h"
+#include "kis_cubic_curve.h"
 
 #include <QPointF>
 #include <QList>
diff --git a/src/effectstack/widgets/kis_curve_widget_p.h b/src/effectstack/widgets/kis_curve_widget_p.h
index f375528..035742d 100644
--- a/src/effectstack/widgets/kis_curve_widget_p.h
+++ b/src/effectstack/widgets/kis_curve_widget_p.h
@@ -18,7 +18,7 @@
  */
 #ifndef _KIS_CURVE_WIDGET_P_H_
 #define _KIS_CURVE_WIDGET_P_H_
-#include "effectstack/widgets/kis_cubic_curve.h"
+#include "kis_cubic_curve.h"
 
 enum enumState {
     ST_NORMAL,
diff --git a/src/events.h b/src/events.h
deleted file mode 100644
index db7d9eb..0000000
--- a/src/events.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/***************************************************************************
-                          events.h  -  description
-                             -------------------
-    begin                : Feb 15 2008
-    copyright            : (C) 2008 by Marco Gittler
-    email                : g....@fr...
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef EVENTS_H
-#define EVENTS_H
-
-#include <QEvent>
-
-#include "gentime.h"
-
-class ProgressEvent : public QEvent
-{
-public:
-    ProgressEvent(int value, QEvent::Type eventType)
-            : QEvent(eventType), m_val(value) {};
-    int value() const {
-        return m_val;
-    };
-private:
-    int m_val;
-
-};
-
-#endif
diff --git a/src/jogshuttle/jogaction.cpp b/src/jogshuttle/jogaction.cpp
index 75b4ce8..8d2e1bf 100644
--- a/src/jogshuttle/jogaction.cpp
+++ b/src/jogshuttle/jogaction.cpp
@@ -17,7 +17,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include "jogshuttle/jogaction.h"
+#include "jogaction.h"
 #include "monitor/monitormanager.h"
 
 #include <stdio.h>
diff --git a/src/jogshuttle/jogaction.h b/src/jogshuttle/jogaction.h
index ea617ef..be48308 100644
--- a/src/jogshuttle/jogaction.h
+++ b/src/jogshuttle/jogaction.h
@@ -20,11 +20,10 @@
 #ifndef JOG_SHUTTLE_ACTION_H
 #define JOG_SHUTTLE_ACTION_H
 
+#inc...
 
[truncated message content]