Minor Adjustments to folder tree and JS