With everything I have on my plate right now, the last thing I needed to do was take an hour (or three) to fix the mess that was Thomas' Legos.
As I mentioned in the title of this post: we all got issues, and him not displaying his Lego's the "right way," is one of mine.
They are fixed now, and everyone is happy living in their correct Lego World environment. The fire people are with their vehicles and department, the police with their people, the boats in or near the water, the bad guys all near their hideouts. Life is nice and neat and perfectly organized...like it should be.