jf: Reorg feature dependant overlays