(cherry picked from commit 8feb51954b)
8feb51954b
No more separate GIMP/everything else directories, also got rid of some old cruft