Scene organization

apply naming conventions and remove the old test_scene