USERGRID-1799: updated directory structure