Merged files together and organized the folders