Added PlayerTraits

-Moved some things around for organization