move stuff to right places, fix imports, fix task invocation, spec, ...