Remove binary files
Refactoring. Use dependency injection on serverside