REV: Added scenes and re-organized the code.