add HasFileId, re-arrange Types order
restructure to use CModules
methods seem to be writing to C correctly