Converting things to LGPL, consolidating