Arrange files into correct folders