Added namespacing and folder structure to reflect that namespacing.