Changed namespace name, reduced interdependency