reorganize code..

moving things into (hopefully) helpful categories…