Rename combat.h to combat/combat.h