The last of the coding for edit folder
NewEditFolder: Removed unnecessary files.
NewEditFolder: Fixed merge conflicts.
Merge pull request #25 from jarradm/NewEditFolder

New edit folder