Moved packages around a little, starting integrating Message class and UI