Clean up namespaces and code formatting
Move doc images