Migration fix cli imports

@dsikter This is what I tried to explain with my last comments in !437 (closed). Let me know, if this is acceptable.

This MR contains the commits of !437 (closed)