Continuation of folder manager developpement