refactor implements for folder mode and onwership