Fix missing folders and remove hamcrest dep from -app