Refactoring first scenery structure