Good.
Yes, all except the power supply are components.
The power supply is more like the function of the components in the lower circuit, just like the top circuit is an amplifier.
You could add switch, transformer, LED, potentiometer (also a trim pot which is often a screwdriver adjustment) , integrated circuit, electrolytic capacitor.
It would not be unusual to find a fuse in series with the power switch.
Note that some of the transistors are NPN while others are PNP. You can tell by which way the arrow is pointing on the emitter symbol. Q1 and Q4 are NPN and the others are PNP.
Not shown are FETs and MOSFETs which are also important.