Refactoring the Software