Restructure for separate repositories