Add / remove folder feature implmented