reorganising cpp stuff. Makefile for tests

reorganising cpp stuff. Moving files