Changed path and namespace