How to fix the space marine infantry roster:
>tactical squad (bolters, 5-20 bodies)
>tactical support squad (all special weapons 5-10 bodies)
>heavy support squad (all heavy weapons 5-10 bodies)
>recon squad (merges infiltrators, incursors, reivers and eliminators)
>assault squad (merges assault intercessors on foot and jump pack)
>veteran squad (merges sternguard and vanguard veteran squads)
>terminator squad (merges normal and assault terminators squads)
>scout squad

Having seen the new 30k leaks I am once again asking James Workshop himself for 11th to just copy the exact same ruleset.