Changed build dependency order