Changes to the messages, adding xml for preferences and removing unused
files.