Refactored PIR classes into seperate project