Removed helpers and namespace packages

??