changes to reconstruct folder structure of classes