Quick Improvements

Rewrote XML grabbing routine, overhauled entity classes, started separating out entities and factories. Lots of groundwork laid for future changes.