consolidation

Signed-off-by: anukool <anukoole@gmail.com>
Consolidation 2
Old server package removed