Folder management & new controller