Changed folder infrastructure