Restructing of pooch.js