Rearrange

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

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