start using modules

We *can* start to merge these. 
It's still not fully functional, but it's laid out a bit better.