Updating to use idiomatic Go package pathing