Rearranged project in order to work with go get