reorder folder structure
Merge remote-tracking branch 'upstream/master' into Development
CT's codebase for V1.3