fixes and consistency to filesets
better dealing with Riaxpander vs. FFI modules