Add folders, sort content