Merge server classes
Clean and remove useless classes and functions