import classes into repo, slight refactoring