QUnit reorganization