Initial import & upgrade to namespacing