All message classes added
source file tidy up