Package objects for documenting the major modules (Core + Router)
Resolve merge conflict.