First version of folder handling