clean up namespace some more, add flow