Some structure clean up. Cleaned up the chat server app a bit.