Changes regarding empty folders