diff --git a/src/bindings/CMakeLists.txt b/bindings/CMakeLists.txt
similarity index 100%
rename from src/bindings/CMakeLists.txt
rename to bindings/CMakeLists.txt
diff --git a/src/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt
similarity index 100%
rename from src/bindings/python/CMakeLists.txt
rename to bindings/python/CMakeLists.txt
diff --git a/src/bindings/python/openshot.i b/bindings/python/openshot.i
similarity index 100%
rename from src/bindings/python/openshot.i
rename to bindings/python/openshot.i
diff --git a/src/bindings/ruby/CMakeLists.txt b/bindings/ruby/CMakeLists.txt
similarity index 100%
rename from src/bindings/ruby/CMakeLists.txt
rename to bindings/ruby/CMakeLists.txt
diff --git a/src/bindings/ruby/openshot.i b/bindings/ruby/openshot.i
similarity index 100%
rename from src/bindings/ruby/openshot.i
rename to bindings/ruby/openshot.i
diff --git a/src/examples/Example.cpp b/examples/Example.cpp
similarity index 100%
rename from src/examples/Example.cpp
rename to examples/Example.cpp
diff --git a/src/examples/Example.py b/examples/Example.py
similarity index 100%
rename from src/examples/Example.py
rename to examples/Example.py
diff --git a/src/examples/Example.rb b/examples/Example.rb
similarity index 100%
rename from src/examples/Example.rb
rename to examples/Example.rb
diff --git a/src/examples/ExampleBlackmagic.cpp b/examples/ExampleBlackmagic.cpp
similarity index 100%
rename from src/examples/ExampleBlackmagic.cpp
rename to examples/ExampleBlackmagic.cpp
diff --git a/src/examples/ExampleHtml.cpp b/examples/ExampleHtml.cpp
similarity index 100%
rename from src/examples/ExampleHtml.cpp
rename to examples/ExampleHtml.cpp
diff --git a/src/examples/ExampleHtml.py b/examples/ExampleHtml.py
similarity index 100%
rename from src/examples/ExampleHtml.py
rename to examples/ExampleHtml.py
diff --git a/src/examples/OpenShot Wipe Tests.py b/examples/OpenShot Wipe Tests.py
similarity index 100%
rename from src/examples/OpenShot Wipe Tests.py
rename to examples/OpenShot Wipe Tests.py
diff --git a/src/examples/back.png b/examples/back.png
similarity index 100%
rename from src/examples/back.png
rename to examples/back.png
diff --git a/src/examples/final-composite.png b/examples/final-composite.png
similarity index 100%
rename from src/examples/final-composite.png
rename to examples/final-composite.png
diff --git a/src/examples/front.png b/examples/front.png
similarity index 100%
rename from src/examples/front.png
rename to examples/front.png
diff --git a/src/examples/front3.png b/examples/front3.png
similarity index 100%
rename from src/examples/front3.png
rename to examples/front3.png
diff --git a/src/examples/interlaced.png b/examples/interlaced.png
similarity index 100%
rename from src/examples/interlaced.png
rename to examples/interlaced.png
diff --git a/src/examples/mask.png b/examples/mask.png
similarity index 100%
rename from src/examples/mask.png
rename to examples/mask.png
diff --git a/src/examples/mask2.png b/examples/mask2.png
similarity index 100%
rename from src/examples/mask2.png
rename to examples/mask2.png
diff --git a/src/examples/output-final.png b/examples/output-final.png
similarity index 100%
rename from src/examples/output-final.png
rename to examples/output-final.png
diff --git a/src/examples/piano-mono.wav b/examples/piano-mono.wav
similarity index 100%
rename from src/examples/piano-mono.wav
rename to examples/piano-mono.wav
diff --git a/src/examples/piano.wav b/examples/piano.wav
similarity index 100%
rename from src/examples/piano.wav
rename to examples/piano.wav
diff --git a/src/Qt/demo/main.cpp b/examples/qt-demo/main.cpp
similarity index 100%
rename from src/Qt/demo/main.cpp
rename to examples/qt-demo/main.cpp
diff --git a/src/examples/sintel_trailer-720p.mp4 b/examples/sintel_trailer-720p.mp4
similarity index 100%
rename from src/examples/sintel_trailer-720p.mp4
rename to examples/sintel_trailer-720p.mp4
diff --git a/src/examples/test.mp4 b/examples/test.mp4
similarity index 100%
rename from src/examples/test.mp4
rename to examples/test.mp4
diff --git a/src/examples/test.wav b/examples/test.wav
similarity index 100%
rename from src/examples/test.wav
rename to examples/test.wav
diff --git a/src/examples/test1.mp4 b/examples/test1.mp4
similarity index 100%
rename from src/examples/test1.mp4
rename to examples/test1.mp4
diff --git a/include/AudioBufferSource.h b/src/AudioBufferSource.h
similarity index 100%
rename from include/AudioBufferSource.h
rename to src/AudioBufferSource.h
diff --git a/include/AudioDeviceInfo.h b/src/AudioDeviceInfo.h
similarity index 100%
rename from include/AudioDeviceInfo.h
rename to src/AudioDeviceInfo.h
diff --git a/include/AudioReaderSource.h b/src/AudioReaderSource.h
similarity index 100%
rename from include/AudioReaderSource.h
rename to src/AudioReaderSource.h
diff --git a/include/AudioResampler.h b/src/AudioResampler.h
similarity index 100%
rename from include/AudioResampler.h
rename to src/AudioResampler.h
diff --git a/include/CacheBase.h b/src/CacheBase.h
similarity index 100%
rename from include/CacheBase.h
rename to src/CacheBase.h
diff --git a/include/CacheDisk.h b/src/CacheDisk.h
similarity index 100%
rename from include/CacheDisk.h
rename to src/CacheDisk.h
diff --git a/include/CacheMemory.h b/src/CacheMemory.h
similarity index 100%
rename from include/CacheMemory.h
rename to src/CacheMemory.h
diff --git a/include/ChannelLayouts.h b/src/ChannelLayouts.h
similarity index 100%
rename from include/ChannelLayouts.h
rename to src/ChannelLayouts.h
diff --git a/include/ChunkReader.h b/src/ChunkReader.h
similarity index 100%
rename from include/ChunkReader.h
rename to src/ChunkReader.h
diff --git a/include/ChunkWriter.h b/src/ChunkWriter.h
similarity index 100%
rename from include/ChunkWriter.h
rename to src/ChunkWriter.h
diff --git a/include/Clip.h b/src/Clip.h
similarity index 100%
rename from include/Clip.h
rename to src/Clip.h
diff --git a/include/ClipBase.h b/src/ClipBase.h
similarity index 100%
rename from include/ClipBase.h
rename to src/ClipBase.h
diff --git a/include/Color.h b/src/Color.h
similarity index 100%
rename from include/Color.h
rename to src/Color.h
diff --git a/include/Coordinate.h b/src/Coordinate.h
similarity index 100%
rename from include/Coordinate.h
rename to src/Coordinate.h
diff --git a/include/CrashHandler.h b/src/CrashHandler.h
similarity index 100%
rename from include/CrashHandler.h
rename to src/CrashHandler.h
diff --git a/include/DecklinkInput.h b/src/DecklinkInput.h
similarity index 100%
rename from include/DecklinkInput.h
rename to src/DecklinkInput.h
diff --git a/include/DecklinkOutput.h b/src/DecklinkOutput.h
similarity index 100%
rename from include/DecklinkOutput.h
rename to src/DecklinkOutput.h
diff --git a/include/DecklinkReader.h b/src/DecklinkReader.h
similarity index 100%
rename from include/DecklinkReader.h
rename to src/DecklinkReader.h
diff --git a/include/DecklinkWriter.h b/src/DecklinkWriter.h
similarity index 100%
rename from include/DecklinkWriter.h
rename to src/DecklinkWriter.h
diff --git a/include/DummyReader.h b/src/DummyReader.h
similarity index 100%
rename from include/DummyReader.h
rename to src/DummyReader.h
diff --git a/include/EffectBase.h b/src/EffectBase.h
similarity index 100%
rename from include/EffectBase.h
rename to src/EffectBase.h
diff --git a/include/EffectInfo.h b/src/EffectInfo.h
similarity index 100%
rename from include/EffectInfo.h
rename to src/EffectInfo.h
diff --git a/include/Effects.h b/src/Effects.h
similarity index 100%
rename from include/Effects.h
rename to src/Effects.h
diff --git a/include/Enums.h b/src/Enums.h
similarity index 100%
rename from include/Enums.h
rename to src/Enums.h
diff --git a/include/Exceptions.h b/src/Exceptions.h
similarity index 100%
rename from include/Exceptions.h
rename to src/Exceptions.h
diff --git a/include/FFmpegReader.h b/src/FFmpegReader.h
similarity index 100%
rename from include/FFmpegReader.h
rename to src/FFmpegReader.h
diff --git a/include/FFmpegUtilities.h b/src/FFmpegUtilities.h
similarity index 100%
rename from include/FFmpegUtilities.h
rename to src/FFmpegUtilities.h
diff --git a/include/FFmpegWriter.h b/src/FFmpegWriter.h
similarity index 100%
rename from include/FFmpegWriter.h
rename to src/FFmpegWriter.h
diff --git a/include/Fraction.h b/src/Fraction.h
similarity index 100%
rename from include/Fraction.h
rename to src/Fraction.h
diff --git a/include/Frame.h b/src/Frame.h
similarity index 100%
rename from include/Frame.h
rename to src/Frame.h
diff --git a/include/FrameMapper.h b/src/FrameMapper.h
similarity index 100%
rename from include/FrameMapper.h
rename to src/FrameMapper.h
diff --git a/include/ImageReader.h b/src/ImageReader.h
similarity index 100%
rename from include/ImageReader.h
rename to src/ImageReader.h
diff --git a/include/ImageWriter.h b/src/ImageWriter.h
similarity index 100%
rename from include/ImageWriter.h
rename to src/ImageWriter.h
diff --git a/include/Json.h b/src/Json.h
similarity index 100%
rename from include/Json.h
rename to src/Json.h
diff --git a/include/KeyFrame.h b/src/KeyFrame.h
similarity index 100%
rename from include/KeyFrame.h
rename to src/KeyFrame.h
diff --git a/include/MagickUtilities.h b/src/MagickUtilities.h
similarity index 100%
rename from include/MagickUtilities.h
rename to src/MagickUtilities.h
diff --git a/include/OpenMPUtilities.h b/src/OpenMPUtilities.h
similarity index 100%
rename from include/OpenMPUtilities.h
rename to src/OpenMPUtilities.h
diff --git a/include/OpenShot.h b/src/OpenShot.h
similarity index 100%
rename from include/OpenShot.h
rename to src/OpenShot.h
diff --git a/include/OpenShotVersion.h.in b/src/OpenShotVersion.h.in
similarity index 100%
rename from include/OpenShotVersion.h.in
rename to src/OpenShotVersion.h.in
diff --git a/include/PlayerBase.h b/src/PlayerBase.h
similarity index 100%
rename from include/PlayerBase.h
rename to src/PlayerBase.h
diff --git a/include/Point.h b/src/Point.h
similarity index 100%
rename from include/Point.h
rename to src/Point.h
diff --git a/include/Profiles.h b/src/Profiles.h
similarity index 100%
rename from include/Profiles.h
rename to src/Profiles.h
diff --git a/include/Qt/AudioPlaybackThread.h b/src/Qt/AudioPlaybackThread.h
similarity index 100%
rename from include/Qt/AudioPlaybackThread.h
rename to src/Qt/AudioPlaybackThread.h
diff --git a/include/Qt/PlayerDemo.h b/src/Qt/PlayerDemo.h
similarity index 100%
rename from include/Qt/PlayerDemo.h
rename to src/Qt/PlayerDemo.h
diff --git a/include/Qt/PlayerPrivate.h b/src/Qt/PlayerPrivate.h
similarity index 100%
rename from include/Qt/PlayerPrivate.h
rename to src/Qt/PlayerPrivate.h
diff --git a/include/Qt/VideoCacheThread.h b/src/Qt/VideoCacheThread.h
similarity index 100%
rename from include/Qt/VideoCacheThread.h
rename to src/Qt/VideoCacheThread.h
diff --git a/include/Qt/VideoPlaybackThread.h b/src/Qt/VideoPlaybackThread.h
similarity index 100%
rename from include/Qt/VideoPlaybackThread.h
rename to src/Qt/VideoPlaybackThread.h
diff --git a/include/Qt/VideoRenderWidget.h b/src/Qt/VideoRenderWidget.h
similarity index 100%
rename from include/Qt/VideoRenderWidget.h
rename to src/Qt/VideoRenderWidget.h
diff --git a/include/Qt/VideoRenderer.h b/src/Qt/VideoRenderer.h
similarity index 100%
rename from include/Qt/VideoRenderer.h
rename to src/Qt/VideoRenderer.h
diff --git a/include/QtHtmlReader.h b/src/QtHtmlReader.h
similarity index 100%
rename from include/QtHtmlReader.h
rename to src/QtHtmlReader.h
diff --git a/include/QtImageReader.h b/src/QtImageReader.h
similarity index 100%
rename from include/QtImageReader.h
rename to src/QtImageReader.h
diff --git a/include/QtPlayer.h b/src/QtPlayer.h
similarity index 100%
rename from include/QtPlayer.h
rename to src/QtPlayer.h
diff --git a/include/QtTextReader.h b/src/QtTextReader.h
similarity index 100%
rename from include/QtTextReader.h
rename to src/QtTextReader.h
diff --git a/include/QtUtilities.h b/src/QtUtilities.h
similarity index 100%
rename from include/QtUtilities.h
rename to src/QtUtilities.h
diff --git a/include/ReaderBase.h b/src/ReaderBase.h
similarity index 100%
rename from include/ReaderBase.h
rename to src/ReaderBase.h
diff --git a/include/RendererBase.h b/src/RendererBase.h
similarity index 100%
rename from include/RendererBase.h
rename to src/RendererBase.h
diff --git a/include/Settings.h b/src/Settings.h
similarity index 100%
rename from include/Settings.h
rename to src/Settings.h
diff --git a/include/TextReader.h b/src/TextReader.h
similarity index 100%
rename from include/TextReader.h
rename to src/TextReader.h
diff --git a/include/Timeline.h b/src/Timeline.h
similarity index 100%
rename from include/Timeline.h
rename to src/Timeline.h
diff --git a/include/WriterBase.h b/src/WriterBase.h
similarity index 100%
rename from include/WriterBase.h
rename to src/WriterBase.h
diff --git a/include/ZmqLogger.h b/src/ZmqLogger.h
similarity index 100%
rename from include/ZmqLogger.h
rename to src/ZmqLogger.h
diff --git a/include/effects/Bars.h b/src/effects/Bars.h
similarity index 100%
rename from include/effects/Bars.h
rename to src/effects/Bars.h
diff --git a/include/effects/Blur.h b/src/effects/Blur.h
similarity index 100%
rename from include/effects/Blur.h
rename to src/effects/Blur.h
diff --git a/include/effects/Brightness.h b/src/effects/Brightness.h
similarity index 100%
rename from include/effects/Brightness.h
rename to src/effects/Brightness.h
diff --git a/include/effects/ChromaKey.h b/src/effects/ChromaKey.h
similarity index 100%
rename from include/effects/ChromaKey.h
rename to src/effects/ChromaKey.h
diff --git a/include/effects/ColorShift.h b/src/effects/ColorShift.h
similarity index 100%
rename from include/effects/ColorShift.h
rename to src/effects/ColorShift.h
diff --git a/include/effects/Crop.h b/src/effects/Crop.h
similarity index 100%
rename from include/effects/Crop.h
rename to src/effects/Crop.h
diff --git a/include/effects/Deinterlace.h b/src/effects/Deinterlace.h
similarity index 100%
rename from include/effects/Deinterlace.h
rename to src/effects/Deinterlace.h
diff --git a/include/effects/Hue.h b/src/effects/Hue.h
similarity index 100%
rename from include/effects/Hue.h
rename to src/effects/Hue.h
diff --git a/include/effects/Mask.h b/src/effects/Mask.h
similarity index 100%
rename from include/effects/Mask.h
rename to src/effects/Mask.h
diff --git a/include/effects/Negate.h b/src/effects/Negate.h
similarity index 100%
rename from include/effects/Negate.h
rename to src/effects/Negate.h
diff --git a/include/effects/Pixelate.h b/src/effects/Pixelate.h
similarity index 100%
rename from include/effects/Pixelate.h
rename to src/effects/Pixelate.h
diff --git a/include/effects/Saturation.h b/src/effects/Saturation.h
similarity index 100%
rename from include/effects/Saturation.h
rename to src/effects/Saturation.h
diff --git a/include/effects/Shift.h b/src/effects/Shift.h
similarity index 100%
rename from include/effects/Shift.h
rename to src/effects/Shift.h
diff --git a/include/effects/Wave.h b/src/effects/Wave.h
similarity index 100%
rename from include/effects/Wave.h
rename to src/effects/Wave.h