Reverted some examples back, fixed gradle build