Update old modules to new structure