Restructured the messages and fixed resulting compile errors
TODO in future, make modules use the messages they require