More refactoring for scene2d