Restuctured dir to get ready for provisioning.