Sorted everything into new folders