Took a while, but all my apps are now in folders.

(original)