New structure using sub-modules for each application