changed to gradle layout