fixed imports to work with go-get