Changing whole folder structure more generic