I'd say afterwards, because this sets up all the paths and tests for it so we basically just need to change the imports.