Refactored namespaces and added display Makefile