Add directories to setup.py, CMakeLists.txt

Two new directories from #239 didn't make it into the setup.py and CMakeLists.txt files which breaks the distributed binaries.