Fix missing folders and remove hamcrest dep from -app
Change user client api