Moved folders in to functional based packages.  Lots of naming cleanup. Ready for a purge