Improved chat client modularization

* No need to combine files, which is more convenient and eases debugging
* Changed filename to be more descriptive