Moved import order in the hope it will fix the import bugs

Moved import order in the hope it will fix the import bugs #371