moved things around
cpp wrapper and Makefile
initial working version