Updates to get it working with services in folders.