Reordered some members according to project specs.