#30 modify import statements to work with refactoring