folder restructure; node update to handle all URLs