Training Module Redesign

Redesigned the training module to have categories.
Merge remote-tracking branch 'origin/cwDev'