Directory view and File view almost done