MH-8100 some refactoring

git-svn-id: http://opencast.jira.com/svn/MH/branches/MH-8100@13708 e6edf6fb-f266-4316-afb4-e53d95876a76
MH-8100 some refactoring #2

git-svn-id: http://opencast.jira.com/svn/MH/branches/MH-8100@13709 e6edf6fb-f266-4316-afb4-e53d95876a76
MH-8100 some refactoring #3

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