Updated some namespacing after reorganizing directories.