More conversion changes. Added cms/model, cms/table classes