Restructure, fixed js delivery, ff compatibility