diff --git a/.gitignore b/.gitignore
index 18f45fa4e04d1926aafd52048a865484b7baa505..311212a9939da947e577232e60fc7b6754139531 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 # Ignore build dirs
+samples/
 vlc/
 emsdk/
 # and files
diff --git a/compile.sh b/compile.sh
index c7ffe7e4f0a109949f412c1c0ae106a0ddae6661..e362060f3ac1ed6b3eb321aa8f89984aa3a53461 100755
--- a/compile.sh
+++ b/compile.sh
@@ -57,8 +57,9 @@ url="http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBun
 
 diagnostic "getting video"
 cd $WORK_DIR
-if [ ! -f "./BigBuckBunny.mp4" ]; then
-    curl ${url} -o BigBuckBunny.mp4
+mkdir -p samples/
+if [ ! -f "./samples/BigBuckBunny.mp4" ]; then
+    curl ${url} -o samples/BigBuckBunny.mp4
 fi
 diagnostic "Generating executable"
 ./create_main.sh
diff --git a/create_main.sh b/create_main.sh
index 3bbca4034345d0bdca95471242ee4b863c2ec478..ade8d841f1c25324c1d7ab56642ba12c7df54903 100755
--- a/create_main.sh
+++ b/create_main.sh
@@ -24,7 +24,7 @@ if [ ! -d vlc ]; then
 fi
 
 PATH_VLC=${PATH_VLC:=./vlc}
-SAMPLE=${SAMPLE:=./BigBuckBunny.mp4}
+SAMPLE_DIR=${SAMPLE_DIR:=./samples}
 PROJECT_DIR=${PROJECT_DIR:=./vlc/extras/package/wasm-emscripten/build}
 
 # for release, remove profiling-funcs and add -Os
@@ -37,4 +37,4 @@ emcc --bind -s USE_PTHREADS=1 -s TOTAL_MEMORY=1GB -s PTHREAD_POOL_SIZE=15 \
     $PROJECT_DIR/wasm32-unknown-emscripten/lib/*.a \
     $PROJECT_DIR/build-emscripten/src/.libs/libvlccore.a \
     $PROJECT_DIR/build-emscripten/compat/.libs/libcompat.a \
-    -o experimental.html --preload-file ${SAMPLE}
+    -o experimental.html --preload-file ${SAMPLE_DIR}
diff --git a/main.c b/main.c
index 97cd633e1210fa4b3276bdfe0747f6ee50f182ed..aab45ff34362cb9913c157dc571314eca41f3f86 100644
--- a/main.c
+++ b/main.c
@@ -63,8 +63,8 @@ int main() {
       fprintf( stderr, "unable to create libvlc instance" );
       return -1;
     }
-  m = libvlc_media_new_path( libvlc, "./BigBuckBunny.mp4" );
-  
+  m = libvlc_media_new_path( libvlc, "./samples/BigBuckBunny.mp4" );
+
   if (m == NULL)
     {
       fprintf(stderr, "unable to create media");