Corrected
Common classes are moved to ServerCommons library. Cleaned