Reorganized files and added merge
Reorganized files and added merge