Almost done organizing into folders