Final changes for 3.0
Publish to correct location