fixed Dir organization
Merge remote-tracking branch 'origin/skohli' into skohli