change scope of various struct fields