Preliminary combat methods and struct relocations

Merging combat branch.