Move to 1.0 format to allow downstream projects to build