C++ impl: Tweaking directory structure and Makefile for clarity