Cleaned up namespaces and added view objects