Fix directory structure
Merge changes to fix directory structure