Better repository organization