Traditional Yoga, as set out by patanjali in his Yoga sutras, consists of eight ‘paths’. The first five are called bahiranga sadhana (external aids to Yoga), and the last three are called antaranga sadhana (internal aids to Yoga).
Samadhi is the third step in meditation – this is where there is no distinction between the act of meditation and the object of meditation. Sampranjnata samadhi occurs when the mind remains focussed on the object of meditation and consciousness exists. Asampranjnata samadhi occurs when the consciousness and the object become fused together.