Go
Some reorganization.