added helpers, removed directories from listing, supports folders