Updated properly to 1.7
Sort files