Refactor file locations (for submission purposes)