Mechanics: making function locations consistent

Starting to make the locations of express, dt, diff, etc. consistent amongst
class methods and functions. To be discussed further.