Moving files to fix go autobuild