Updated to make relationship between components more understandable.
21 files changed