->for merge with Maurer branch
beginnings of restructuring:
 * making the overall design more compatible with trypanosome