start working on v0.5.1
rework imports