Arranged files into folders better