Move folders to separate dir
Add new folder