Moved some common files to working tree