Source Code Structure refactoring.