[Structure] Updated classes folder structure