Reorganizing files.  Will need to reorganize unittests