Upload plans Menu navigation and terms

When creating a layer or uploading a plan, I find the terminology extremely confusing. Wouldn't it be better to call the button "Upload plans" instead of "Create layer" and place it directly next to the heading "Layers and plans" and not under all plans? And wouldn't it be better to have another option in the function to create a folder/layer?