Add namespaces to delineate from other projects.
Moving files around, broken checkin.
Change makefile to use the segregated directory structure.