Fixed directory generation for new deployments