* Update Makefile, move top-level .cpp files * Move top-level .cpp files into their respective folders