Fix order of static variables

Since there is a dependency between static variables order them
accordingly to avoid nullpointers.

Change-Id: Ie8869392b96c5360f80adef8249cd5588ea6639f