diff --git a/Makefile b/Makefile
index 999986ddd..88a0150f0 100644
--- a/Makefile
+++ b/Makefile
@@ -36,15 +36,15 @@ export LIBS
 
 dirs:
 	${MAKE} -C src/tetra/ ${MAKEFLAGS} CXX=${CXX} ${MAKECMDGOALS}
-	${MAKE} -C src/camera/ ${MAKEFLAGS} CXX=${CXX} ${MAKECMDGOALS}
+	${MAKE} -C src/video/ ${MAKEFLAGS} CXX=${CXX} ${MAKECMDGOALS}
 
 debian-release:
 	${MAKE} -C src/tetra/ ${MAKEFLAGS} CXX=${CXX} release
-	${MAKE} -C src/camera/ ${MAKEFLAGS} CXX=${CXX} release
+	${MAKE} -C src/video/ ${MAKEFLAGS} CXX=${CXX} release
 
 debian-clean:
 	${MAKE} -C src/tetra/ ${MAKEFLAGS} CXX=${CXX} clean
-	${MAKE} -C src/camera/ ${MAKEFLAGS} CXX=${CXX} clean
+	${MAKE} -C src/video/ ${MAKEFLAGS} CXX=${CXX} clean
 
 install: ${TARGET}
 	true
diff --git a/src/camera/Makefile b/src/video/Makefile
similarity index 100%
rename from src/camera/Makefile
rename to src/video/Makefile
diff --git a/src/camera/camera-demo.cpp b/src/video/video-demo.cpp
similarity index 96%
rename from src/camera/camera-demo.cpp
rename to src/video/video-demo.cpp
index 32f19b2cd..2c7b41a81 100644
--- a/src/camera/camera-demo.cpp
+++ b/src/video/video-demo.cpp
@@ -57,16 +57,6 @@ void render() {
     glRotatef(1, 0, 1, 0);
     glClearColor(0.0f, 0.0f, 1.0f, 1.0f);
 
-    glColor3f(1.0, 1.0, 1.0);
-    glBegin(GL_LINES);
-    for (GLfloat i = -2.5; i <= 2.5; i += 0.25) {
-        glVertex3f(i, 0, 2.5);
-        glVertex3f(i, 0, -2.5);
-        glVertex3f(2.5, 0, i);
-        glVertex3f(-2.5, 0, i);
-    }
-    glEnd();
-
     glBegin(GL_TRIANGLE_STRIP);
         glColor3f(1, 1, 1);
         glVertex3f(0, 2, 0);