Refactor of namespace