diff --git a/cppcommon/Makefile b/src/cppcommon/Makefile
similarity index 100%
rename from cppcommon/Makefile
rename to src/cppcommon/Makefile
diff --git a/cppcommon/config.cpp b/src/cppcommon/config.cpp
similarity index 100%
rename from cppcommon/config.cpp
rename to src/cppcommon/config.cpp
diff --git a/cppcommon/config.h b/src/cppcommon/config.h
similarity index 100%
rename from cppcommon/config.h
rename to src/cppcommon/config.h
diff --git a/cppcommon/file_functs.cpp b/src/cppcommon/file_functs.cpp
similarity index 100%
rename from cppcommon/file_functs.cpp
rename to src/cppcommon/file_functs.cpp
diff --git a/cppcommon/file_functs.h b/src/cppcommon/file_functs.h
similarity index 100%
rename from cppcommon/file_functs.h
rename to src/cppcommon/file_functs.h
diff --git a/cppcommon/io_functs.cpp b/src/cppcommon/io_functs.cpp
similarity index 100%
rename from cppcommon/io_functs.cpp
rename to src/cppcommon/io_functs.cpp
diff --git a/cppcommon/io_functs.h b/src/cppcommon/io_functs.h
similarity index 100%
rename from cppcommon/io_functs.h
rename to src/cppcommon/io_functs.h
diff --git a/cppcommon/logger.cpp b/src/cppcommon/logger.cpp
similarity index 100%
rename from cppcommon/logger.cpp
rename to src/cppcommon/logger.cpp
diff --git a/cppcommon/logger.h b/src/cppcommon/logger.h
similarity index 100%
rename from cppcommon/logger.h
rename to src/cppcommon/logger.h
diff --git a/cppcommon/str_functs.cpp b/src/cppcommon/str_functs.cpp
similarity index 100%
rename from cppcommon/str_functs.cpp
rename to src/cppcommon/str_functs.cpp
diff --git a/cppcommon/str_functs.h b/src/cppcommon/str_functs.h
similarity index 100%
rename from cppcommon/str_functs.h
rename to src/cppcommon/str_functs.h
diff --git a/cppcommon/testdata/dict.txt b/src/cppcommon/testdata/dict.txt
similarity index 100%
rename from cppcommon/testdata/dict.txt
rename to src/cppcommon/testdata/dict.txt
diff --git a/cppcommon/typedefs.h b/src/cppcommon/typedefs.h
similarity index 100%
rename from cppcommon/typedefs.h
rename to src/cppcommon/typedefs.h
diff --git a/cppcommon/vec_functs.cpp b/src/cppcommon/vec_functs.cpp
similarity index 100%
rename from cppcommon/vec_functs.cpp
rename to src/cppcommon/vec_functs.cpp
diff --git a/cppcommon/vec_functs.h b/src/cppcommon/vec_functs.h
similarity index 100%
rename from cppcommon/vec_functs.h
rename to src/cppcommon/vec_functs.h
diff --git a/cppcommon/vec_functs.tcc b/src/cppcommon/vec_functs.tcc
similarity index 100%
rename from cppcommon/vec_functs.tcc
rename to src/cppcommon/vec_functs.tcc