Make changes to support new release structure