fixing namespace
fixing setup import
adding missing namespace setup
adding TODO