Move stuff around and add Godeps for use with johnny_deps