Small reorg and added Order section