.......... [DEV-536] moved old classes to new folders and renamed the files