USERGRID-1799: update directory structure