Restructured Common library projects and references