diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3407a507e..2c5805a3a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -141,7 +141,6 @@ configure_file (
 add_subdirectory (src)
 add_subdirectory (src/commands)
 add_subdirectory (src/columns)
-add_subdirectory (src/parser)
 add_subdirectory (src/shell)
 add_subdirectory (doc)
 add_subdirectory (i18n)
diff --git a/src/parser/A3.cpp b/src/A3.cpp
similarity index 100%
rename from src/parser/A3.cpp
rename to src/A3.cpp
diff --git a/src/parser/A3.h b/src/A3.h
similarity index 100%
rename from src/parser/A3.h
rename to src/A3.h
diff --git a/src/parser/A3t.cpp b/src/A3t.cpp
similarity index 100%
rename from src/parser/A3t.cpp
rename to src/A3t.cpp
diff --git a/src/parser/A3t.h b/src/A3t.h
similarity index 100%
rename from src/parser/A3t.h
rename to src/A3t.h
diff --git a/src/parser/Arg.cpp b/src/Arg.cpp
similarity index 100%
rename from src/parser/Arg.cpp
rename to src/Arg.cpp
diff --git a/src/parser/Arg.h b/src/Arg.h
similarity index 100%
rename from src/parser/Arg.h
rename to src/Arg.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1eb41be98..bde1d6683 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,23 +3,29 @@ include_directories (${CMAKE_SOURCE_DIR}
                      ${CMAKE_SOURCE_DIR}/src
                      ${CMAKE_SOURCE_DIR}/src/commands
                      ${CMAKE_SOURCE_DIR}/src/columns
-                     ${CMAKE_SOURCE_DIR}/src/parser
                      ${TASK_INCLUDE_DIRS})
 
-set (task_SRCS Color.cpp Color.h
+set (task_SRCS A3.cpp A3.h
+               A3t.cpp A3t.h
+               Arg.cpp Arg.h
+               Color.cpp Color.h
                Config.cpp Config.h
                Context.cpp Context.h
                DOM.cpp DOM.h
                Date.cpp Date.h
                Directory.cpp Directory.h
                Duration.cpp Duration.h
+               E9.cpp E9.h
                File.cpp File.h
                Hooks.cpp Hooks.h
                JSON.cpp JSON.h
+               LRParser.cpp LRParser.h
                Msg.cpp Msg.h
                Nibbler.cpp Nibbler.h
+               Parser.cpp Parser.h
                Path.cpp Path.h
                RX.cpp RX.h
+               Socket.cpp Socket.h
                TDB2.cpp TDB2.h
                Task.cpp Task.h
                Taskmod.cpp Taskmod.h
@@ -29,6 +35,7 @@ set (task_SRCS Color.cpp Color.h
                TransportRSYNC.cpp TransportRSYNC.h
                TransportSSH.cpp TransportSSH.h
                TransportShell.cpp TransportShell.h
+               Tree.cpp Tree.h
                Uri.cpp Uri.h
                ViewTask.cpp ViewTask.h
                ViewText.cpp ViewText.h
@@ -39,7 +46,6 @@ set (task_SRCS Color.cpp Color.h
                legacy.cpp
                recur.cpp
                rules.cpp
-               Socket.cpp Socket.h
                sort.cpp
                text.cpp text.h
                utf8.cpp utf8.h
@@ -50,7 +56,7 @@ add_library (task STATIC ${task_SRCS})
 add_executable (task_executable main.cpp)
 
 # Yes, 'task' is included twice, other linking fails on CentOS.
-target_link_libraries (task_executable task commands columns parser task commands columns ${TASK_LIBRARIES})
+target_link_libraries (task_executable commands columns task ${TASK_LIBRARIES})
 
 set_property (TARGET task_executable PROPERTY OUTPUT_NAME "task")
 
diff --git a/src/parser/E9.cpp b/src/E9.cpp
similarity index 100%
rename from src/parser/E9.cpp
rename to src/E9.cpp
diff --git a/src/parser/E9.h b/src/E9.h
similarity index 100%
rename from src/parser/E9.h
rename to src/E9.h
diff --git a/src/parser/LRParser.cpp b/src/LRParser.cpp
similarity index 100%
rename from src/parser/LRParser.cpp
rename to src/LRParser.cpp
diff --git a/src/parser/LRParser.h b/src/LRParser.h
similarity index 100%
rename from src/parser/LRParser.h
rename to src/LRParser.h
diff --git a/src/parser/Parser.cpp b/src/Parser.cpp
similarity index 100%
rename from src/parser/Parser.cpp
rename to src/Parser.cpp
diff --git a/src/parser/Parser.h b/src/Parser.h
similarity index 100%
rename from src/parser/Parser.h
rename to src/Parser.h
diff --git a/src/parser/Tree.cpp b/src/Tree.cpp
similarity index 100%
rename from src/parser/Tree.cpp
rename to src/Tree.cpp
diff --git a/src/parser/Tree.h b/src/Tree.h
similarity index 100%
rename from src/parser/Tree.h
rename to src/Tree.h
diff --git a/src/parser/args.cpp b/src/args.cpp
similarity index 100%
rename from src/parser/args.cpp
rename to src/args.cpp
diff --git a/src/parser/bnf.cpp b/src/bnf.cpp
similarity index 100%
rename from src/parser/bnf.cpp
rename to src/bnf.cpp
diff --git a/src/parser/grammar.bnf b/src/grammar.bnf
similarity index 100%
rename from src/parser/grammar.bnf
rename to src/grammar.bnf
diff --git a/src/parser/.gitignore b/src/parser/.gitignore
deleted file mode 100644
index f1a72ef16..000000000
--- a/src/parser/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-libparser.a
-parser
-args
diff --git a/src/parser/run b/src/run
similarity index 100%
rename from src/parser/run
rename to src/run
diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt
index 5b5dcb40e..9fc040b9c 100644
--- a/src/shell/CMakeLists.txt
+++ b/src/shell/CMakeLists.txt
@@ -3,7 +3,6 @@ include_directories (${CMAKE_SOURCE_DIR}
                      ${CMAKE_SOURCE_DIR}/src
                      ${CMAKE_SOURCE_DIR}/src/commands
                      ${CMAKE_SOURCE_DIR}/src/columns
-                     ${CMAKE_SOURCE_DIR}/src/parser
                      ${CMAKE_SOURCE_DIR}/src/shell
                      ${TASK_INCLUDE_DIRS})
 
@@ -13,7 +12,7 @@ add_library (tasksh STATIC ${tasksh_SRCS})
 add_executable (tasksh_executable main.cpp)
 
 # Yes, 'task' is included twice, other linking fails on CentOS.
-target_link_libraries (tasksh_executable task commands columns parser tasksh task ${TASK_LIBRARIES})
+target_link_libraries (tasksh_executable commands columns task tasksh ${TASK_LIBRARIES})
 
 set_property (TARGET tasksh_executable PROPERTY OUTPUT_NAME "tasksh")
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index d1359fa8d..b7350fbd7 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -3,7 +3,6 @@ include_directories (${CMAKE_SOURCE_DIR}
                      ${CMAKE_SOURCE_DIR}/src
                      ${CMAKE_SOURCE_DIR}/src/commands
                      ${CMAKE_SOURCE_DIR}/src/columns
-                     ${CMAKE_SOURCE_DIR}/src/parser
                      ${CMAKE_SOURCE_DIR}/test
                      ${TASK_INCLUDE_DIRS})
 
@@ -42,7 +41,7 @@ add_custom_target (build_tests DEPENDS ${test_SRCS}
 
 foreach (src_FILE ${test_SRCS})
   add_executable (${src_FILE} "${src_FILE}.cpp" test.cpp)
-  target_link_libraries (${src_FILE} task commands task columns parser ${TASK_LIBRARIES})
+  target_link_libraries (${src_FILE} task commands task columns ${TASK_LIBRARIES})
 endforeach (src_FILE)
 
 #SET(CMAKE_BUILD_TYPE gcov)