updated directory

http://www.google-melange.com/gci/task/view/google/gci2014/6372031431966720
merged conflicts
Merge branch 'royalharsh-patch-1'
sorted directory