Reorganised to compile first

Soo much faster