Removed unused library
Refactored server into server/main