Broke source into separate files.
* Was also messing around with Skald in here too, but those changes should have been removed.