Fix Merge Conflicts and Add File Structure