refactor everything and got packets showing in the UI
fixed conflicts