jira match-24

moved code into proper packages, yet to test