Package refactoring/cleanup of MCPC+ code