New layout for directory
Merge pull request #681 from pafcu/master

New layout for directory