Re-arrange static lib deps