Rearranged files and directories