Changed namespace to reflect new structure