v2 - Adding spacing
v2 - Missed a spot for service rename
v2 - Renamed ServerBasics extension to Server
v2 - Cleaning up cache stuff