Merge pull request #2 from dinedal/master

Move paths to be more Go-idiomatic
fix an import issue.