Reorganised JS libs