organized deprecated files
fix issue 1326 of Google Code