clean up organisation properly in steps
Update cassettes