Total project reorganization.  Trying to make this a little more modular.