Github-Pull: #7335 Rebased-From: 7777994846cdb9b9cf69e391a33eeed30393bbcf
* move non-test classes to subdir `test-framework`