Fixed sending current nick as sent nick to plugins

Also rearanged the structure.