More refactoring (server events) to hold the new Droid event system