diff --git a/Vocaluxe/Base/CVideo.cs b/Vocaluxe/Base/CVideo.cs
index 5bb596e9..3d57cbd3 100644
--- a/Vocaluxe/Base/CVideo.cs
+++ b/Vocaluxe/Base/CVideo.cs
@@ -15,8 +15,6 @@
 // along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
 #endregion
 
-using System.Diagnostics;
-using System.Drawing;
 using Vocaluxe.Lib.Video;
 using VocaluxeLib;
 using VocaluxeLib.Draw;
@@ -115,94 +113,4 @@ namespace Vocaluxe.Base
 
         #endregion VideoDecoder
     }
-
-    class CVideoPlayer
-    {
-        private CTexture _VideoTexture;
-        private int _VideoStream;
-        private readonly Stopwatch _VideoTimer = new Stopwatch();
-        private bool _Finished;
-        private bool _Loaded;
-
-        public bool IsFinished
-        {
-            get { return _Finished || !_Loaded; }
-        }
-
-        public bool Loop
-        {
-            set { CVideo.SetLoop(_VideoStream, value); }
-        }
-
-        public void Load(string videoName)
-        {
-            _VideoStream = CVideo.Load(CTheme.GetVideoFilePath(videoName, -1));
-            _Loaded = true;
-            CVideo.Pause(_VideoStream);
-        }
-
-        public void Start()
-        {
-            _VideoTimer.Reset();
-            _Finished = false;
-            //CVideo.VdSkip(_VideoStream, 0f, 0f);
-            _VideoTimer.Start();
-            CVideo.Resume(_VideoStream);
-        }
-
-        public void Pause()
-        {
-            CVideo.Pause(_VideoStream);
-            _VideoTimer.Stop();
-        }
-
-        public void Resume()
-        {
-            CVideo.Resume(_VideoStream);
-            _VideoTimer.Start();
-        }
-
-        public void Draw()
-        {
-            if (!_Finished)
-            {
-                float videoTime = _VideoTimer.ElapsedMilliseconds / 1000f;
-                _Finished = CVideo.Finished(_VideoStream);
-
-                CVideo.GetFrame(_VideoStream, ref _VideoTexture, videoTime, out videoTime);
-            }
-            if (_VideoTexture == null)
-                return;
-            var bounds = new RectangleF(0f, 0f, CSettings.RenderW, CSettings.RenderH);
-            RectangleF rect;
-            CHelper.SetRect(bounds, out rect, _VideoTexture.OrigAspect, EAspect.Crop);
-
-            CDraw.DrawTexture(_VideoTexture, new SRectF(rect.X, rect.Y, rect.Width, rect.Height, CSettings.ZFar / 4));
-        }
-
-        public void PreLoad()
-        {
-            bool paused = _VideoTimer.IsRunning;
-            if (paused)
-                CVideo.Resume(_VideoStream);
-            float videoTime = 0f;
-            while (_VideoTexture == null && videoTime < 1f)
-            {
-                float dummy;
-                CVideo.GetFrame(_VideoStream, ref _VideoTexture, 0, out dummy);
-                videoTime += 0.05f;
-            }
-            if (paused)
-                CVideo.Pause(_VideoStream);
-        }
-
-        public void Close()
-        {
-            CVideo.Close(_VideoStream);
-            CDraw.RemoveTexture(ref _VideoTexture);
-            _Loaded = false;
-            _Finished = false;
-            _VideoTimer.Reset();
-        }
-    }
 }
\ No newline at end of file
diff --git a/Vocaluxe/Base/CVideoPlayer.cs b/Vocaluxe/Base/CVideoPlayer.cs
new file mode 100644
index 00000000..8dd47d4b
--- /dev/null
+++ b/Vocaluxe/Base/CVideoPlayer.cs
@@ -0,0 +1,97 @@
+using System.Diagnostics;
+using System.Drawing;
+using VocaluxeLib;
+using VocaluxeLib.Draw;
+
+namespace Vocaluxe.Base
+{
+    class CVideoPlayer
+    {
+        private CTexture _VideoTexture;
+        private int _VideoStream;
+        private readonly Stopwatch _VideoTimer = new Stopwatch();
+        private bool _Finished;
+        private bool _Loaded;
+
+        public bool IsFinished
+        {
+            get { return _Finished || !_Loaded; }
+        }
+
+        public bool Loop
+        {
+            set { CVideo.SetLoop(_VideoStream, value); }
+        }
+
+        public void Load(string videoName)
+        {
+            _VideoStream = CVideo.Load(CTheme.GetVideoFilePath(videoName, -1));
+            _Loaded = true;
+            CVideo.Pause(_VideoStream);
+        }
+
+        public void Start()
+        {
+            _VideoTimer.Reset();
+            _Finished = false;
+            //CVideo.VdSkip(_VideoStream, 0f, 0f);
+            _VideoTimer.Start();
+            CVideo.Resume(_VideoStream);
+        }
+
+        public void Pause()
+        {
+            CVideo.Pause(_VideoStream);
+            _VideoTimer.Stop();
+        }
+
+        public void Resume()
+        {
+            CVideo.Resume(_VideoStream);
+            _VideoTimer.Start();
+        }
+
+        public void Draw()
+        {
+            if (!_Finished)
+            {
+                float videoTime = _VideoTimer.ElapsedMilliseconds / 1000f;
+                _Finished = CVideo.Finished(_VideoStream);
+
+                CVideo.GetFrame(_VideoStream, ref _VideoTexture, videoTime, out videoTime);
+            }
+            if (_VideoTexture == null)
+                return;
+            var bounds = new RectangleF(0f, 0f, CSettings.RenderW, CSettings.RenderH);
+            RectangleF rect;
+            CHelper.SetRect(bounds, out rect, _VideoTexture.OrigAspect, EAspect.Crop);
+
+            CDraw.DrawTexture(_VideoTexture, new SRectF(rect.X, rect.Y, rect.Width, rect.Height, CSettings.ZFar / 4));
+        }
+
+        public void PreLoad()
+        {
+            bool paused = _VideoTimer.IsRunning;
+            if (paused)
+                CVideo.Resume(_VideoStream);
+            float videoTime = 0f;
+            while (_VideoTexture == null && videoTime < 1f)
+            {
+                float dummy;
+                CVideo.GetFrame(_VideoStream, ref _VideoTexture, 0, out dummy);
+                videoTime += 0.05f;
+            }
+            if (paused)
+                CVideo.Pause(_VideoStream);
+        }
+
+        public void Close()
+        {
+            CVideo.Close(_VideoStream);
+            CDraw.RemoveTexture(ref _VideoTexture);
+            _Loaded = false;
+            _Finished = false;
+            _VideoTimer.Reset();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Vocaluxe/Vocaluxe.csproj b/Vocaluxe/Vocaluxe.csproj
index db1858e6..b8276467 100644
--- a/Vocaluxe/Vocaluxe.csproj
+++ b/Vocaluxe/Vocaluxe.csproj
@@ -218,6 +218,7 @@
     <Compile Include="Base\CBackgroundMusic.cs" />
     <Compile Include="Base\CPlaylistElement.cs" />
     <Compile Include="Base\CRecord.cs" />
+    <Compile Include="Base\CVideoPlayer.cs" />
     <Compile Include="COSFunctions.cs" />
     <Compile Include="Lib\Database\CCoverDB.cs" />
     <Compile Include="Lib\Database\CDatabaseBase.cs" />