Issue #96: moved several classes