Add back custom frameworks/base and sort repos alfabetical order