Make files more organized: each unit should have own directory

[klingaard]

As the model grows in size/usefulness each unit should really be in its own directory coupled with specific unit testing.