Rearraged the files into different folders