Doing a project refactor.