Reorganized directory structure
Merge branch 'dir'