Move action to appropriate package
Fix bug where attacking unit would persist if killed