Componification continued.
Removed inter-component relations due to their complexity.