Updated makefile and tested initial modularized namespaces