Merged struct and base modules