reorganize into folders.  add new base class.