Namespaces + Indentation cleanup

Added namespaces as well as cleaned up indentation