Refactoring software stuff to server
Refactoring complete