moved asset locations
fixed includes for js
merge in previous path fixes