Redo folder structure
Fix conflict