FH-15 Removed mock files
FH-15 Added message-service layer