changed namespace organisation