Reorder imports

Signed-off-by: Bas Westerbaan <bas@karpenoktem.nl>
Merge pull request #154 from khandhas-infra/reorder-imports

Reorder imports