Updated files to conform with contiki dev changes