Refactoring of scene package.