diff --git a/src/MediaServer.cpp b/src/MediaServer.cpp
index 1e964d4..be12408 100644
--- a/src/MediaServer.cpp
+++ b/src/MediaServer.cpp
@@ -7,3 +7,16 @@
 //
 
 #include "MediaServer.h"
+
+namespace ofx {
+namespace piMapper {
+MediaServer::MediaServer() {
+  videoWatcher.registerAllEvents(this);
+  videoWatcher.addPath(ofToDataPath(DEFAULT_VIDEOS_DIR, true), true,
+                       &videoFileFilter);
+  imageWatcher.registerAllEvents(this);
+  imageWatcher.addPath(ofToDataPath(DEFAULT_IMAGES_DIR, true), true,
+                       &imageFileFilter);
+}
+}
+}
\ No newline at end of file
diff --git a/src/MediaServer.h b/src/MediaServer.h
index bd2ed68..49edf87 100644
--- a/src/MediaServer.h
+++ b/src/MediaServer.h
@@ -8,11 +8,26 @@
 
 #pragma once
 
+#include "ofMain.h"
+#include "ofxIO.h"
+
+#define DEFAULT_IMAGES_DIR "sources/images/"
+#define DEFAULT_VIDEOS_DIR "sources/videos/"
+
 namespace ofx {
 namespace piMapper {
 class MediaServer {
  public:
+  MediaServer();
+
  private:
+  // Video
+  ofx::IO::DirectoryWatcherManager videoWatcher;
+  ofx::IO::HiddenFileFilter videoFileFilter;
+
+  // Images
+  ofx::IO::DirectoryWatcherManager imageWatcher;
+  ofx::IO::HiddenFileFilter imageFileFilter;
 };
 }
 }