restructuring modules