Adds new files to CMakeLists and Makefile