Create Folder Class
Instead of using a dictionary object a new class Folder is used. This
will make the merge easier.