fixed imports to make the project "go get"able