move old classes to package depricated and implement new way logic