Refactored imports. Closes #27.