4 files replaced by new 4 improved classes....