Reorganize the repository, Ref #25