Restruct module creation