Transformed to gradle multi modules project (part 2)