Package restructuring to achieve idiomatic Go code

Package restructuring to achieve idiomatic Go code #865