proper folder hierarchies, deletion needs to be fixed for folders