ReReReArranging Files, Organizing Base Class, etc