Settlement Updates

Shuffled some classes around, added logic to represent settlements and
districts.