Resource reorganization
Some chat activity fixes