first pass at refactor to namespace