Added proper folder management