Merge branch 'cleanup/import-on-top' into 'master'

Cleanup/import on top

Move some import statements to the top of the file.

Note: This merge request includes a small bugfix. In some mysterious way an import was wrong after the last merge request. The strange thing is: I'm pretty sure I removed my build directory and tested the feature before merging. After merging and going back to master it didn't work anymore. Maybe I didn't delete the build directory but it is strange nonetheless.

See merge request !39