Move back to building into Static Lib