Add support for <platform>, some cleanup of module section after

creating the <moduleinfo>.