Renamed messages.
Split sample application into multiple files.