Changes made over the past week or so after using this in Lithium. Some modules are missing and there is no makefile now.