Massive reorganization/cleanup effort.

Renamed "trace" to "project" where appropriate, along with the appropriate
reoganizations/renamings.