Refactoring into discreet resources