fix directory structure
fix directory structure