merge scene.js and app.js

moved scene code into controller