More renaming and restructuring - still not quite there - but getting close
Sample Clearups after checkin