Reorganizing and fixing libs for 2.3.x