Update folder structure to fit salt-formula