Made some changes to namespaces and organization.