some structural and architectural changes