time for a directory-level refactor. How fun