Many thanks for the quick reply.
Im now arranging my purchase of an Enterprise Licence as I need this feature.
As for the other issue, I've looked through Custom Actions etc and the Organisation and cannot find anywhere these empty folders are referenced.
When I get Enterprise, if I add them as ...
FOLLOW US
Get the latest news in Application Packaging