relocate files
update versions
fix unit tests