Add organization, go fmt all files
Merge branches 'org' and 'master'