Move to idiomatic go direcotry layout