move shared types out
rename some types
update the README