-Moved OmniServer and Message to common folder