Refactor files due to renamed paths