Re-arranging build order