split App and Message class