Ph.D Thesis Proposal Managing Adaptive Components during Evolution