Fixing import statements

This cleans up the import statements in the source files. Adressing #17. @pdaian please review.