Merge "Remove creation of root directory folders"