Folder organization - v3

1. Remove NewAbove/NewBelowe
2. Fix New/Rename