Fixes to the file structure and {block:Chat}

Signed-off-by: Kenneth Lim <kenlimmj@gmail.com>