Some more changes

I hope there are no conflicts, and Jasymca is so much more complex than
I thought. This is just the data classes essentially, that get passed
between 6 or 8 different source packages. We're up creek a bit, unless
this all figures itself out very quickly