Code reorganisation, L4 fixes