Changed the folder structure of Class - Manager