Changing 'work' folder structure