Reorganizing go files.