Start to re-organize the proejct

This is a bit of what I was thinking. I'm very open to comments/questions/etc. 

I think we take it a bit further, but I think this is a great start.