folderize feature branches better