remove Jar on attack
refactoring, organization, and Signals