Converted to gradle multi module project