changed remaining dependencies to imports thanks to advice from Sean Anderson