[Wikitech-l] New phase3 code reorganization