diff --git a/litex/boards/targets/ac701.py b/litex/boards/targets/ac701.py
index 49f40ecd7..eed0a45c3 100755
--- a/litex/boards/targets/ac701.py
+++ b/litex/boards/targets/ac701.py
@@ -1,9 +1,9 @@
+#!/usr/bin/env python3
+
 # This file is Copyright (c) 2019 Vamsi K Vytla <vamsi.vytla@gmail.com>
 # This file is Copyright (c) 2019 Florent Kermarrec <florent@enjoy-digital.fr>
 # License: BSD
 
-#!/usr/bin/env python3
-
 import argparse
 
 from migen import *
diff --git a/litex/boards/targets/arty.py b/litex/boards/targets/arty.py
index d650760ca..ecec01b16 100755
--- a/litex/boards/targets/arty.py
+++ b/litex/boards/targets/arty.py
@@ -1,8 +1,8 @@
+#!/usr/bin/env python3
+
 # This file is Copyright (c) 2015-2019 Florent Kermarrec <florent@enjoy-digital.fr>
 # License: BSD
 
-#!/usr/bin/env python3
-
 import argparse
 
 from migen import *
diff --git a/litex/boards/targets/de0nano.py b/litex/boards/targets/de0nano.py
index 9d7c22a09..03c063aba 100755
--- a/litex/boards/targets/de0nano.py
+++ b/litex/boards/targets/de0nano.py
@@ -1,8 +1,8 @@
+#!/usr/bin/env python3
+
 # This file is Copyright (c) 2015-2019 Florent Kermarrec <florent@enjoy-digital.fr>
 # License: BSD
 
-#!/usr/bin/env python3
-
 import argparse
 
 from migen import *
diff --git a/litex/boards/targets/de10lite.py b/litex/boards/targets/de10lite.py
index 6f68c843d..9b8c54989 100755
--- a/litex/boards/targets/de10lite.py
+++ b/litex/boards/targets/de10lite.py
@@ -1,8 +1,8 @@
+#!/usr/bin/env python3
+
 # This file is Copyright (c) 2019 msloniewski <marcin.sloniewski@gmail.com>
 # License: BSD
 
-#!/usr/bin/env python3
-
 import argparse
 
 from migen import *
diff --git a/litex/boards/targets/de1soc.py b/litex/boards/targets/de1soc.py
index caf87396f..597742c3f 100755
--- a/litex/boards/targets/de1soc.py
+++ b/litex/boards/targets/de1soc.py
@@ -1,8 +1,8 @@
+#!/usr/bin/env python3
+
 # This file is Copyright (c) 2019 Antony Pavlov <antonynpavlov@gmail.com>
 # License: BSD
 
-#!/usr/bin/env python3
-
 import argparse
 
 from migen import *
diff --git a/litex/boards/targets/de2_115.py b/litex/boards/targets/de2_115.py
index 332dfa78d..bd8320b81 100755
--- a/litex/boards/targets/de2_115.py
+++ b/litex/boards/targets/de2_115.py
@@ -1,8 +1,8 @@
+#!/usr/bin/env python3
+
 # This file is Copyright (c) 2015-2019 Florent Kermarrec <florent@enjoy-digital.fr>
 # License: BSD
 
-#!/usr/bin/env python3
-
 import argparse
 
 from migen import *
diff --git a/litex/boards/targets/genesys2.py b/litex/boards/targets/genesys2.py
index d56624733..f6b10da00 100755
--- a/litex/boards/targets/genesys2.py
+++ b/litex/boards/targets/genesys2.py
@@ -1,8 +1,8 @@
+#!/usr/bin/env python3
+
 # This file is Copyright (c) 2019 Florent Kermarrec <florent@enjoy-digital.fr>
 # License: BSD
 
-#!/usr/bin/env python3
-
 import argparse
 
 from migen import *
diff --git a/litex/boards/targets/kc705.py b/litex/boards/targets/kc705.py
index 8ff77e182..2c59c5c99 100755
--- a/litex/boards/targets/kc705.py
+++ b/litex/boards/targets/kc705.py
@@ -1,10 +1,10 @@
+#!/usr/bin/env python3
+
 # This file is Copyright (c) 2014-2015 Sebastien Bourdeauducq <sb@m-labs.hk>
 # This file is Copyright (c) 2014-2019 Florent Kermarrec <florent@enjoy-digital.fr>
 # This file is Copyright (c) 2014-2015 Yann Sionneau <ys@m-labs.hk>
 # License: BSD
 
