updated namespaces for new structure; updated to install for new structure