Move all the neon code to the _legacy files