Fixed new.js to use new folder schema
Fixed last merge to work with new struture.  This should BuildPass