make directory structure more Golang-like