Changed organisation of files and folders