move them all to sub sections