Remove singleton pattern, use class instead

@redonkulus @lingyan @Vijar