Orginized the folders better