Finally removed all traces of the scurge that plagues the Earth -- XML.
Also improved directory structure :)