MH-8100 refactoring

git-svn-id: http://opencast.jira.com/svn/MH/branches/MH-8100@13729 e6edf6fb-f266-4316-afb4-e53d95876a76