System Refactoring