Moved files around. Added combat system. Test program now shows new weapon/armor creation.