Updated for javascript project (rewrite .client also)