fix imports after reorganization to package
make this the 1.5 branch
Merge branch 'package-reorg' of git://github.com/kmike/qtreactor into kmike-package-reorg