This commit fixes some issues with creating a new folder in an existing folder and the parent folder not being set correctly