Fix dependency order or projects