fix xchat module
Reorganize

This was moved previously for a non-existent issue :P