Code Refactoring & add SceneManager