Also, the repository is reorganized in two subfolders.