moved classes out, only CRM class left