Update to jQuery 1.9 & reorganize structure