Reorganizing, making some small improvements
Adding more demonstrations to raii demo