Fix up imports properly
Merge pull request #51 from dennisdegreef/cleanup

Fix up imports properly