Make directories more *nix-friendly
Modify cpp Makefile and cleanup cuda Makefile