More tested and implemented folder class methods