clean up refactor and autocomplete support
namespace refactor and additional testing