Change file structure and naming of files
Fix MERGE