Remove unneeded subclass
Uploading a folder fixed
Fix test when file is not in root
Add test case for folder in folder