Fix and refactoring

Fix one bug that appear after "Clean up" commit, add Chat and ChatServer
app