Reconstructing folders
Adding classes