embassy soupify, but without proper build stuff yet
Cleanup, moved things, fixed geocode building hopefully
Merge branch 'embassy'