Refactor continues
Huuuuuuuuuuuge refactor of gcm server