Code restructuring to enable API Viewer interpretation
Merge remote-tracking branch 'origin/master'