Sart backend refactoring
Done with server refactoring