moving things around into (sub)sections properly