Move AODVMessage into own class file