switched to gradle, merged tree and stream exercies