Merge #38: Added handlers for create file/folder