Reorganized in heirarchy; got better overview-- nuking old code next up after finishing modular (uni*)