Nested structures done! Another "scope" refactoring