Changed project directory structure
Fixed astyle's hickup in message.cpp