Adding main structure for existing modules