consolidated js and css directories