Refactor models to use BaseCollector and QueryExecutor#40

sjmudd merged 3 commits into

mastersjmudd/ps-top:masterfrom

sjm/refactor-modelssjmudd/ps-top:sjm/refactor-modelsCopy head branch name to clipboard