Redo directory structure to make go get behave