Folder refactor experimental