Cleaner organization
gofmt on new files