Begin adding namespacing and plugin initializer