Move combat recount into model combat package, update classpath and lib