Renamed everything to hold the Component namespace