Tidied up imports throughout project (closes #25)