Remove/Inserting content from/in a folder on content visibility updates

I also refactored the light-weight folders stuff as it was only confusing