slides: reorganize some crap