Added moved folders, lost during a previous commit.