Moved remaining contexttools classes into marktools.

Removed contexttools.