Folders restructured

For having both java and http client all in one