Re-organize go files.