Simplified the naming of folders