Move common files to extensions