Cleaned up structure a bit.

Removed a file and added dependency injection to player.