Restructure due to component naming. Some clarifications added.