Added Scene Manager

And major code clean-up