diff --git a/data_structures/CMakeLists.txt b/data_structures/CMakeLists.txt
index 7840c8349..fab3c5642 100644
--- a/data_structures/CMakeLists.txt
+++ b/data_structures/CMakeLists.txt
@@ -16,3 +16,7 @@ foreach( testsourcefile ${APP_SOURCES} )
     install(TARGETS ${testname} DESTINATION "bin/data_structures")
 
 endforeach( testsourcefile ${APP_SOURCES} )
+
+add_subdirectory(cll)
+add_subdirectory(queue)
+add_subdirectory(stk)
diff --git a/data_structures/cll/CMakeLists.txt b/data_structures/cll/CMakeLists.txt
new file mode 100644
index 000000000..cb18eb347
--- /dev/null
+++ b/data_structures/cll/CMakeLists.txt
@@ -0,0 +1,5 @@
+add_executable( cll 
+    cll.cpp 
+    main_cll.cpp 
+)
+install(TARGETS cll DESTINATION "bin/data_structures")
diff --git a/data_structures/cll/makefile b/data_structures/cll/makefile
deleted file mode 100644
index 0f8734eab..000000000
--- a/data_structures/cll/makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-CC= g++
-CFLAGS = -c -Wall
-
-all: cll
-cll.o: cll.cpp main_cll.cpp
-	$(CC) $(CFLAGS) cll.cpp main_cll.cpp
-cll: cll.o
-	$(CC) main_cll.o cll.o -o cll
-
-clean:
-	rm *o cll
diff --git a/data_structures/queue/CMakeLists.txt b/data_structures/queue/CMakeLists.txt
new file mode 100644
index 000000000..969936730
--- /dev/null
+++ b/data_structures/queue/CMakeLists.txt
@@ -0,0 +1,5 @@
+add_executable( test_queue 
+    queue.cpp 
+    test_queue.cpp 
+)
+install(TARGETS test_queue DESTINATION "bin/data_structures")
diff --git a/data_structures/queue/makefile b/data_structures/queue/makefile
deleted file mode 100644
index 420909804..000000000
--- a/data_structures/queue/makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-CC= g++
-CFLAGS = -c -Wall
-
-all: test_queue
-queue.o: queue.cpp
-	$(CC) $(CFLAGS) queue.cpp
-test_queue: queue.o
-	$(CC) test_queue.cpp queue.o -o queue
-
-clean:
-	rm *o queue
diff --git a/data_structures/stk/CMakeLists.txt b/data_structures/stk/CMakeLists.txt
new file mode 100644
index 000000000..c348ca853
--- /dev/null
+++ b/data_structures/stk/CMakeLists.txt
@@ -0,0 +1,11 @@
+add_executable( stack 
+    stack.cpp 
+    main.cpp 
+)
+add_executable( test_stack 
+    stack.cpp 
+    test_stack.cpp 
+)
+install(TARGETS stack DESTINATION "bin/data_structures")
+install(TARGETS test_stack DESTINATION "bin/data_structures")
+install(FILES students.txt DESTINATION "bin/data_structures")