Added subtitle class and deleted redundant classes