Handling XBee support + organizing imports