Updated code structure to allow for easier updating for new WOT versions. Closes #36