Restructuring architecture creating player and entity classes