Added safari ext
Restructure, fixed js delivery, ff compatibility