Fixed sibling explosion and added a UID to folder structure