failed attempt at inlining
rename lots of stuff
add missing version
bump version; changelog; change dist name