Refactor to PRCE files