Simplified code structure somewhat
First work on xapi conversion, added sample edx event