MOB-104: Modified Firebase structure to be consistent