Refactoring

Moved the players handling to separate file