Added refined structuring and support for modules.