Fix folder structure
Fix folder structure