renamed files to match go style