-#!/usr/bin/env python3
-
 import argparse
 
 from migen import *
diff --git a/litex/boards/targets/kcu105.py b/litex/boards/targets/kcu105.py
index 5b5220866..1f73d5941 100755
--- a/litex/boards/targets/kcu105.py
+++ b/litex/boards/targets/kcu105.py
@@ -1,8 +1,8 @@
+#!/usr/bin/env python3
+
 # This file is Copyright (c) 2018-2019 Florent Kermarrec <florent@enjoy-digital.fr>
 # License: BSD
 
-#!/usr/bin/env python3
-
 import argparse
 
 from migen import *
diff --git a/litex/boards/targets/minispartan6.py b/litex/boards/targets/minispartan6.py
index 45e88c521..aaea92a51 100755
--- a/litex/boards/targets/minispartan6.py
+++ b/litex/boards/targets/minispartan6.py
@@ -1,10 +1,10 @@
+#!/usr/bin/env python3
+
 # This file is Copyright (c) 2013-2014 Sebastien Bourdeauducq <sb@m-labs.hk>
 # This file is Copyright (c) 2014-2019 Florent Kermarrec <florent@enjoy-digital.fr>
 # This file is Copyright (c) 2014 Yann Sionneau <ys@m-labs.hk>
 # License: BSD
 
-#!/usr/bin/env python3
-
 import argparse
 from fractions import Fraction
 
diff --git a/litex/boards/targets/netv2.py b/litex/boards/targets/netv2.py
index 834f4cd0d..e8a50a2dd 100755
--- a/litex/boards/targets/netv2.py
+++ b/litex/boards/targets/netv2.py
@@ -1,8 +1,8 @@
+#!/usr/bin/env python3
+
 # This file is Copyright (c) 2018-2019 Florent Kermarrec <florent@enjoy-digital.fr>
 # License: BSD
 
-#!/usr/bin/env python3
-
 import argparse
 
 from migen import *
diff --git a/litex/boards/targets/nexys4ddr.py b/litex/boards/targets/nexys4ddr.py
index 5f681f428..e46f43145 100755
--- a/litex/boards/targets/nexys4ddr.py
+++ b/litex/boards/targets/nexys4ddr.py
@@ -1,8 +1,8 @@
+#!/usr/bin/env python3
+
 # This file is Copyright (c) 2018-2019 Florent Kermarrec <florent@enjoy-digital.fr>
 # License: BSD
 
-#!/usr/bin/env python3
-
 import argparse
 
 from migen import *
diff --git a/litex/boards/targets/nexys_video.py b/litex/boards/targets/nexys_video.py
index 9b2fe5c93..3d58a42a4 100755
--- a/litex/boards/targets/nexys_video.py
+++ b/litex/boards/targets/nexys_video.py
@@ -1,8 +1,8 @@
+#!/usr/bin/env python3
+
 # This file is Copyright (c) 2015-2019 Florent Kermarrec <florent@enjoy-digital.fr>
 # License: BSD
 
-#!/usr/bin/env python3
-
 import argparse
 
 from migen import *
diff --git a/litex/boards/targets/simple.py b/litex/boards/targets/simple.py
index 28a149238..40677207d 100755
--- a/litex/boards/targets/simple.py
+++ b/litex/boards/targets/simple.py
@@ -1,9 +1,9 @@
+#!/usr/bin/env python3
+
 # This file is Copyright (c) 2014-2019 Florent Kermarrec <florent@enjoy-digital.fr>
 # This file is Copyright (c) 2013-2014 Sebastien Bourdeauducq <sb@m-labs.hk>
 # License: BSD
 
-#!/usr/bin/env python3
-
 import argparse
 import importlib
 
