Removed server submodule
Merged server