Apple is planning to improve its cloud services, so that it could better compete with Google and Amazon. The tech giant wants to achieve this by unifying its separate internet services teams into a single campus.

The development teams of Siri, Maps, iCloud, Apple Pay, News and parts of iTunes will move in together into Apple’s Infinite Loop campus in Cupertino, according to Bloomberg’s sources. The plan here is that by placing these separate teams together under one roof, Apple could improve its internet services.

Currently, the different Apple services are being developed separately in offices outside of the company’s Infinite Loop campus spread out in parts of Cupertino and Sunnyvale in California. With this new initiative, Apple will be placing teams together in the One Infinite Loop Campus, while others will be moved into the Apple Campus 2, the tech giant’s newest campus that’s expected to open in early 2017. Apple plans to double its campus size and will lessen its reliance on renting out buildings in the Cupertino area, according to 9To5Mac.

As for further improving its cloud services, Apple is reorganizing its resources by moving most of its parts under one system that’s been given the codename “Pie.” Siri, the iTunes Store and Apple News have already been moved under this new consolidated system. Apple is also planning to move more of its internet services under Pie over time, including Maps. It may take a few years before all of Apple’s services are moved under the new system.

Apple has also developed what’s being called as “McQueen,” a new internal cloud service intended to store photos and videos. The creation of McQueen also signals Apple’s desire to no longer rely on Google and Amazon cloud servers.

Both Google and Amazon currently offer customers free unlimited cloud storage for photos, and it’s possible that Apple is planning to do the same or simply make it more affordable. Currently, Apple only offers 5GB of free iCloud storage and users would have to pay $0.99 a month for 50GB, or all the way up to $19.99 a month for 2TB of iCloud storage.