Move classifier into common class Refactor common classes so they're, well, common
Various changes to activity recorder algorithm