Update folder structure
Update file structure