Continue refactor changes

Moved some files; updated imports on tests