Made some changes to support deployment to non root directories