Reorganized components in component diagram. Same connections, just a cleaner look.