Removed Makefile, and added a few dependecies to CMakeLists.txt