added FlyFi and changed directory structure