Updating structure and modules. Untested