fixes #1320 - Finishing the split in separate repositories