Update jQuery and restructure