Reorganized the import statements. Issue #2.