Reorder everything a bit

Signed-off-by: anerik <anerikgames@gmail.com>