Adding wrapper class for console messages
Switching to new class for console messages
Adding wrapper class for swing messages
Switching to new class for swing messages
Renaming parameters for swingmessages
Fixing tests after changed validation message
Renaming fields after refactor