Renamed projects to that the name includes 'ist'
Moved classes to proper locations
Applied changed from the package rename
Removed RoleType.EMPLOYEE used, to be later fixed
Recovered 'merge.units.emails' configuration