Libraries reorganization