Feature contiki org refactoring