Added new folder icon to folders
Started adding logic for adding a new folder.  Refactored some code to try to make it more readable.