diff --git a/litex/boards/targets/ulx3s.py b/litex/boards/targets/ulx3s.py
index 1f9b451af..4a80ee6fb 100755
--- a/litex/boards/targets/ulx3s.py
+++ b/litex/boards/targets/ulx3s.py
@@ -1,9 +1,9 @@
+#!/usr/bin/env python3
+
 # This file is Copyright (c) 2018-2019 Florent Kermarrec <florent@enjoy-digital.fr>
 # This file is Copyright (c) 2018 David Shah <dave@ds0.me>
 # License: BSD
 
-#!/usr/bin/env python3
-
 import argparse
 
 from migen import *
diff --git a/litex/boards/targets/versa_ecp5.py b/litex/boards/targets/versa_ecp5.py
index 412e1684b..8f1a97199 100755
--- a/litex/boards/targets/versa_ecp5.py
+++ b/litex/boards/targets/versa_ecp5.py
@@ -1,9 +1,9 @@
+#!/usr/bin/env python3
+
 # This file is Copyright (c) 2018-2019 Florent Kermarrec <florent@enjoy-digital.fr>
 # This file is Copyright (c) 2018-2019 David Shah <dave@ds0.me>
 # License: BSD
 
-#!/usr/bin/env python3
-
 import argparse
 
 from migen import *
diff --git a/litex/soc/software/mkmscimg.py b/litex/soc/software/mkmscimg.py
index 2c9d9d9e8..14eec7073 100644
--- a/litex/soc/software/mkmscimg.py
+++ b/litex/soc/software/mkmscimg.py
@@ -1,9 +1,9 @@
+#!/usr/bin/env python3
+
 # This file is Copyright (c) 2015 Sebastien Bourdeauducq <sb@m-labs.hk>
 # This file is Copyright (c) 2018 Dolu1990 <charles.papon.90@gmail.com>
 # License: BSD
 
-#!/usr/bin/env python3
-
 import argparse
 import binascii
 
diff --git a/litex/tools/litex_read_verilog.py b/litex/tools/litex_read_verilog.py
index 0a5108306..12b274b67 100755
--- a/litex/tools/litex_read_verilog.py
+++ b/litex/tools/litex_read_verilog.py
@@ -1,8 +1,8 @@
+#!/usr/bin/env python3
+
 # This file is Copyright (c) 2018-2019 Florent Kermarrec <florent@enjoy-digital.fr>
 # License: BSD
 
-#!/usr/bin/env python3
-
 import os
 import sys
 import json
diff --git a/litex/tools/litex_server.py b/litex/tools/litex_server.py
index 54a5d6a52..e17fe115d 100755
--- a/litex/tools/litex_server.py
+++ b/litex/tools/litex_server.py
@@ -1,10 +1,10 @@
+#!/usr/bin/env python3
+
 # This file is Copyright (c) 2015-2019 Florent Kermarrec <florent@enjoy-digital.fr>
 # This file is Copyright (c) 2019 Sean Cross <sean@xobs.io>
 # This file is Copyright (c) 2018 Felix Held <felix-github@felixheld.de>
 # License: BSD
 
-#!/usr/bin/env python3
-
 import argparse
 
 import sys
diff --git a/litex/tools/litex_sim.py b/litex/tools/litex_sim.py
index 9c1965be0..afd359290 100755
--- a/litex/tools/litex_sim.py
+++ b/litex/tools/litex_sim.py
@@ -1,9 +1,9 @@
+#!/usr/bin/env python3
+
 # This file is Copyright (c) 2015-2019 Florent Kermarrec <florent@enjoy-digital.fr>
 # This file is Copyright (c) 2017 Pierre-Olivier Vauboin <po@lambdaconcept>
 # License: BSD
 
-#!/usr/bin/env python3
-
 import argparse
 
 from migen import *
diff --git a/litex/tools/litex_term.py b/litex/tools/litex_term.py
index bf11c4e7e..1cd9a5131 100755
--- a/litex/tools/litex_term.py
+++ b/litex/tools/litex_term.py
@@ -1,11 +1,10 @@
+#!/usr/bin/env python3
+
 # This file is Copyright (c) 2015-2019 Florent Kermarrec <florent@enjoy-digital.fr>
 # This file is Copyright (c) 2015 Sebastien Bourdeauducq <sb@m-labs.hk>
 # This file is Copyright (c) 2016 whitequark <whitequark@whitequark.org>
-
 # License: BSD
 
-#!/usr/bin/env python3
-
 import sys
 import signal
 import os