further progress with scenes. major change in src folder structure