Systems Evolution and Software Reuse in Object-Oriented Programming and Aspect-Oriented Programming