Updated layout of folders and files