Reorganization and cleanup of MinerStats