more thumbnail reorganization
Merge pull request #2689 from Wikia/thumbnail-reorg-3

more thumbnail reorganization