The logical architecture of an existing or target application or software system is modeled in the form of one or more architecture diagrams. The existing and target diagrams may be compared. A diagram may be modified by associating physical artifacts from an architecture discovery system or by selecting artifacts identified via a query statement. Rules are associated with the diagrams and validation performed based on the rules and the physical artifacts associated with the diagrams. A report may be produced facilitating further modifications to evolve the architecture represented by the diagrams to the target architecture.