Reorganize code

Organize go code.