Integrating Navigational and Structural Information in SCORM Content Aggregation Modeling