Improved repository organization #2.