Added folder structure for classes