Partial fix to structure, TobenHair has rest
Merge branch 'master' of github.com:/hansfilipelo/ChattY