changed namespace structure