Updated dir structure
Merge branch 'code-dir-structure' into d1