update versions
change structure
useless shim
update readme