convert to div-library, remove singleton instance