finalized refactoring of scene-elements