diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 58d7ebed..1ea31067 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,8 +8,7 @@ set (timew_SRCS Grammar.cpp     Grammar.h
                 Lexer.cpp       Lexer.h
                 LR0.cpp         LR0.h
                 Pig.cpp         Pig.h
-                Rules.cpp       Rules.h
-                Table.cpp       Table.h)
+                Rules.cpp       Rules.h)
 
 add_library (timew STATIC ${timew_SRCS})
 add_executable (timew_executable timew.cpp)
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 83d37600..648d0c13 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -6,6 +6,7 @@ include_directories (${CMAKE_SOURCE_DIR}
 set (common_SRCS Color.cpp    Color.h
                  FS.cpp       FS.h
                  RX.cpp       RX.h
+                 Table.cpp    Table.h
                  Timer.cpp    Timer.h
                  text.cpp     text.h
                  utf8.cpp     utf8.h
diff --git a/src/Table.cpp b/src/common/Table.cpp
similarity index 100%
rename from src/Table.cpp
rename to src/common/Table.cpp
diff --git a/src/Table.h b/src/common/Table.h
similarity index 100%
rename from src/Table.h
rename to src/common/Table.h