renamed classes and their references in the test client
simplified metrics
now split between the working copy and history only