Added new structure to every module