moved player and weapon to separate files