move packet in new handler
refactoring