Revert "Revert "I think I got it working. Scans and Images now properly sort, and the new folder pops up after saving is done. Nifty.""

This reverts commit bccade2ae08b14ea428f6c7e01c1a06c965d457c.

WTF