Tidied up directories. Player is a class