Cleaned up the files into separate folders