Reorganise terrain-type declaration.

Stuff in Map.py is a mess, will fix.
Remove older, non-overlapping sprites.

Look silly when rendered with the new ones.