Changed the order of a few things

Signed-off-by: Wesley Kennedy <wesley.kennedy@outlook.com>
more changes

Signed-off-by: Wesley Kennedy <wesley.kennedy@outlook.com>