Refactor JIRA classes